Fix failed nightly tests related to google_service_networking_connection

GoogleCloudPlatform · Sep 10, 2023 · e853455 · e853455
1 parent 186acac
commit e853455
Show file tree

Hide file tree

Showing 29 changed files with 66 additions and 51 deletions.
diff --git a/mmv1/products/apigee/EnvKeystore.yaml b/mmv1/products/apigee/EnvKeystore.yaml
@@ -33,6 +33,8 @@ examples:
   - !ruby/object:Provider::Terraform::Examples
     name: 'apigee_environment_keystore_test'
     primary_resource_id: 'apigee_environment_keystore'
+    vars:
+      network_name: 'apigee-network'
     test_env_vars:
       org_id: :ORG_ID
       billing_account: :BILLING_ACCT

diff --git a/mmv1/products/apigee/EnvReferences.yaml b/mmv1/products/apigee/EnvReferences.yaml
@@ -33,6 +33,8 @@ examples:
   - !ruby/object:Provider::Terraform::Examples
     name: 'apigee_environment_reference_test'
     primary_resource_id: 'apigee_environment_reference'
+    vars:
+      network_name: 'apigee-network'
     test_env_vars:
       org_id: :ORG_ID
       billing_account: :BILLING_ACCT

diff --git a/mmv1/products/apigee/EnvgroupAttachment.yaml b/mmv1/products/apigee/EnvgroupAttachment.yaml
@@ -60,6 +60,8 @@ examples:
   - !ruby/object:Provider::Terraform::Examples
     name: 'apigee_environment_group_attachment_basic_test'
     primary_resource_id: 'apigee_environment_group_attachment'
+    vars:
+      network_name: 'apigee-network'
     test_env_vars:
       org_id: :ORG_ID
       billing_account: :BILLING_ACCT

