Fix cloud run tests

GoogleCloudPlatform · Aug 7, 2023 · 959012e · 959012e
1 parent 42fdd08
commit 959012e
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 13 deletions.
diff --git a/tests/modules/cloud_run/examples/connector-shared.yaml b/tests/modules/cloud_run/examples/connector-shared.yaml
@@ -22,7 +22,7 @@ values:
     project: project-id
     template:
     - metadata:
-      - labels: null
+      - {}
       spec:
       - containers:
         - args: null
@@ -34,7 +34,6 @@ values:
           volume_mounts: []
           working_dir: null
         volumes: []
-    timeouts: null
   module.cloud_run.google_vpc_access_connector.connector[0]:
     ip_cidr_range: null
     machine_type: e2-micro
@@ -46,7 +45,6 @@ values:
     subnet:
     - name: subnet-vpc-access
       project_id: host-project
-    timeouts: null
 
 counts:
   google_cloud_run_service: 1

diff --git a/tests/modules/cloud_run/examples/connector.yaml b/tests/modules/cloud_run/examples/connector.yaml
@@ -16,11 +16,13 @@ values:
   module.cloud_run.google_cloud_run_service.service:
     autogenerate_revision_name: false
     location: europe-west1
+    metadata:
+    - {}
     name: hello
     project: project-id
     template:
     - metadata:
-      - labels: null
+      - {}
       spec:
       - containers:
         - args: null

diff --git a/tests/modules/cloud_run/examples/revision-annotations.yaml b/tests/modules/cloud_run/examples/revision-annotations.yaml
@@ -14,14 +14,19 @@
 
 values:
   module.cloud_run.google_cloud_run_service.service:
+    autogenerate_revision_name: false
+    location: europe-west1
+    metadata:
+    - {}
+    name: hello
+    project: project-id
     template:
     - metadata:
       - annotations:
           autoscaling.knative.dev/maxScale: '10'
           autoscaling.knative.dev/minScale: '1'
           run.googleapis.com/vpc-access-connector: foo
           run.googleapis.com/vpc-access-egress: all-traffic
-        labels: null
       spec:
       - containers:
         - args: null
@@ -36,7 +41,3 @@ values:
 
 counts:
   google_cloud_run_service: 1
-  modules: 1
-  resources: 1
-
-outputs: {}
diff --git a/tests/modules/cloud_run/examples/secrets.yaml b/tests/modules/cloud_run/examples/secrets.yaml
@@ -14,9 +14,15 @@
 
 values:
   module.cloud_run.google_cloud_run_service.service:
+    autogenerate_revision_name: false
+    location: region
+    metadata:
+    - {}
+    name: hello
+    project: project-id
     template:
     - metadata:
-      - labels: null
+      - {}
       spec:
       - containers:
         - args: null

diff --git a/tests/modules/cloud_run/examples/service-account-external.yaml b/tests/modules/cloud_run/examples/service-account-external.yaml
@@ -14,9 +14,15 @@
 
 values:
   module.cloud_run.google_cloud_run_service.service:
+    autogenerate_revision_name: false
+    location: europe-west1
+    metadata:
+    - {}
+    name: hello
+    project: my-project
     template:
     - metadata:
-      - labels: null
+      - {}
       spec:
       - containers:
         - args: null

diff --git a/tests/modules/cloud_run/examples/service-account.yaml b/tests/modules/cloud_run/examples/service-account.yaml
@@ -22,7 +22,7 @@ values:
     project: my-project
     template:
     - metadata:
-      - labels: null
+      - {}
       spec:
       - containers:
         - args: null
@@ -36,6 +36,9 @@ values:
         volumes: []
   module.cloud_run.google_service_account.service_account[0]:
     account_id: tf-cr-hello
+    description: null
+    disabled: false
+    display_name: Terraform Cloud Run hello.
     project: my-project
 
 counts:

diff --git a/tests/modules/cloud_run/examples/simple.yaml b/tests/modules/cloud_run/examples/simple.yaml
@@ -16,11 +16,13 @@ values:
   module.cloud_run.google_cloud_run_service.service:
     autogenerate_revision_name: false
     location: europe-west1
+    metadata:
+    - {}
     name: hello
     project: my-project
     template:
     - metadata:
-      - labels: null
+      - {}
       spec:
       - containers:
         - args: null