Merge remote-tracking branch 'origin/master' into fast-dev

2025-10-18 14:22:57 +00:00
parent 84a258e247 d0f109f42b
commit 5e05044306
45 changed files with 759 additions and 1882 deletions
--- a/tests/fast/stages/s0_org_setup/not-simple.yaml
+++ b/tests/fast/stages/s0_org_setup/not-simple.yaml
@@ -2781,7 +2781,7 @@ counts:
  google_organization_iam_custom_role: 9
  google_project: 3
  google_project_iam_binding: 16
-  google_project_iam_member: 15
+  google_project_iam_member: 18
  google_project_service: 33
  google_project_service_identity: 9
  google_service_account: 16
--- a/tests/fast/stages/s2_networking_a_simple/ncc.yaml
+++ b/tests/fast/stages/s2_networking_a_simple/ncc.yaml
@@ -1,4 +1,4 @@
-# Copyright 2024 Google LLC
+# Copyright 2025 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -36,10 +36,10 @@ counts:
  google_network_connectivity_spoke: 2
  google_project: 3
  google_project_iam_binding: 2
-  google_project_iam_member: 22
+  google_project_iam_member: 24
  google_project_service: 28
  google_project_service_identity: 22
  google_storage_bucket_object: 2
  google_tags_tag_binding: 3
  modules: 23
-  resources: 189
+  resources: 191
--- a/tests/fast/stages/s2_networking_a_simple/simple.yaml
+++ b/tests/fast/stages/s2_networking_a_simple/simple.yaml
@@ -1,4 +1,4 @@
-# Copyright 2024 Google LLC
+# Copyright 2025 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -40,11 +40,11 @@ counts:
  google_monitoring_monitored_project: 2
  google_project: 3
  google_project_iam_binding: 2
-  google_project_iam_member: 22
+  google_project_iam_member: 24
  google_project_service: 28
  google_project_service_identity: 22
  google_storage_bucket_object: 2
  google_tags_tag_binding: 3
  modules: 28
  random_id: 3
-  resources: 206
+  resources: 208
--- a/tests/fast/stages/s2_networking_a_simple/vpn.yaml
+++ b/tests/fast/stages/s2_networking_a_simple/vpn.yaml
@@ -1,4 +1,4 @@
-# Copyright 2024 Google LLC
+# Copyright 2025 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -38,11 +38,11 @@ counts:
  google_monitoring_monitored_project: 2
  google_project: 3
  google_project_iam_binding: 2
-  google_project_iam_member: 22
+  google_project_iam_member: 24
  google_project_service: 28
  google_project_service_identity: 22
  google_storage_bucket_object: 2
  google_tags_tag_binding: 3
  modules: 30
  random_id: 17
-  resources: 253
+  resources: 255
--- a/tests/fast/stages/s2_networking_b_nva/ncc-ra.yaml
+++ b/tests/fast/stages/s2_networking_b_nva/ncc-ra.yaml
@@ -1,4 +1,4 @@
-# Copyright 2024 Google LLC
+# Copyright 2025 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -43,11 +43,11 @@ counts:
  google_network_connectivity_spoke: 4
  google_project: 3
  google_project_iam_binding: 2
-  google_project_iam_member: 22
+  google_project_iam_member: 24
  google_project_service: 28
  google_project_service_identity: 22
  google_storage_bucket_object: 2
  google_tags_tag_binding: 3
  modules: 38
  random_id: 6
-  resources: 273
+  resources: 275
--- a/tests/fast/stages/s2_networking_b_nva/regional.yaml
+++ b/tests/fast/stages/s2_networking_b_nva/regional.yaml
@@ -1,4 +1,4 @@
-# Copyright 2024 Google LLC
+# Copyright 2025 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -45,11 +45,11 @@ counts:
  google_monitoring_monitored_project: 2
  google_project: 3
  google_project_iam_binding: 2
-  google_project_iam_member: 22
+  google_project_iam_member: 24
  google_project_service: 28
  google_project_service_identity: 22
  google_storage_bucket_object: 2
  google_tags_tag_binding: 3
  modules: 46
  random_id: 6