diff --git a/mmv1/products/apigee/Environment.yaml b/mmv1/products/apigee/Environment.yaml
@@ -66,6 +66,8 @@ examples:
     primary_resource_name: "fmt.Sprintf(\"organizations/tf-test%s\",
       context[\"random_suffix\"\
       ]), fmt.Sprintf(\"tf-test%s\", context[\"random_suffix\"])"
+    vars:
+      network_name: 'apigee-network'
     test_env_vars:
       org_id: :ORG_ID
       billing_account: :BILLING_ACCT
@@ -79,6 +81,8 @@ examples:
     primary_resource_name: "fmt.Sprintf(\"organizations/tf-test%s\",
       context[\"random_suffix\"\
       ]), fmt.Sprintf(\"tf-test%s\", context[\"random_suffix\"])"
+    vars:
+      network_name: 'apigee-network'
     test_env_vars:
       org_id: :ORG_ID
       billing_account: :BILLING_ACCT
@@ -92,6 +96,8 @@ examples:
     primary_resource_name: "fmt.Sprintf(\"organizations/tf-test%s\",
       context[\"random_suffix\"\
       ]), fmt.Sprintf(\"tf-test%s\", context[\"random_suffix\"])"
+    vars:
+      network_name: 'apigee-network'
     test_env_vars:
       org_id: :ORG_ID
       billing_account: :BILLING_ACCT

diff --git a/mmv1/products/apigee/InstanceAttachment.yaml b/mmv1/products/apigee/InstanceAttachment.yaml
@@ -61,6 +61,8 @@ examples:
   - !ruby/object:Provider::Terraform::Examples
     name: 'apigee_instance_attachment_basic_test'
     primary_resource_id: 'apigee_instance_attachment'
+    vars:
+      network_name: 'apigee-network'
     test_env_vars:
       org_id: :ORG_ID
       billing_account: :BILLING_ACCT

diff --git a/mmv1/products/apigee/KeystoresAliasesSelfSignedCert.yaml b/mmv1/products/apigee/KeystoresAliasesSelfSignedCert.yaml
@@ -43,6 +43,7 @@ examples:
       environment_name: 'env-name'
       keystore_name: 'env-keystore'
       keystores_alias: 'alias'
+      network_name: 'apigee-network'
     test_env_vars:
       org_id: :ORG_ID
       billing_account: :BILLING_ACCT

diff --git a/mmv1/products/apigee/Organization.yaml b/mmv1/products/apigee/Organization.yaml
@@ -57,6 +57,8 @@ examples:
   - !ruby/object:Provider::Terraform::Examples
     name: 'apigee_organization_cloud_basic_test'
     primary_resource_id: 'org'
+    vars:
+      network_name: 'apigee-network'
     test_env_vars:
       org_id: :ORG_ID
       billing_account: :BILLING_ACCT
@@ -121,6 +123,8 @@ examples:
   - !ruby/object:Provider::Terraform::Examples
     name: 'apigee_organization_retention_test'
     primary_resource_id: 'org'
+    vars:
+      network_name: 'apigee-network'
     test_env_vars:
       org_id: :ORG_ID
       billing_account: :BILLING_ACCT

diff --git a/mmv1/products/cloudbuild/BitbucketServerConfig.yaml b/mmv1/products/cloudbuild/BitbucketServerConfig.yaml
@@ -64,8 +64,6 @@ examples:
       config_id: 'bbs-config'
       network_name: 'vpc-network'
       global_address_name: 'private-ip-alloc'
-    test_vars_overrides:
-      network_name: 'acctest.BootstrapSharedTestNetwork(t, "peered-network")'
 custom_code: !ruby/object:Provider::Terraform::CustomCode
   encoder: templates/terraform/encoders/cloudbuild_bitbucketserver_config.go.erb
   post_create: templates/terraform/post_create/cloudbuild_bitbucketserver_config.go.erb

diff --git a/mmv1/products/vertexai/IndexEndpoint.yaml b/mmv1/products/vertexai/IndexEndpoint.yaml
@@ -51,8 +51,6 @@ examples:
     vars:
       address_name: "address-name"
       network_name: "network-name"
-    test_vars_overrides:
-      network_name: 'acctest.BootstrapSharedTestNetwork(t, "vertex-ai-index-endpoint")'
 parameters:
   - !ruby/object:Api::Type::String
     name: region

diff --git a/mmv1/templates/terraform/examples/apigee_env_keystore_alias_self_signed_cert.tf.erb b/mmv1/templates/terraform/examples/apigee_env_keystore_alias_self_signed_cert.tf.erb
@@ -23,7 +23,7 @@ resource "google_project_service" "compute" {
 }
 
 resource "google_compute_network" "apigee_network" {
-  name       = "apigee-network"
+  name       = "<%= ctx[:vars]['network_name'] %>"
   project    = google_project.project.project_id
   depends_on = [google_project_service.compute]
 }

diff --git a/...emplates/terraform/examples/apigee_environment_basic_deployment_apiproxy_type_test.tf.erb b/...emplates/terraform/examples/apigee_environment_basic_deployment_apiproxy_type_test.tf.erb
@@ -23,7 +23,7 @@ resource "google_project_service" "compute" {
 }
 
 resource "google_compute_network" "apigee_network" {
-  name       = "apigee-network"
+  name       = "<%= ctx[:vars]['network_name'] %>"
   project    = google_project.project.project_id
   depends_on = [google_project_service.compute]
 }

diff --git a/mmv1/templates/terraform/examples/apigee_environment_basic_test.tf.erb b/mmv1/templates/terraform/examples/apigee_environment_basic_test.tf.erb
@@ -23,7 +23,7 @@ resource "google_project_service" "compute" {
 }
 
 resource "google_compute_network" "apigee_network" {
-  name       = "apigee-network"
+  name       = "<%= ctx[:vars]['network_name'] %>"
   project    = google_project.project.project_id
   depends_on = [google_project_service.compute]
 }

diff --git a/mmv1/templates/terraform/examples/apigee_environment_group_attachment_basic_test.tf.erb b/mmv1/templates/terraform/examples/apigee_environment_group_attachment_basic_test.tf.erb
@@ -21,7 +21,7 @@ resource "google_project_service" "servicenetworking" {
 }
 
 resource "google_compute_network" "apigee_network" {
-  name       = "apigee-network"
+  name       = "<%= ctx[:vars]['network_name'] %>"
   project    = google_project.project.project_id
   depends_on = [google_project_service.compute]
 }

diff --git a/mmv1/templates/terraform/examples/apigee_environment_keystore_test.tf.erb b/mmv1/templates/terraform/examples/apigee_environment_keystore_test.tf.erb
@@ -23,7 +23,7 @@ resource "google_project_service" "compute" {
 }
 
 resource "google_compute_network" "apigee_network" {
-  name       = "apigee-network"
+  name       = "<%= ctx[:vars]['network_name'] %>"
   project    = google_project.project.project_id
   depends_on = [google_project_service.compute]
 }

diff --git a/mmv1/templates/terraform/examples/apigee_environment_nodeconfig_test.tf.erb b/mmv1/templates/terraform/examples/apigee_environment_nodeconfig_test.tf.erb
@@ -38,7 +38,7 @@ resource "google_project_service" "kms" {
 resource "google_compute_network" "apigee_network" {
   provider = google-beta
 
-  name       = "apigee-network"
+  name       = "<%= ctx[:vars]['network_name'] %>"
   project    = google_project.project.project_id
   depends_on = [google_project_service.compute]
 }

diff --git a/mmv1/templates/terraform/examples/apigee_environment_reference_test.tf.erb b/mmv1/templates/terraform/examples/apigee_environment_reference_test.tf.erb
@@ -23,7 +23,7 @@ resource "google_project_service" "compute" {
 }
 
 resource "google_compute_network" "apigee_network" {
-  name       = "apigee-network"
+  name       = "<%= ctx[:vars]['network_name'] %>"
   project    = google_project.project.project_id
   depends_on = [google_project_service.compute]
 }

diff --git a/mmv1/templates/terraform/examples/apigee_instance_attachment_basic_test.tf.erb b/mmv1/templates/terraform/examples/apigee_instance_attachment_basic_test.tf.erb
@@ -21,7 +21,7 @@ resource "google_project_service" "servicenetworking" {
 }
 
 resource "google_compute_network" "apigee_network" {
-  name       = "apigee-network"
+  name       = "<%= ctx[:vars]['network_name'] %>"
   project    = google_project.project.project_id
   depends_on = [google_project_service.compute]
 }

diff --git a/mmv1/templates/terraform/examples/apigee_organization_cloud_basic_test.tf.erb b/mmv1/templates/terraform/examples/apigee_organization_cloud_basic_test.tf.erb
@@ -21,7 +21,7 @@ resource "google_project_service" "servicenetworking" {
 }
 
 resource "google_compute_network" "apigee_network" {
-  name       = "apigee-network"
+  name       = "<%= ctx[:vars]['network_name'] %>"
   project    = google_project.project.project_id
   depends_on = [google_project_service.compute]
 }

diff --git a/mmv1/templates/terraform/examples/apigee_organization_retention_test.tf.erb b/mmv1/templates/terraform/examples/apigee_organization_retention_test.tf.erb
@@ -38,7 +38,7 @@ resource "google_project_service" "kms" {
 resource "google_compute_network" "apigee_network" {
   provider = google-beta
 
-  name       = "apigee-network"
+  name       = "<%= ctx[:vars]['network_name'] %>"
   project    = google_project.project.project_id
   depends_on = [google_project_service.compute]
 }

diff --git a/mmv1/templates/terraform/examples/cloudbuild_bitbucket_server_config_peered_network.tf.erb b/mmv1/templates/terraform/examples/cloudbuild_bitbucket_server_config_peered_network.tf.erb
@@ -5,7 +5,7 @@ resource "google_project_service" "servicenetworking" {
   disable_on_destroy = false
 }
 
-data "google_compute_network" "vpc_network" {
+resource "google_compute_network" "vpc_network" {
     name       = "<%= ctx[:vars]['network_name'] %>"
     depends_on = [google_project_service.servicenetworking]
 }
@@ -15,11 +15,11 @@ resource "google_compute_global_address" "private_ip_alloc" {
   purpose       = "VPC_PEERING"
   address_type  = "INTERNAL"
   prefix_length = 16
-  network       = data.google_compute_network.vpc_network.id
+  network       = google_compute_network.vpc_network.id
 }
 
 resource "google_service_networking_connection" "default" {
-  network                 = data.google_compute_network.vpc_network.id
+  network                 = google_compute_network.vpc_network.id
   service                 = "servicenetworking.googleapis.com"
   reserved_peering_ranges = [google_compute_global_address.private_ip_alloc.name]
   depends_on              = [google_project_service.servicenetworking]
@@ -36,7 +36,7 @@ resource "google_cloudbuild_bitbucket_server_config" "<%= ctx[:primary_resource_
     }
     username = "test"
     api_key = "<api-key>"
-    peered_network = replace(data.google_compute_network.vpc_network.id, data.google_project.project.name, data.google_project.project.number)
+    peered_network = replace(google_compute_network.vpc_network.id, data.google_project.project.name, data.google_project.project.number)
     ssl_ca = "-----BEGIN CERTIFICATE-----\n-----END CERTIFICATE-----\n-----BEGIN CERTIFICATE-----\n-----END CERTIFICATE-----\n"
     depends_on = [google_service_networking_connection.default]
 }
diff --git a/mmv1/templates/terraform/examples/vertex_ai_index_endpoint.tf.erb b/mmv1/templates/terraform/examples/vertex_ai_index_endpoint.tf.erb
@@ -5,14 +5,14 @@ resource "google_vertex_ai_index_endpoint" "<%= ctx[:primary_resource_id] %>" {
   labels       = {
     label-one = "value-one"
   }
-  network      = "projects/${data.google_project.project.number}/global/networks/${data.google_compute_network.vertex_network.name}"
+  network      = "projects/${data.google_project.project.number}/global/networks/${google_compute_network.vertex_network.name}"
   depends_on   = [
     google_service_networking_connection.vertex_vpc_connection
   ]
 }
 
 resource "google_service_networking_connection" "vertex_vpc_connection" {
-  network                 = data.google_compute_network.vertex_network.id
+  network                 = google_compute_network.vertex_network.id
   service                 = "servicenetworking.googleapis.com"
   reserved_peering_ranges = [google_compute_global_address.vertex_range.name]
 }
@@ -22,10 +22,10 @@ resource "google_compute_global_address" "vertex_range" {
   purpose       = "VPC_PEERING"
   address_type  = "INTERNAL"
   prefix_length = 24
-  network       = data.google_compute_network.vertex_network.id
+  network       = google_compute_network.vertex_network.id
 }
 
-data "google_compute_network" "vertex_network" {
+resource "google_compute_network" "vertex_network" {
   name       = "<%= ctx[:vars]['network_name'] %>"
 }
 

diff --git a/mmv1/third_party/terraform/services/apigee/resource_apigee_env_keystore_alias_pkcs12_test.go b/mmv1/third_party/terraform/services/apigee/resource_apigee_env_keystore_alias_pkcs12_test.go
@@ -70,7 +70,7 @@ resource "google_project_service" "compute" {
 }
 
 resource "google_compute_network" "apigee_network" {
-  name       = "apigee-network"
+  name       = "tf-test-apigee-network%{random_suffix}"
   project    = google_project.project.project_id
   depends_on = [google_project_service.compute]
 }

diff --git a/.../third_party/terraform/services/apigee/resource_apigee_environment_nodeconfig_test.go.erb b/.../third_party/terraform/services/apigee/resource_apigee_environment_nodeconfig_test.go.erb
@@ -89,7 +89,7 @@ resource "google_project_service" "kms" {
 resource "google_compute_network" "apigee_network" {
   provider = google-beta
 
-  name       = "apigee-network"
+  name       = "tf-test-apigee-network%{random_suffix}"
   project    = google_project.project.project_id
   depends_on = [google_project_service.compute]
 }

diff --git a/mmv1/third_party/terraform/services/apigee/resource_apigee_flowhook_test.go b/mmv1/third_party/terraform/services/apigee/resource_apigee_flowhook_test.go
@@ -69,7 +69,7 @@ resource "google_project_service" "compute" {
 }
 
 resource "google_compute_network" "apigee_network" {
-  name       = "apigee-network"
+  name       = "tf-test-apigee-network%{random_suffix}"
   project    = google_project.project.project_id
   depends_on = [google_project_service.compute]
 }

diff --git a/...d_party/terraform/services/apigee/resource_apigee_keystores_aliases_key_cert_file_test.go b/...d_party/terraform/services/apigee/resource_apigee_keystores_aliases_key_cert_file_test.go
@@ -79,7 +79,7 @@ resource "google_project_service" "compute" {
 }
 
 resource "google_compute_network" "apigee_network" {
-  name       = "apigee-network"
+  name       = "tf-test-apigee-network%{random_suffix}"
   project    = google_project.project.project_id
   depends_on = [google_project_service.compute]
 }
@@ -200,7 +200,7 @@ resource "google_project_service" "compute" {
 }
 
 resource "google_compute_network" "apigee_network" {
-  name       = "apigee-network"
+  name       = "tf-test-apigee-apigee-network%{random_suffix}"
   project    = google_project.project.project_id
   depends_on = [google_project_service.compute]
 }

diff --git a/mmv1/third_party/terraform/services/apigee/resource_apigee_sharedflow_deployment_test.go b/mmv1/third_party/terraform/services/apigee/resource_apigee_sharedflow_deployment_test.go
@@ -80,7 +80,7 @@ resource "google_project_service" "compute" {
 }
 
 resource "google_compute_network" "apigee_network" {
-  name       = "apigee-network"
+  name       = "tf-test-apigee-network%{random_suffix}"
   project    = google_project.project.project_id
   depends_on = [google_project_service.compute]
 }

diff --git a/...party/terraform/services/servicenetworking/resource_service_networking_connection_test.go b/...party/terraform/services/servicenetworking/resource_service_networking_connection_test.go
@@ -13,7 +13,7 @@ import (
 func TestAccServiceNetworkingConnection_create(t *testing.T) {
 	t.Parallel()
 
-	network := acctest.BootstrapSharedTestNetwork(t, "service-networking-connection-create")
+	network := "tf-test-" + acctest.RandString(t, 10)
 	addr := fmt.Sprintf("tf-test-%s", acctest.RandString(t, 10))
 	service := "servicenetworking.googleapis.com"
 
@@ -37,7 +37,7 @@ func TestAccServiceNetworkingConnection_create(t *testing.T) {
 func TestAccServiceNetworkingConnection_update(t *testing.T) {
 	t.Parallel()
 
-	network := acctest.BootstrapSharedTestNetwork(t, "service-networking-connection-update")
+	network := "tf-test-" + acctest.RandString(t, 10)
 	addr1 := fmt.Sprintf("tf-test-%s", acctest.RandString(t, 10))
 	addr2 := fmt.Sprintf("tf-test-%s", acctest.RandString(t, 10))
 	service := "servicenetworking.googleapis.com"
@@ -94,7 +94,7 @@ func testServiceNetworkingConnectionDestroy(t *testing.T, parent, network string
 
 func testAccServiceNetworkingConnection(networkName, addressRangeName, serviceName string) string {
 	return fmt.Sprintf(`
-data "google_compute_network" "servicenet" {
+resource "google_compute_network" "servicenet" {
   name = "%s"
 }
 
@@ -103,11 +103,11 @@ resource "google_compute_global_address" "foobar" {
   purpose       = "VPC_PEERING"
   address_type  = "INTERNAL"
   prefix_length = 16
-  network       = data.google_compute_network.servicenet.self_link
+  network       = google_compute_network.servicenet.self_link
 }
 
 resource "google_service_networking_connection" "foobar" {
-  network                 = data.google_compute_network.servicenet.self_link
+  network                 = google_compute_network.servicenet.self_link
   service                 = "%s"
   reserved_peering_ranges = [google_compute_global_address.foobar.name]
 }