Update to Pulumi v3.21.0. (#63)

* Update to Pulumi v3.21.0. This brings in many improvements to code generation, including support for default values for union-typed properties.
pulumi · Jan 4, 2022 · 671bb76 · 671bb76
1 parent 3bed7df
commit 671bb76
Show file tree

Hide file tree

Showing 4 changed files with 313 additions and 464 deletions.
diff --git a/gen/python.go b/gen/python.go
@@ -78,9 +78,9 @@ func (pg *PackageGenerator) genPythonFiles(name string) (map[string]*bytes.Buffe
 
 	// Import the actual SDK ObjectMeta types in place of our placeholder ones
 	if pg.HasSchemas() {
-		metaPath := filepath.Join(pythonPackageDir, "meta_v1", "__init__.py")
+		metaPath := filepath.Join(pythonPackageDir, "meta/v1", "__init__.py")
 		code, ok := files[metaPath]
-		contract.Assertf(ok, "missing meta_v1/__init__.py file")
+		contract.Assertf(ok, "missing meta/v1/__init__.py file")
 		files[metaPath] = append(code, []byte(pythonMetaFile)...)
 	}
 

diff --git a/gen/schema.go b/gen/schema.go
@@ -15,11 +15,13 @@
 package gen
 
 import (
+	"sort"
 	"strconv"
 	"strings"
 
 	"github.com/pkg/errors"
 	pschema "github.com/pulumi/pulumi/pkg/v3/codegen/schema"
+	"github.com/pulumi/pulumi/sdk/v3/go/common/tokens"
 	unstruct "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 )
 
@@ -117,20 +119,29 @@ func genPackage(types map[string]pschema.ComplexTypeSpec, resourceTokens []strin
 		}
 	}
 
+	packages := map[string]bool{DefaultName: true, "kubernetes": true}
 	resources := map[string]pschema.ResourceSpec{}
 	for _, baseRef := range resourceTokens {
 		complexTypeSpec := types[baseRef]
 		resources[baseRef] = pschema.ResourceSpec{
 			ObjectTypeSpec:  complexTypeSpec.ObjectTypeSpec,
 			InputProperties: complexTypeSpec.Properties,
 		}
+		packages[string(tokens.ModuleMember(baseRef).Package())] = true
 	}
 
+	allowedPackages := make([]string, 0, len(packages))
+	for pkg := range packages {
+		allowedPackages = append(allowedPackages, pkg)
+	}
+	sort.Strings(allowedPackages)
+
 	pkgSpec := pschema.PackageSpec{
-		Name:      DefaultName,
-		Version:   Version,
-		Types:     types,
-		Resources: resources,
+		Name:                DefaultName,
+		Version:             Version,
+		Types:               types,
+		Resources:           resources,
+		AllowedPackageNames: allowedPackages,
 	}
 
 	pkg, err := pschema.ImportSpec(pkgSpec, nil)
@@ -178,11 +189,11 @@ func AddType(schema map[string]interface{}, name string, types map[string]pschem
 
 	types[name] = pschema.ComplexTypeSpec{
 		ObjectTypeSpec: pschema.ObjectTypeSpec{
-		Type:        schemaType,
-		Properties:  propertySpecs,
-		Required:    required,
-		Description: description,
-	}}
+			Type:        schemaType,
+			Properties:  propertySpecs,
+			Required:    required,
+			Description: description,
+		}}
 }
 
 // GetTypeSpec returns the corresponding pschema.TypeSpec for a OpenAPI v3

diff --git a/go.mod b/go.mod
@@ -4,8 +4,8 @@ go 1.16
 
 require (
 	github.com/pkg/errors v0.9.1
-	github.com/pulumi/pulumi/pkg/v3 v3.0.0
-	github.com/pulumi/pulumi/sdk/v3 v3.0.0
+	github.com/pulumi/pulumi/pkg/v3 v3.21.0
+	github.com/pulumi/pulumi/sdk/v3 v3.21.0
 	github.com/spf13/cobra v1.0.0
 	github.com/spf13/pflag v1.0.5
 	github.com/stretchr/testify v1.6.1