fix: omit null defaultValue in bpmetadata (#2048)

Co-authored-by: Andrew Peabody <[email protected]> Co-authored-by: Awais Malik <[email protected]>
GoogleCloudPlatform · Jan 5, 2024 · 1b5665e · 1b5665e
1 parent c49c5c5
commit 1b5665e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/cli/Makefile b/cli/Makefile
@@ -1,7 +1,7 @@
 SHELL := /bin/bash
 
 # Changing this value will trigger a new release
-VERSION=v1.2.13
+VERSION=v1.2.14
 BINARY=bin/cft
 GITHUB_REPO=github.com/GoogleCloudPlatform/cloud-foundation-toolkit
 PLATFORMS := linux windows darwin

diff --git a/cli/bpmetadata/int-test/goldens/golden-metadata.yaml b/cli/bpmetadata/int-test/goldens/golden-metadata.yaml
@@ -151,7 +151,6 @@ spec:
       - name: names
         description: Bucket name suffixes.
         varType: list(string)
-        defaultValue: null
         required: true
       - name: prefix
         description: Prefix used to generate the bucket name.
@@ -160,7 +159,6 @@ spec:
       - name: project_id
         description: Bucket project id.
         varType: string
-        defaultValue: null
         required: true
       - name: public_access_prevention
         description: Prevents public access to a bucket. Acceptable values are inherited or enforced. If inherited, the bucket uses public access prevention, only if the bucket is subject to the public access prevention organization policy constraint.

diff --git a/cli/bpmetadata/tfconfig.go b/cli/bpmetadata/tfconfig.go
@@ -231,6 +231,9 @@ func getBlueprintVariable(modVar *tfconfig.Variable) *BlueprintVariable {
 		Required:    modVar.Required,
 		VarType:     modVar.Type,
 	}
+	if modVar.Default == nil {
+		return v
+	}
 
 	vl, err := structpb.NewValue(modVar.Default)
 	if err == nil {