Merge branch 'master' into dependabot/go_modules/cli/all-2e5a1cbab4

GoogleCloudPlatform · Oct 25, 2023 · f859596 · f859596
2 parents 2dad883 + 5f118ff
commit f859596
Show file tree

Hide file tree

Showing 4 changed files with 84 additions and 56 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.6
+VERSION=v1.2.7
 BINARY=bin/cft
 GITHUB_REPO=github.com/GoogleCloudPlatform/cloud-foundation-toolkit
 PLATFORMS := linux windows darwin

diff --git a/cli/bpmetadata/bpmetadata_ui.pb.go b/cli/bpmetadata/bpmetadata_ui.pb.go
diff --git a/cli/bpmetadata/proto/bpmetadata_ui.proto b/cli/bpmetadata/proto/bpmetadata_ui.proto
@@ -103,6 +103,15 @@ message DisplayVariable {
   // Values must be UTF-8 text with no markup, and at most 64 characters.
   // Gen: manually-authored
   repeated ValueLabel enum_value_labels = 17; // @gotags: json:"enumValueLabels,omitempty" yaml:"enumValueLabels,omitempty"
+
+  // Indicates the "advanced" level of the input property. Level 0 (default)
+  // will always be shown. Level 1 corresponds to one expansion (user clicks
+  // "show advanced options" or "more options"). Higher levels correspond to
+  // further expansions, or they may be collapsed to level 1 by the UI
+  // implementation.
+  // Optional.
+  // Gen: manually-authored
+  int32 level = 18; // @gotags: json:"level,omitempty" yaml:"level,omitempty"
 }
 
 message ValueLabel {

diff --git a/cli/bpmetadata/schema/gcp-blueprint-metadata.json b/cli/bpmetadata/schema/gcp-blueprint-metadata.json
@@ -708,6 +708,9 @@
             "$ref": "#/$defs/ValueLabel"
           },
           "type": "array"
+        },
+        "level": {
+          "type": "integer"
         }
       },
       "additionalProperties": false,