fix: update display metadata (#288)

modules/v2/README.md

@@ -46,12 +46,12 @@ Functional examples are included in the
 | custom\_audiences | One or more custom audiences that you want this service to support. Specify each custom audience as the full URL in a string. Refer https://cloud.google.com/run/docs/configuring/custom-audiences | `list(string)` | `null` | no |
 | description | Cloud Run service description. This field currently has a 512-character limit. | `string` | `null` | no |
 | enable\_prometheus\_sidecar | Enable Prometheus sidecar in Cloud Run instance. | `bool` | `false` | no |
-| encryption\_key | A reference to a customer managed encryption key (CMEK) to use to encrypt this container image. | `string` | `null` | no |
+| encryption\_key | A reference to a customer managed encryption key (CMEK) to use to encrypt this container image. This is optional. | `string` | `null` | no |
 | execution\_environment | The sandbox environment to host this Revision. | `string` | `"EXECUTION_ENVIRONMENT_GEN2"` | no |
 | ingress | Provides the ingress settings for this Service. On output, returns the currently observed ingress settings, or INGRESS\_TRAFFIC\_UNSPECIFIED if no revision is active. | `string` | `"INGRESS_TRAFFIC_ALL"` | no |
 | launch\_stage | The launch stage as defined by Google Cloud Platform Launch Stages. Cloud Run supports ALPHA, BETA, and GA. If no value is specified, GA is assumed. | `string` | `"GA"` | no |
 | location | Cloud Run service deployment location | `string` | n/a | yes |
-| max\_instance\_request\_concurrency | Sets the maximum number of requests that each serving instance can receive | `string` | `null` | no |
+| max\_instance\_request\_concurrency | Sets the maximum number of requests that each serving instance can receive. This is optional. | `string` | `null` | no |
 | members | Users/SAs to be given invoker access to the service | `list(string)` | `[]` | no |
 | project\_id | The project ID to deploy to | `string` | n/a | yes |
 | revision | The unique name for the revision. If this field is omitted, it will be automatically generated based on the Service name | `string` | `null` | no |

modules/v2/metadata.display.yaml

@@ -38,6 +38,9 @@ spec:
           name: cloud_run_deletion_protection
           title: Cloud Run Deletion Protection
           level: 1
+          altDefaults:
+            - type: ALTERNATE_TYPE_DC
+              value: false
         containers:
           name: containers
           title: Containers
@@ -69,12 +72,27 @@ spec:
         encryption_key:
           name: encryption_key
           title: Encryption Key
+          level: 1
         execution_environment:
           name: execution_environment
           title: Execution Environment
+          level: 1
+          enumValueLabels:
+            - label: EXECUTION_ENVIRONMENT_GEN2
+              value: EXECUTION_ENVIRONMENT_GEN2
+            - label: EXECUTION_ENVIRONMENT_GEN1
+              value: EXECUTION_ENVIRONMENT_GEN1
         ingress:
           name: ingress
           title: Ingress
+          level: 1
+          enumValueLabels:
+            - label: INGRESS_TRAFFIC_ALL
+              value: INGRESS_TRAFFIC_ALL
+            - label: INGRESS_TRAFFIC_INTERNAL_ONLY
+              value: INGRESS_TRAFFIC_INTERNAL_ONLY
+            - label: INGRESS_TRAFFIC_INTERNAL_LOAD_BALANCER
+              value: INGRESS_TRAFFIC_INTERNAL_LOAD_BALANCER
         launch_stage:
           name: launch_stage
           title: Launch Stage
@@ -84,6 +102,7 @@ spec:
         max_instance_request_concurrency:
           name: max_instance_request_concurrency
           title: Max Instance Request Concurrency
+          level: 1
         members:
           name: members
           title: Members
@@ -94,6 +113,7 @@ spec:
         revision:
           name: revision
           title: Revision
+          level: 1
         service_account:
           name: service_account
           title: Service Account
@@ -119,6 +139,12 @@ spec:
         session_affinity:
           name: session_affinity
           title: Session Affinity
+          level: 1
+          enumValueLabels:
+            - label: "true"
+              value: "true"
+            - label: "false"
+              value: "false"
         template_annotations:
           name: template_annotations
           title: Template Annotations
@@ -128,6 +154,7 @@ spec:
         template_scaling:
           name: template_scaling
           title: Template Scaling
+          level: 1
         timeout:
           name: timeout
           title: Timeout

modules/v2/metadata.yaml

@@ -175,7 +175,7 @@ spec:
               source: github.com/GoogleCloudPlatform/terraform-google-secret-manager//modules/simple-secret
               version: ">= 0.5.1"
             spec:
-              outputExpr: env_vars
+              outputExpr: "{\"SECRET\": env_vars.SECRET }"
               inputPath: env_secret_vars
       - name: create_service_account
         description: Create a new service account for cloud run service
@@ -354,10 +354,10 @@ spec:
             spec:
               outputExpr: email
       - name: encryption_key
-        description: A reference to a customer managed encryption key (CMEK) to use to encrypt this container image.
+        description: A reference to a customer managed encryption key (CMEK) to use to encrypt this container image. This is optional.
         varType: string
       - name: max_instance_request_concurrency
-        description: Sets the maximum number of requests that each serving instance can receive
+        description: Sets the maximum number of requests that each serving instance can receive. This is optional.
         varType: string
       - name: session_affinity
         description: Enables session affinity. For more information, go to https://cloud.google.com/run/docs/configuring/session-affinity

modules/v2/variables.tf

@@ -308,14 +308,14 @@ variable "service_account" {
 }
 
 variable "encryption_key" {
-  description = "A reference to a customer managed encryption key (CMEK) to use to encrypt this container image."
+  description = "A reference to a customer managed encryption key (CMEK) to use to encrypt this container image. This is optional."
   type        = string
   default     = null
 }
 
 variable "max_instance_request_concurrency" {
   type        = string
-  description = "Sets the maximum number of requests that each serving instance can receive"
+  description = "Sets the maximum number of requests that each serving instance can receive. This is optional."
   default     = null
 }