Update boilerplate and project services in 2-networking (#3852)

* chore(fast): update boilerplate in 2-networking yaml files

* chore(fast): replace stackdriver.googleapis.com with logging and monitoring services

* fix(net-vpc-factory): correct description for secondary subnet example

tests/fast/stages/s2_networking/data-testdns-delegation/projects/net-core-0.yaml

@@ -6,14 +6,15 @@
 name: prod-net-core-0
 parent: $folder_ids:networking
 services:
-  - container.googleapis.com
   - compute.googleapis.com
+  - container.googleapis.com
   - dns.googleapis.com
   - iap.googleapis.com
+  - logging.googleapis.com
+  - monitoring.googleapis.com
   - networkmanagement.googleapis.com
   - networksecurity.googleapis.com
   - servicenetworking.googleapis.com
-  - stackdriver.googleapis.com
   - vpcaccess.googleapis.com
 shared_vpc_host_config:
   enabled: true

tests/fast/stages/s2_networking/data-testvlan/projects/net-core-0.yaml

@@ -6,14 +6,15 @@
 name: prod-net-core-0
 parent: $folder_ids:networking
 services:
-  - container.googleapis.com
   - compute.googleapis.com
+  - container.googleapis.com
   - dns.googleapis.com
   - iap.googleapis.com
+  - logging.googleapis.com
+  - monitoring.googleapis.com
   - networkmanagement.googleapis.com
   - networksecurity.googleapis.com
   - servicenetworking.googleapis.com
-  - stackdriver.googleapis.com
   - vpcaccess.googleapis.com
 shared_vpc_host_config:
   enabled: true

tests/fast/stages/s2_networking/dns_delegations.yaml

@@ -20,12 +20,12 @@ counts:
   google_dns_managed_zone: 4
   google_dns_record_set: 3
   google_project: 1
-  google_project_iam_member: 7
-  google_project_service: 9
-  google_project_service_identity: 7
+  google_project_iam_member: 8
+  google_project_service: 10
+  google_project_service_identity: 8
   google_storage_bucket_object: 2
   modules: 9
-  resources: 42
+  resources: 46
   terraform_data: 2
 values:
   module.dns-delegations["net-core-0/pub-parent"].google_dns_record_set.dns_record_set["NS child.example.com."]:

tests/fast/stages/s2_networking/ncc.yaml

@@ -38,13 +38,13 @@ counts:
   google_network_connectivity_hub: 1
   google_network_connectivity_spoke: 3
   google_project: 3
-  google_project_iam_member: 21
-  google_project_service: 27
-  google_project_service_identity: 21
+  google_project_iam_member: 24
+  google_project_service: 30
+  google_project_service_identity: 24
   google_service_networking_connection: 1
   google_service_networking_peered_dns_domain: 1
   google_storage_bucket_object: 2
   modules: 26
   random_id: 3
-  resources: 183
+  resources: 195
   terraform_data: 2

tests/fast/stages/s2_networking/nva.yaml

@@ -38,11 +38,11 @@ counts:
   google_dns_response_policy: 1
   google_dns_response_policy_rule: 42
   google_project: 3
-  google_project_iam_member: 21
-  google_project_service: 27
-  google_project_service_identity: 21
+  google_project_iam_member: 24
+  google_project_service: 30
+  google_project_service_identity: 24
   google_storage_bucket_object: 2
   modules: 36
   random_id: 3
-  resources: 200
+  resources: 212
   terraform_data: 2

tests/fast/stages/s2_networking/simple.yaml

@@ -36,13 +36,13 @@ counts:
   google_dns_response_policy: 1
   google_dns_response_policy_rule: 42
   google_project: 3
-  google_project_iam_member: 21
-  google_project_service: 27
-  google_project_service_identity: 21
+  google_project_iam_member: 24
+  google_project_service: 30
+  google_project_service_identity: 24
   google_service_networking_connection: 1
   google_service_networking_peered_dns_domain: 1
   google_storage_bucket_object: 2
   modules: 28
   random_id: 3
-  resources: 185
+  resources: 197
   terraform_data: 2

tests/fast/stages/s2_networking/vlan_attachments.yaml

@@ -249,11 +249,17 @@ values:
     project: fast-prod-net-core-0
     service: servicenetworking.googleapis.com
     timeouts: null
-  module.projects.module.projects["net-core-0"].google_project_service.project_services["stackdriver.googleapis.com"]:
+  module.projects.module.projects["net-core-0"].google_project_service.project_services["logging.googleapis.com"]:
     disable_dependent_services: false
     disable_on_destroy: false
     project: fast-prod-net-core-0
-    service: stackdriver.googleapis.com
+    service: logging.googleapis.com
+    timeouts: null
+  module.projects.module.projects["net-core-0"].google_project_service.project_services["monitoring.googleapis.com"]:
+    disable_dependent_services: false
+    disable_on_destroy: false
+    project: fast-prod-net-core-0
+    service: monitoring.googleapis.com
     timeouts: null
   module.projects.module.projects["net-core-0"].google_project_service.project_services["vpcaccess.googleapis.com"]:
     disable_dependent_services: false
@@ -663,13 +669,13 @@ counts:
   google_network_connectivity_hub: 1
   google_network_connectivity_spoke: 3
   google_project: 1
-  google_project_iam_member: 7
-  google_project_service: 9
-  google_project_service_identity: 7
+  google_project_iam_member: 8
+  google_project_service: 10
+  google_project_service_identity: 8
   google_storage_bucket_object: 2
   modules: 9
   random_id: 5
-  resources: 60
+  resources: 64
   terraform_data: 2
 
 outputs:

tests/fast/stages/s2_networking/vpns.yaml

@@ -33,11 +33,11 @@ counts:
   google_dns_response_policy: 1
   google_dns_response_policy_rule: 42
   google_project: 3
-  google_project_iam_member: 21
-  google_project_service: 27
-  google_project_service_identity: 21
+  google_project_iam_member: 24
+  google_project_service: 30
+  google_project_service_identity: 24
   google_storage_bucket_object: 2
   modules: 30
   random_id: 15
-  resources: 216
+  resources: 228
   terraform_data: 2