wip to get everything working

go.mod

@@ -12,7 +12,6 @@ require (
 	github.com/pulumi/pulumi/pkg/v3 v3.130.0
 	github.com/pulumi/pulumi/sdk/v3 v3.130.0
 	github.com/spf13/cobra v1.8.1
-	github.com/stretchr/testify v1.9.0
 	golang.org/x/text v0.17.0
 	k8s.io/apiextensions-apiserver v0.31.0
 	k8s.io/apimachinery v0.31.0
@@ -196,6 +195,7 @@ require (
 	github.com/spf13/afero v1.11.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/stoewer/go-strcase v1.2.0 // indirect
+	github.com/stretchr/testify v1.9.0 // indirect
 	github.com/texttheater/golang-levenshtein v1.0.1 // indirect
 	github.com/tweekmonster/luser v0.0.0-20161003172636-3fa38070dbd7 // indirect
 	github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect

pkg/codegen/customresourcegenerator.go

@@ -130,12 +130,20 @@ func flattenRecursively(sw *spec.Swagger, parentName string, currSpec spec.Schem
 
 	// Recurse through the properties of the object.
 	for nestedPropertyName, nestedProperty := range currSpec.Properties {
+		// VistoriaMetrics has some weird fields - likely a typegen issue on their end, so let's skip them.
+		if nestedPropertyName == "-" {
+			delete(currSpec.Properties, nestedPropertyName)
+			continue
+		}
 		// Create a new definition for the nested object by joining the parent definition name and the property name.
 		// This is to ensure that the nested object is unique and does not conflict with other definitions.
 		nestedDefinitionName := parentName + sanitizeFieldName(nestedPropertyName)
 
-		// if nestedPropertyName == "enforcers" {
-		// 	log.Println("enforcers found: ", nestedDefinitionName)
+		// if nestedPropertyName == "bearerTokenSecret" {
+		// 	log.Println("bearerTokenSecret found: ", nestedDefinitionName)
+		// 	g := json.NewEncoder(os.Stdout)
+		// 	g.SetIndent("", "  ")
+		// 	g.Encode(nestedProperty)
 		// }
 
 		s, err := flattenRecursively(sw, nestedDefinitionName, nestedProperty)
@@ -189,7 +197,7 @@ func crdToOpenAPI(crd *extensionv1.CustomResourceDefinition) ([]*spec.Swagger, e
 			continue
 		}
 		// Defaults are not pruned here, but before being served.
-		sw, err := builder.BuildOpenAPIV2(crd, v.Name, builder.Options{V2: true, StripValueValidation: false, StripNullable: false, AllowNonStructural: true})
+		sw, err := builder.BuildOpenAPIV2(crd, v.Name, builder.Options{V2: true, StripValueValidation: true, StripNullable: true, AllowNonStructural: true, IncludeSelectableFields: true})
 		if err != nil {
 			return nil, err
 		}

pkg/codegen/golang.go

@@ -19,6 +19,7 @@ import (
 	"fmt"
 	"path"
 	"path/filepath"
+	"runtime/debug"
 	"strings"
 
 	ijson "github.com/pulumi/crd2pulumi/internal/json"
@@ -44,7 +45,7 @@ var UnneededGoFiles = codegen.NewStringSet(
 func GenerateGo(pg *PackageGenerator, name string) (buffers map[string]*bytes.Buffer, err error) {
 	defer func() {
 		if r := recover(); r != nil {
-			err = fmt.Errorf("%v", r)
+			err = fmt.Errorf("%v\n%s", r, string(debug.Stack()))
 		}
 	}()
 

pkg/codegen/nodejs.go

@@ -18,7 +18,6 @@ import (
 	"bytes"
 	"fmt"
 
-	ijson "github.com/pulumi/crd2pulumi/internal/json"
 	"github.com/pulumi/pulumi/pkg/v3/codegen/nodejs"
 )
 
@@ -27,25 +26,13 @@ const nodejsMetaPath = "meta/v1.ts"
 const nodejsMetaFile = `import * as k8s from "@pulumi/kubernetes";
 
 export type ObjectMeta = k8s.types.input.meta.v1.ObjectMeta;
+export type ObjectMetaPatch = k8s.types.input.meta.v1.ObjectMetaPatch;
 `
 
 func GenerateNodeJS(pg *PackageGenerator, name string) (map[string]*bytes.Buffer, error) {
 	pkg := pg.SchemaPackage()
 	oldName := pkg.Name
 	pkg.Name = name
-	moduleToPackage, err := pg.ModuleToPackage()
-	if err != nil {
-		return nil, fmt.Errorf("%w", err)
-	}
-	pkg.Language[nodejsName], err = ijson.RawMessage(map[string]any{
-		"moduleToPackage": moduleToPackage,
-		"dependencies": map[string]string{
-			"@pulumi/kubernetes": "^4.0.0",
-		},
-	})
-	if err != nil {
-		return nil, err
-	}
 
 	files, err := nodejs.GeneratePackage(PulumiToolName, pkg, nil, nil, true)
 	if err != nil {

pkg/codegen/schema.go

@@ -19,6 +19,7 @@ import (
 	"errors"
 	"fmt"
 	"log"
+	"os"
 	"strconv"
 	"strings"
 
@@ -128,8 +129,24 @@ func genPackage(version string, crgenerators []CustomResourceGenerator, includeO
 	// See: https://github.com/pulumi/crd2pulumi/issues/43
 	pkgSpec := gen.PulumiSchema(unstructuredOpenAPISchema, gen.WithAllowHyphens(true))
 
+	// Populate the package spec with information used in previous versions of crd2pulumi to maintain backwards
+	// compatibility.
 	pkgSpec.Name = DefaultName
 	pkgSpec.Version = version
+	pkgSpec.Config = pschema.ConfigSpec{}
+	pkgSpec.Provider = pschema.ResourceSpec{}
+
+	// Save a serialized version of the package for debugging purposes.
+	// Save the unflattened OpenAPI spec for debugging purposes.
+	f := "/Users/rquitales/code/environs/pulumi-gen-sdk/new/pulumi-new-defaults.json"
+	file, err := os.Create(f)
+	if err != nil {
+		return nil, fmt.Errorf("error opening file: %w", err)
+	}
+	defer file.Close()
+	en := json.NewEncoder(file)
+	en.SetIndent("", "  ")
+	en.Encode(pkgSpec)
 
 	if !includeObjectMetaType {
 		delete(pkgSpec.Types, objectMetaToken)

tests/crds/k8sversion/mock_crd.yaml

@@ -16,4 +16,4 @@ spec:
         openAPIV3Schema:
           properties:
             testProperty:
-              type: string`
+              type: string