Merge branch 'master' into ehorning/support-gcs-object-upload

tests/modules/cloud_function_v2/examples/iam.yaml

@@ -13,17 +13,37 @@
 # limitations under the License.
 
 values:
-  module.cf-http.google_cloudfunctions2_function_iam_binding.default["roles/cloudfunctions.invoker"]:
-    cloud_function: test-cf-http
+  module.cf-http.google_cloud_run_service_iam_binding.invoker[0]:
     condition: []
     location: europe-west1
     members:
     - allUsers
     project: my-project
-    role: roles/cloudfunctions.invoker
+    role: roles/run.invoker
+    service: test-cf-http
+  module.cf-http.google_cloudfunctions2_function.function: {}
+  module.cf-http.google_storage_bucket_object.bundle:
+    bucket: test-cf-bundles
+    cache_control: null
+    content: null
+    content_disposition: null
+    content_encoding: null
+    content_language: null
+    customer_encryption: []
+    detect_md5hash: different hash
+    event_based_hold: null
+    metadata: null
+    name: bundle-6f1ece136848fee658e335b05fe2d79d.zip
+    source: bundle.zip
+    temporary_hold: null
+    timeouts: null
 
 counts:
+  google_cloud_run_service_iam_binding: 1
   google_cloudfunctions2_function: 1
   google_storage_bucket_object: 1
   modules: 1
   resources: 3
+
+outputs: {}
+

tests/modules/cloud_run/examples/trigger-service-account-external.yaml

@@ -13,10 +13,61 @@
 # limitations under the License.
 
 values:
-  module.cloud_run.google_cloud_run_service.service: {}
+  module.cloud_run.google_cloud_run_service.service:
+    autogenerate_revision_name: false
+    location: europe-west1
+    metadata:
+    - {}
+    name: hello
+    project: my-project
+    template:
+    - metadata:
+      - {}
+      spec:
+      - containers:
+        - args: null
+          command: null
+          env: []
+          env_from: []
+          image: us-docker.pkg.dev/cloudrun/container/hello
+          liveness_probe: []
+          volume_mounts: []
+          working_dir: null
+        volumes: []
+    timeouts: null
   module.cloud_run.google_eventarc_trigger.audit_log_triggers["setiampolicy"]:
-    service_account: cloud-run-trigger@my-project.iam.gserviceaccount.com
+    channel: null
+    destination:
+    - cloud_function: null
+      cloud_run_service:
+      - path: null
+        region: europe-west1
+        service: hello
+      gke: []
+      workflow: null
+    event_data_content_type: null
+    labels: null
+    location: europe-west1
+    matching_criteria:
+    - attribute: methodName
+      operator: ''
+      value: SetIamPolicy
+    - attribute: serviceName
+      operator: ''
+      value: cloudresourcemanager.googleapis.com
+    - attribute: type
+      operator: ''
+      value: google.cloud.audit.log.v1.written
+    name: audit-log-setiampolicy
+    project: my-project
+    service_account: null
+    timeouts: null
 
 counts:
   google_cloud_run_service: 1
   google_eventarc_trigger: 1
+  modules: 1
+  resources: 2
+
+outputs: {}
+

tests/modules/cloud_run/examples/trigger-service-account.yaml

@@ -13,23 +13,95 @@
 # limitations under the License.
 
 values:
-  module.cloud_run.google_cloud_run_service.service: {}
-  module.cloud_run.google_cloud_run_service_iam_binding.binding["roles/run.invoker"]:
+  module.cloud_run.google_cloud_run_service.service:
+    autogenerate_revision_name: false
+    location: europe-west1
+    metadata:
+    - {}
+    name: hello
+    project: my-project
+    template:
+    - metadata:
+      - {}
+      spec:
+      - containers:
+        - args: null
+          command: null
+          env: []
+          env_from: []
+          image: us-docker.pkg.dev/cloudrun/container/hello
+          liveness_probe: []
+          volume_mounts: []
+          working_dir: null
+        volumes: []
+    timeouts: null
+  module.cloud_run.google_cloud_run_service_iam_member.default[0]:
+    condition: []
+    location: europe-west1
     project: my-project
     role: roles/run.invoker
     service: hello
-    # members: ["known after apply"]
-  module.cloud_run.google_eventarc_trigger.pubsub_triggers["topic-1"]: {}
-    # service_account: known after apply
-  module.cloud_run.google_eventarc_trigger.pubsub_triggers["topic-2"]: {}
-    # service_account: known after apply
+  module.cloud_run.google_eventarc_trigger.pubsub_triggers["topic-1"]:
+    channel: null
+    destination:
+    - cloud_function: null
+      cloud_run_service:
+      - path: null
+        region: europe-west1
+        service: hello
+      gke: []
+      workflow: null
+    event_data_content_type: null
+    labels: null
+    location: europe-west1
+    matching_criteria:
+    - attribute: type
+      operator: ''
+      value: google.cloud.pubsub.topic.v1.messagePublished
+    name: pubsub-topic-1
+    project: my-project
+    timeouts: null
+    transport:
+    - pubsub:
+      - topic: topic1
+  module.cloud_run.google_eventarc_trigger.pubsub_triggers["topic-2"]:
+    channel: null
+    destination:
+    - cloud_function: null
+      cloud_run_service:
+      - path: null
+        region: europe-west1
+        service: hello
+      gke: []
+      workflow: null
+    event_data_content_type: null
+    labels: null
+    location: europe-west1
+    matching_criteria:
+    - attribute: type
+      operator: ''
+      value: google.cloud.pubsub.topic.v1.messagePublished
+    name: pubsub-topic-2
+    project: my-project
+    timeouts: null
+    transport:
+    - pubsub:
+      - topic: topic2
   module.cloud_run.google_service_account.trigger_service_account[0]:
     account_id: tf-cr-trigger-hello
+    description: null
+    disabled: false
     display_name: Terraform trigger for Cloud Run hello.
     project: my-project
+    timeouts: null
 
 counts:
   google_cloud_run_service: 1
-  google_cloud_run_service_iam_binding: 1
+  google_cloud_run_service_iam_member: 1
   google_eventarc_trigger: 2
   google_service_account: 1
+  modules: 1
+  resources: 5
+
+outputs: {}
+