Fix fast tests

GoogleCloudPlatform · Jul 29, 2024 · 99361d6 · 99361d6
1 parent 3ac8db3
commit 99361d6
Show file tree

Hide file tree

Showing 9 changed files with 49 additions and 41 deletions.
diff --git a/tests/fast/stages/s0_bootstrap/checklist.yaml b/tests/fast/stages/s0_bootstrap/checklist.yaml
@@ -376,15 +376,15 @@ counts:
   google_logging_organization_sink: 4
   google_logging_project_bucket_config: 4
   google_org_policy_policy: 22
-  google_organization_iam_binding: 28
-  google_organization_iam_custom_role: 7
+  google_organization_iam_binding: 29
+  google_organization_iam_custom_role: 9
   google_organization_iam_member: 41
   google_project: 3
   google_project_iam_audit_config: 1
   google_project_iam_binding: 19
   google_project_iam_member: 16
-  google_project_service: 30
-  google_project_service_identity: 6
+  google_project_service: 31
+  google_project_service_identity: 7
   google_service_account: 6
   google_service_account_iam_binding: 2
   google_service_account_iam_member: 1
@@ -396,4 +396,4 @@ counts:
   google_tags_tag_key: 1
   google_tags_tag_value: 1
   modules: 21
-  resources: 230
+  resources: 235
diff --git a/tests/fast/stages/s0_bootstrap/simple.yaml b/tests/fast/stages/s0_bootstrap/simple.yaml
@@ -22,7 +22,7 @@ counts:
   google_org_policy_policy: 22
   google_organization_iam_binding: 29
   google_organization_iam_custom_role: 9
-  google_organization_iam_member: 29
+  google_organization_iam_member: 28
   google_project: 3
   google_project_iam_audit_config: 1
   google_project_iam_binding: 19
@@ -41,7 +41,7 @@ counts:
   google_tags_tag_value: 1
   local_file: 10
   modules: 20
-  resources: 230
+  resources: 229
 
 outputs:
   automation: __missing__
@@ -67,5 +67,7 @@ outputs:
     resman: [email protected]
   tfvars: __missing__
   workforce_identity_pool:
+    pool: null
   workload_identity_pool:
+    pool: null
     providers: {}
diff --git a/tests/fast/stages/s1_resman/checklist.yaml b/tests/fast/stages/s1_resman/checklist.yaml
@@ -417,16 +417,16 @@ values:
 counts:
   google_folder: 56
   google_folder_iam_binding: 71
-  google_organization_iam_member: 6
-  google_project_iam_member: 4
-  google_service_account: 4
-  google_service_account_iam_binding: 4
-  google_storage_bucket: 2
-  google_storage_bucket_iam_binding: 4
-  google_storage_bucket_iam_member: 4
-  google_storage_bucket_object: 5
+  google_organization_iam_member: 8
+  google_project_iam_member: 6
+  google_service_account: 6
+  google_service_account_iam_binding: 6
+  google_storage_bucket: 3
+  google_storage_bucket_iam_binding: 6
+  google_storage_bucket_iam_member: 6
+  google_storage_bucket_object: 7
   google_tags_tag_binding: 4
   google_tags_tag_key: 2
   google_tags_tag_value: 9
-  modules: 63
-  resources: 175
+  modules: 66
+  resources: 190
diff --git a/tests/fast/stages/s2_networking_a_simple/ncc.yaml b/tests/fast/stages/s2_networking_a_simple/ncc.yaml
@@ -22,7 +22,7 @@ counts:
   google_compute_router: 2
   google_compute_router_nat: 2
   google_compute_shared_vpc_host_project: 3
-  google_compute_subnetwork: 5
+  google_compute_subnetwork: 7
   google_dns_managed_zone: 9
   google_dns_policy: 3
   google_dns_record_set: 3
@@ -40,6 +40,7 @@ counts:
   google_project_iam_member: 18
   google_project_service: 24
   google_project_service_identity: 18
-  google_storage_bucket_object: 1
-  modules: 22
-  resources: 168
+  google_storage_bucket_object: 2
+  google_vpc_access_connector: 2
+  modules: 24
+  resources: 173
diff --git a/tests/fast/stages/s2_networking_a_simple/simple.yaml b/tests/fast/stages/s2_networking_a_simple/simple.yaml
@@ -27,7 +27,7 @@ counts:
   google_compute_router_nat: 3
   google_compute_router_peer: 2
   google_compute_shared_vpc_host_project: 3