-  resources: 283
+  resources: 285
--- a/tests/fast/stages/s2_networking_b_nva/simple.yaml
+++ b/tests/fast/stages/s2_networking_b_nva/simple.yaml
@@ -1,4 +1,4 @@
-# Copyright 2024 Google LLC
+# Copyright 2025 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -45,11 +45,11 @@ counts:
  google_monitoring_monitored_project: 2
  google_project: 3
  google_project_iam_binding: 2
-  google_project_iam_member: 22
+  google_project_iam_member: 24
  google_project_service: 28
  google_project_service_identity: 22
  google_storage_bucket_object: 2
  google_tags_tag_binding: 3
  modules: 42
  random_id: 6
-  resources: 259
+  resources: 261
--- a/tests/fast/stages/s2_networking_c_separate_envs/simple.yaml
+++ b/tests/fast/stages/s2_networking_c_separate_envs/simple.yaml
@@ -1,4 +1,4 @@
-# Copyright 2024 Google LLC
+# Copyright 2025 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -38,11 +38,11 @@ counts:
  google_monitoring_dashboard: 6
  google_project: 2
  google_project_iam_binding: 2
-  google_project_iam_member: 18
+  google_project_iam_member: 20
  google_project_service: 22
  google_project_service_identity: 18
  google_storage_bucket_object: 2
  google_tags_tag_binding: 2
  modules: 23
  random_id: 6
-  resources: 231
+  resources: 233
--- a/tests/fast/stages/s3_data_platform_dev/simple.yaml
+++ b/tests/fast/stages/s3_data_platform_dev/simple.yaml
@@ -1,4 +1,4 @@
-# Copyright 2024 Google LLC
+# Copyright 2025 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -24,7 +24,7 @@ counts:
  google_folder_iam_binding: 3
  google_project: 3
  google_project_iam_binding: 23
-  google_project_iam_member: 12
+  google_project_iam_member: 15
  google_project_service: 18
  google_project_service_identity: 6
  google_service_account: 6
@@ -37,4 +37,4 @@ counts:
  google_tags_tag_key: 1
  google_tags_tag_value: 1
  modules: 19
-  resources: 109
+  resources: 112
--- a/tests/modules/cloud_run_v2/examples/service-vpc-access-connector-create-sharedvpc.yaml
+++ b/tests/modules/cloud_run_v2/examples/service-vpc-access-connector-create-sharedvpc.yaml
@@ -53,6 +53,6 @@ counts:
  google_cloud_run_v2_service: 1
  google_vpc_access_connector: 1
  modules: 4
-  resources: 59
+  resources: 60

 outputs: {}
--- a/tests/modules/net_vpc_factory/ncc.yaml
+++ b/tests/modules/net_vpc_factory/ncc.yaml
@@ -1,4 +1,4 @@
-# Copyright 2023 Google LLC
+# Copyright 2025 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -32,9 +32,9 @@ counts:
  google_network_connectivity_hub: 1
  google_network_connectivity_spoke: 3
  google_project: 3
-  google_project_iam_member: 21
+  google_project_iam_member: 24
  google_project_service: 27
  google_project_service_identity: 21
  modules: 17
  random_id: 3
-  resources: 136
+  resources: 139
--- a/tests/modules/net_vpc_factory/only_projects.yaml
+++ b/tests/modules/net_vpc_factory/only_projects.yaml
@@ -1,4 +1,4 @@
-# Copyright 2023 Google LLC
+# Copyright 2025 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,8 +14,8 @@

 counts:
  google_project: 3
-  google_project_iam_member: 21
+  google_project_iam_member: 24
  google_project_service: 27
  google_project_service_identity: 21
  modules: 3
-  resources: 72
+  resources: 75
--- a/tests/modules/net_vpc_factory/peering.yaml
+++ b/tests/modules/net_vpc_factory/peering.yaml
@@ -1,4 +1,4 @@
-# Copyright 2023 Google LLC
+# Copyright 2025 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -30,9 +30,9 @@ counts:
  google_dns_policy: 4
  google_dns_record_set: 1
  google_project: 3
