From 4adaa608b83cbff1eb61187f7b0fe1942278fc37 Mon Sep 17 00:00:00 2001
From: Modular Magician <magic-modules@google.com>
Date: Thu, 21 Sep 2023 18:11:44 +0000
Subject: [PATCH] Fix failed tests related to
 google_service_networking_connection (#8904)

* Bootstrap service networking connection

* Revert tests

* Rename network names

* Modify tests

* Fix tests

* Catch the error when deleteConnection fails

* Fix test TestAccVertexAIIndexEndpoint_updated

* Fix test TestAccAlloydbInstance_createInstanceWithNetworkConfigAndAllocatedIPRange

* Fix test

Signed-off-by: Modular Magician <magic-modules@google.com>
---
 .../main.tf                                            | 10 +++++-----
 tpu_node_full/main.tf                                  |  8 ++++----
 vertex_ai_index_endpoint/main.tf                       |  8 ++++----
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/cloudbuild_bitbucket_server_config_peered_network/main.tf b/cloudbuild_bitbucket_server_config_peered_network/main.tf
index 18e91c67..d6fa158d 100644
--- a/cloudbuild_bitbucket_server_config_peered_network/main.tf
+++ b/cloudbuild_bitbucket_server_config_peered_network/main.tf
@@ -4,8 +4,8 @@ resource "google_project_service" "servicenetworking" {
   service = "servicenetworking.googleapis.com"
   disable_on_destroy = false
 }
- 
-data "google_compute_network" "vpc_network" {
+
+resource "google_compute_network" "vpc_network" {
     name       = "vpc-network-${local.name_suffix}"
     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" "bbs-config-with-peered-net
     }
     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/tpu_node_full/main.tf b/tpu_node_full/main.tf
index ecc83f45..68fcdb60 100644
--- a/tpu_node_full/main.tf
+++ b/tpu_node_full/main.tf
@@ -23,8 +23,8 @@ resource "google_tpu_node" "tpu" {
   }
 }
 
-data "google_compute_network" "network" {
-  name = "default"
+resource "google_compute_network" "network" {
+  name = "tpu-node-network-${local.name_suffix}"
 }
 
 resource "google_compute_global_address" "service_range" {
@@ -32,11 +32,11 @@ resource "google_compute_global_address" "service_range" {
   purpose       = "VPC_PEERING"
   address_type  = "INTERNAL"
   prefix_length = 16
-  network       = data.google_compute_network.network.id
+  network       = google_compute_network.network.id
 }
 
 resource "google_service_networking_connection" "private_service_connection" {
-  network                 = data.google_compute_network.network.id
+  network                 = google_compute_network.network.id
   service                 = "servicenetworking.googleapis.com"
   reserved_peering_ranges = [google_compute_global_address.service_range.name]
 }
diff --git a/vertex_ai_index_endpoint/main.tf b/vertex_ai_index_endpoint/main.tf
index 3e40c32e..74efeda1 100644
--- a/vertex_ai_index_endpoint/main.tf
+++ b/vertex_ai_index_endpoint/main.tf
@@ -5,14 +5,14 @@ resource "google_vertex_ai_index_endpoint" "index_endpoint" {
   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       = "network-name-${local.name_suffix}"
 }