-  google_compute_subnetwork: 5
+  google_compute_subnetwork: 7
   google_compute_vpn_tunnel: 2
   google_dns_managed_zone: 9
   google_dns_policy: 3
@@ -44,7 +44,8 @@ counts:
   google_project_iam_member: 17
   google_project_service: 23
   google_project_service_identity: 17
-  google_storage_bucket_object: 1
-  modules: 27
+  google_storage_bucket_object: 2
+  google_vpc_access_connector: 2
+  modules: 29
   random_id: 1
-  resources: 180
+  resources: 185
diff --git a/tests/fast/stages/s2_networking_a_simple/vpn.yaml b/tests/fast/stages/s2_networking_a_simple/vpn.yaml
@@ -25,7 +25,7 @@ counts:
   google_compute_router_nat: 3
   google_compute_router_peer: 12
   google_compute_shared_vpc_host_project: 3
-  google_compute_subnetwork: 5
+  google_compute_subnetwork: 7
   google_compute_vpn_tunnel: 12
   google_dns_managed_zone: 9
   google_dns_policy: 3
@@ -42,7 +42,8 @@ counts:
   google_project_iam_member: 17
   google_project_service: 23
   google_project_service_identity: 17
-  google_storage_bucket_object: 1
-  modules: 29
+  google_storage_bucket_object: 2
+  google_vpc_access_connector: 2
+  modules: 31
   random_id: 5
-  resources: 217
+  resources: 222
diff --git a/tests/fast/stages/s2_networking_b_nva/ncc-ra.yaml b/tests/fast/stages/s2_networking_b_nva/ncc-ra.yaml
@@ -28,7 +28,7 @@ counts:
   google_compute_router_nat: 2
   google_compute_router_peer: 20
   google_compute_shared_vpc_host_project: 3
-  google_compute_subnetwork: 10
+  google_compute_subnetwork: 12
   google_compute_vpn_tunnel: 4
   google_dns_managed_zone: 9
   google_dns_policy: 4
@@ -47,7 +47,8 @@ counts:
   google_project_iam_member: 18
   google_project_service: 24
   google_project_service_identity: 18
-  google_storage_bucket_object: 1
-  modules: 37
+  google_storage_bucket_object: 2
+  google_vpc_access_connector: 2
+  modules: 39
   random_id: 2
-  resources: 248
+  resources: 253
diff --git a/tests/fast/stages/s2_networking_b_nva/simple.yaml b/tests/fast/stages/s2_networking_b_nva/simple.yaml
@@ -32,7 +32,7 @@ counts:
   google_compute_router_nat: 2
   google_compute_router_peer: 4
   google_compute_shared_vpc_host_project: 3
-  google_compute_subnetwork: 10
+  google_compute_subnetwork: 12
   google_compute_vpn_tunnel: 4
   google_dns_managed_zone: 9
   google_dns_policy: 4
@@ -49,7 +49,8 @@ counts:
   google_project_iam_member: 17
   google_project_service: 23
   google_project_service_identity: 17
-  google_storage_bucket_object: 1
-  modules: 41
+  google_storage_bucket_object: 2
+  google_vpc_access_connector: 2
+  modules: 43
   random_id: 2
-  resources: 231
+  resources: 236
diff --git a/tests/fast/stages/s2_networking_c_separate_envs/simple.yaml b/tests/fast/stages/s2_networking_c_separate_envs/simple.yaml
@@ -26,7 +26,7 @@ counts:
   google_compute_router_nat: 2
   google_compute_router_peer: 4
   google_compute_shared_vpc_host_project: 2
-  google_compute_subnetwork: 4
+  google_compute_subnetwork: 6
   google_compute_vpn_tunnel: 4
   google_dns_managed_zone: 6
   google_dns_policy: 2
@@ -42,7 +42,8 @@ counts:
   google_project_iam_member: 14
   google_project_service: 18
   google_project_service_identity: 14
-  google_storage_bucket_object: 1
-  modules: 20
+  google_storage_bucket_object: 2
+  google_vpc_access_connector: 2
+  modules: 22
   random_id: 2
-  resources: 199
+  resources: 204