-  google_project_iam_member: 21
+  google_project_iam_member: 24
  google_project_service: 27
  google_project_service_identity: 21
  modules: 18
  random_id: 3
-  resources: 139
+  resources: 142
--- a/tests/modules/net_vpc_factory/separate_envs.yaml
+++ b/tests/modules/net_vpc_factory/separate_envs.yaml
@@ -1,4 +1,4 @@
-# Copyright 2023 Google LLC
+# Copyright 2025 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -27,9 +27,9 @@ counts:
  google_compute_vpn_tunnel: 2
  google_dns_policy: 2
  google_project: 3
-  google_project_iam_member: 21
+  google_project_iam_member: 24
  google_project_service: 27
  google_project_service_identity: 21
  modules: 11
  random_id: 4
-  resources: 114
+  resources: 117
--- a/tests/modules/net_vpc_factory/vpn.yaml
+++ b/tests/modules/net_vpc_factory/vpn.yaml
@@ -1,4 +1,4 @@
-# Copyright 2023 Google LLC
+# Copyright 2025 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -29,9 +29,9 @@ counts:
  google_dns_policy: 4
  google_dns_record_set: 1
  google_project: 3
-  google_project_iam_member: 21
+  google_project_iam_member: 24
  google_project_service: 27
  google_project_service_identity: 21
  modules: 22
  random_id: 15
-  resources: 175
+  resources: 178
--- a/tests/modules/project/examples/data.yaml
+++ b/tests/modules/project/examples/data.yaml
@@ -516,7 +516,7 @@ counts:
  google_project: 2
  google_project_iam_audit_config: 2
  google_project_iam_binding: 7
-  google_project_iam_member: 14
+  google_project_iam_member: 15
  google_project_service: 7
  google_project_service_identity: 3
  google_pubsub_topic: 1
@@ -525,7 +525,7 @@ counts:
  google_storage_bucket_iam_member: 1
  google_storage_project_service_account: 1
  modules: 8
-  resources: 63
+  resources: 64


 outputs: {}
--- a/tests/modules/project_factory/examples/example.yaml
+++ b/tests/modules/project_factory/examples/example.yaml
@@ -145,6 +145,19 @@ values:
    display_name: App 0
    tags: null
    timeouts: null
+  module.project-factory.module.folder-2["team-a/app-0"].google_org_policy_policy.default["compute.disableSerialPortAccess"]:
+    dry_run_spec: []
+    spec:
+    - inherit_from_parent: null
+      reset: null
+      rules:
+      - allow_all: null
+        condition: []
+        deny_all: null
+        enforce: 'FALSE'
+        parameters: null
+        values: []
+    timeouts: null
  module.project-factory.module.folder-2["team-b/app-0"].google_folder.folder[0]:
    deletion_protection: false
    display_name: App 0
@@ -438,6 +451,21 @@ values:
    - ALL
    parent: projects/test-pf-teams-iac-0
    timeouts: null
+  module.project-factory.module.projects["teams-iac-0"].google_org_policy_policy.default["compute.disableSerialPortAccess"]:
+    dry_run_spec: []
+    name: projects/test-pf-teams-iac-0/policies/compute.disableSerialPortAccess
+    parent: projects/test-pf-teams-iac-0
+    spec:
+    - inherit_from_parent: null
+      reset: null
+      rules:
+      - allow_all: null
+        condition: []
+        deny_all: null
+        enforce: 'FALSE'
+        parameters: null
+        values: []
+    timeouts: null
  module.project-factory.module.projects["teams-iac-0"].google_project.project[0]:
    auto_create_network: false
    billing_account: 012345-67890A-BCDEF0
@@ -587,6 +615,7 @@ counts:
  google_folder_iam_binding: 1
  google_kms_crypto_key_iam_member: 2
  google_monitoring_notification_channel: 1
+  google_org_policy_policy: 2
  google_project: 4
  google_project_iam_binding: 6
  google_project_iam_member: 21
@@ -602,5 +631,5 @@ counts:
  google_tags_tag_value: 2
  google_tags_tag_value_iam_binding: 1
  modules: 23
-  resources: 86
+  resources: 88
  terraform_data: 1