stage 0 1 and 2 tests

GoogleCloudPlatform · Oct 23, 2024 · 4b149e3 · 4b149e3
1 parent f32b22b
commit 4b149e3
Show file tree

Hide file tree

Showing 16 changed files with 98 additions and 35 deletions.
diff --git a/tests/fast/stages/s2_networking_a_simple/ncc.tfvars b/tests/fast/stages/s2_networking_a_simple/ncc.tfvars
@@ -5,6 +5,7 @@ billing_account = {
   id = "000000-111111-222222"
 }
 custom_roles = {
+  project_iam_viewer            = "organizations/123456789012/roles/bar"
   service_project_network_admin = "organizations/123456789012/roles/foo"
 }
 dns = {

diff --git a/tests/fast/stages/s2_networking_a_simple/ncc.yaml b/tests/fast/stages/s2_networking_a_simple/ncc.yaml
@@ -35,12 +35,12 @@ counts:
   google_network_connectivity_hub: 1
   google_network_connectivity_spoke: 2
   google_project: 3
-  google_project_iam_binding: 4
-  google_project_iam_member: 18
-  google_project_service: 24
-  google_project_service_identity: 18
+  google_project_iam_binding: 2
+  google_project_iam_member: 20
+  google_project_service: 26
+  google_project_service_identity: 20
   google_storage_bucket_object: 2
   google_tags_tag_binding: 3
   google_vpc_access_connector: 2
   modules: 24
-  resources: 175
+  resources: 179
diff --git a/tests/fast/stages/s2_networking_a_simple/simple.tfvars b/tests/fast/stages/s2_networking_a_simple/simple.tfvars
@@ -5,6 +5,7 @@ billing_account = {
   id = "000000-111111-222222"
 }
 custom_roles = {
+  project_iam_viewer            = "organizations/123456789012/roles/bar"
   service_project_network_admin = "organizations/123456789012/roles/foo"
 }
 dns = {
@@ -40,6 +41,31 @@ organization = {
   customer_id = "C00000000"
 }
 prefix = "fast2"
+stage_config = {
+  networking = {
+    iam_delegated_principals = {
+      dev = [
+        "serviceAccount:fast2-dev-resman-gcve-0@fast2-prod-iac-core-0.iam.gserviceaccount.com",
+        "serviceAccount:fast2-dev-resman-pf-0@fast2-prod-iac-core-0.iam.gserviceaccount.com"
+      ]
+      prod = [
+        "serviceAccount:fast2-prod-resman-gcve-0@fast2-prod-iac-core-0.iam.gserviceaccount.com",
+        "serviceAccount:fast2-prod-resman-pf-0@fast2-prod-iac-core-0.iam.gserviceaccount.com"
+      ]
+    }
+    iam_viewer_principals = {
+      dev = [
+        "serviceAccount:fast2-dev-resman-gcve-0r@fast2-prod-iac-core-0.iam.gserviceaccount.com",
+        "serviceAccount:fast2-dev-resman-pf-0r@fast2-prod-iac-core-0.iam.gserviceaccount.com"
+      ]
+      prod = [
+        "serviceAccount:fast2-prod-resman-gcve-0r@fast2-prod-iac-core-0.iam.gserviceaccount.com",
+        "serviceAccount:fast2-prod-resman-pf-0r@fast2-prod-iac-core-0.iam.gserviceaccount.com"
+      ]
+    }
+    short_name = "net"
+  }
+}
 tag_values = {
   "environment/development" = "tagValues/12345"
   "environment/production"  = "tagValues/12346"

diff --git a/tests/fast/stages/s2_networking_a_simple/simple.yaml b/tests/fast/stages/s2_networking_a_simple/simple.yaml
@@ -40,12 +40,12 @@ counts:
   google_monitoring_monitored_project: 2
   google_project: 3
   google_project_iam_binding: 4
-  google_project_iam_member: 17
-  google_project_service: 23
-  google_project_service_identity: 17
+  google_project_iam_member: 20
+  google_project_service: 26
+  google_project_service_identity: 20
   google_storage_bucket_object: 2
   google_tags_tag_binding: 3
   google_vpc_access_connector: 2
   modules: 29
   random_id: 1
-  resources: 187
+  resources: 196
diff --git a/tests/fast/stages/s2_networking_a_simple/vpn.tfvars b/tests/fast/stages/s2_networking_a_simple/vpn.tfvars
@@ -5,6 +5,7 @@ billing_account = {
   id = "000000-111111-222222"
 }
 custom_roles = {
+  project_iam_viewer            = "organizations/123456789012/roles/bar"
   service_project_network_admin = "organizations/123456789012/roles/foo"
 }
 dns = {

diff --git a/tests/fast/stages/s2_networking_a_simple/vpn.yaml b/tests/fast/stages/s2_networking_a_simple/vpn.yaml
@@ -37,13 +37,13 @@ counts:
   google_monitoring_dashboard: 3
   google_monitoring_monitored_project: 2
   google_project: 3
-  google_project_iam_binding: 4
-  google_project_iam_member: 17
-  google_project_service: 23
-  google_project_service_identity: 17
+  google_project_iam_binding: 2
+  google_project_iam_member: 20
+  google_project_service: 26
+  google_project_service_identity: 20
   google_storage_bucket_object: 2
   google_tags_tag_binding: 3
   google_vpc_access_connector: 2
   modules: 31
   random_id: 5
-  resources: 224
+  resources: 231
diff --git a/tests/fast/stages/s2_networking_b_nva/ncc-ra.tfvars b/tests/fast/stages/s2_networking_b_nva/ncc-ra.tfvars
@@ -5,6 +5,7 @@ billing_account = {
   id = "000000-111111-222222"
 }
 custom_roles = {
+  project_iam_viewer            = "organizations/123456789012/roles/bar"
   service_project_network_admin = "organizations/123456789012/roles/foo"
 }
 dns = {

diff --git a/tests/fast/stages/s2_networking_b_nva/ncc-ra.yaml b/tests/fast/stages/s2_networking_b_nva/ncc-ra.yaml
@@ -42,13 +42,13 @@ counts:
   google_network_connectivity_hub: 2
   google_network_connectivity_spoke: 4
   google_project: 3
-  google_project_iam_binding: 4
-  google_project_iam_member: 18
-  google_project_service: 24
-  google_project_service_identity: 18
+  google_project_iam_binding: 2
+  google_project_iam_member: 19
+  google_project_service: 25
+  google_project_service_identity: 19
   google_storage_bucket_object: 2
   google_tags_tag_binding: 3
   google_vpc_access_connector: 2
   modules: 39
   random_id: 2
-  resources: 255
+  resources: 256
diff --git a/tests/fast/stages/s2_networking_b_nva/regional.tfvars b/tests/fast/stages/s2_networking_b_nva/regional.tfvars
@@ -5,6 +5,7 @@ billing_account = {
   id = "000000-111111-222222"
 }
 custom_roles = {
+  project_iam_viewer            = "organizations/123456789012/roles/bar"
   service_project_network_admin = "organizations/123456789012/roles/foo"
 }
 dns = {

diff --git a/tests/fast/stages/s2_networking_b_nva/regional.yaml b/tests/fast/stages/s2_networking_b_nva/regional.yaml
@@ -44,12 +44,13 @@ counts:
   google_monitoring_dashboard: 3
   google_monitoring_monitored_project: 2
   google_project: 3
-  google_project_iam_binding: 4
-  google_project_iam_member: 17
-  google_project_service: 23
-  google_project_service_identity: 17
+  google_project_iam_binding: 2
+  google_project_iam_member: 19
+  google_project_service: 25
+  google_project_service_identity: 19
   google_storage_bucket_object: 2
   google_tags_tag_binding: 3
+  google_vpc_access_connector: 2
   modules: 47
   random_id: 2
-  resources: 260
+  resources: 264
diff --git a/tests/fast/stages/s2_networking_b_nva/simple.tfvars b/tests/fast/stages/s2_networking_b_nva/simple.tfvars
@@ -5,6 +5,7 @@ billing_account = {
   id = "000000-111111-222222"
 }
 custom_roles = {
+  project_iam_viewer            = "organizations/123456789012/roles/bar"
   service_project_network_admin = "organizations/123456789012/roles/foo"
 }
 dns = {

diff --git a/tests/fast/stages/s2_networking_b_nva/simple.yaml b/tests/fast/stages/s2_networking_b_nva/simple.yaml
@@ -44,13 +44,13 @@ counts:
   google_monitoring_dashboard: 3
   google_monitoring_monitored_project: 2
   google_project: 3
-  google_project_iam_binding: 4
-  google_project_iam_member: 17
-  google_project_service: 23
-  google_project_service_identity: 17
+  google_project_iam_binding: 2
+  google_project_iam_member: 19
+  google_project_service: 25
+  google_project_service_identity: 19
   google_storage_bucket_object: 2
   google_tags_tag_binding: 3
   google_vpc_access_connector: 2
   modules: 43
   random_id: 2
-  resources: 238
+  resources: 242
diff --git a/tests/fast/stages/s2_networking_c_separate_envs/simple.tfvars b/tests/fast/stages/s2_networking_c_separate_envs/simple.tfvars
@@ -5,6 +5,7 @@ billing_account = {
   id = "000000-111111-222222"
 }
 custom_roles = {
+  project_iam_viewer            = "organizations/123456789012/roles/bar"
   service_project_network_admin = "organizations/123456789012/roles/foo"
 }
 dns = {

diff --git a/tests/fast/stages/s2_networking_c_separate_envs/simple.yaml b/tests/fast/stages/s2_networking_c_separate_envs/simple.yaml
@@ -37,13 +37,13 @@ counts:
   google_monitoring_alert_policy: 4
   google_monitoring_dashboard: 6
   google_project: 2
-  google_project_iam_binding: 4
-  google_project_iam_member: 14
-  google_project_service: 18
-  google_project_service_identity: 14
+  google_project_iam_binding: 2
+  google_project_iam_member: 16
+  google_project_service: 20
+  google_project_service_identity: 16
   google_storage_bucket_object: 2
   google_tags_tag_binding: 2
   google_vpc_access_connector: 2
   modules: 22
   random_id: 2
-  resources: 205
+  resources: 209
diff --git a/tests/fast/stages/s2_security/simple.tfvars b/tests/fast/stages/s2_security/simple.tfvars
@@ -4,6 +4,10 @@ automation = {
 billing_account = {
   id = "000000-111111-222222"
 }
+custom_roles = {
+  project_iam_viewer            = "organizations/123456789012/roles/bar"
+  service_project_network_admin = "organizations/123456789012/roles/foo"
+}
 environment_names = {
   dev  = "development"
   prod = "production"
@@ -38,6 +42,31 @@ service_accounts = {
   project-factory-dev  = "foobar@iam.gserviceaccount.com"
   project-factory-prod = "foobar@iam.gserviceaccount.com"
 }
+stage_config = {
+  security = {
+    iam_delegated_principals = {
+      dev = [
+        "serviceAccount:fast2-dev-resman-gcve-0@fast2-prod-iac-core-0.iam.gserviceaccount.com",
+        "serviceAccount:fast2-dev-resman-pf-0@fast2-prod-iac-core-0.iam.gserviceaccount.com"
+      ]
+      prod = [
+        "serviceAccount:fast2-prod-resman-gcve-0@fast2-prod-iac-core-0.iam.gserviceaccount.com",
+        "serviceAccount:fast2-prod-resman-pf-0@fast2-prod-iac-core-0.iam.gserviceaccount.com"
+      ]
+    }
+    iam_viewer_principals = {
+      dev = [
+        "serviceAccount:fast2-dev-resman-gcve-0r@fast2-prod-iac-core-0.iam.gserviceaccount.com",
+        "serviceAccount:fast2-dev-resman-pf-0r@fast2-prod-iac-core-0.iam.gserviceaccount.com"
+      ]
+      prod = [
+        "serviceAccount:fast2-prod-resman-gcve-0r@fast2-prod-iac-core-0.iam.gserviceaccount.com",
+        "serviceAccount:fast2-prod-resman-pf-0r@fast2-prod-iac-core-0.iam.gserviceaccount.com"
+      ]
+    }
+    short_name = "net"
+  }
+}
 tag_values = {
   "environment/development" = "tagValues/12345"
   "environment/production"  = "tagValues/12346"

diff --git a/tests/fast/stages/s2_security/simple.yaml b/tests/fast/stages/s2_security/simple.yaml
@@ -430,10 +430,11 @@ counts:
   google_kms_crypto_key_iam_binding: 8
   google_kms_key_ring: 8
   google_project: 2
+  google_project_iam_binding: 4
   google_project_iam_member: 6
   google_project_service: 14
   google_project_service_identity: 12
   google_storage_bucket_object: 1
   google_tags_tag_binding: 2
   modules: 11
-  resources: 62
+  resources: 66