Update AlloyDB tests to use bootstrapped networks (#14160) (#1007)

[upstream:3179dc4005ab3c7f08c5f060d7a35e57218e8078]

Signed-off-by: Modular Magician <[email protected]>

Author: modular-magician

alloydb_cluster_after_upgrade/main.tf

@@ -7,14 +7,13 @@ resource "google_alloydb_instance" "default" {
     cpu_count = 2
   }
 
-  depends_on = [google_service_networking_connection.vpc_connection]
 }
 
 resource "google_alloydb_cluster" "default" {
   cluster_id = "alloydb-cluster-${local.name_suffix}"
   location   = "us-central1"
   network_config {
-    network = google_compute_network.default.id
+    network = data.google_compute_network.default.id
   }
   database_version = "POSTGRES_15"
 
@@ -23,22 +22,6 @@ resource "google_alloydb_cluster" "default" {
   }
 }
 
-data "google_project" "project" {}
-
-resource "google_compute_network" "default" {
+data "google_compute_network" "default" {
   name = "alloydb-network-${local.name_suffix}"
 }
-
-resource "google_compute_global_address" "private_ip_alloc" {
-  name          =  "alloydb-cluster-${local.name_suffix}"
-  address_type  = "INTERNAL"
-  purpose       = "VPC_PEERING"
-  prefix_length = 16
-  network       = google_compute_network.default.id
-}
-
-resource "google_service_networking_connection" "vpc_connection" {
-  network                 = google_compute_network.default.id
-  service                 = "servicenetworking.googleapis.com"
-  reserved_peering_ranges = [google_compute_global_address.private_ip_alloc.name]
-}

alloydb_cluster_before_upgrade/main.tf

@@ -7,14 +7,13 @@ resource "google_alloydb_instance" "default" {
     cpu_count = 2
   }
 
-  depends_on = [google_service_networking_connection.vpc_connection]
 }
 
 resource "google_alloydb_cluster" "default" {
   cluster_id = "alloydb-cluster-${local.name_suffix}"
   location   = "us-central1"
   network_config {
-    network = google_compute_network.default.id
+    network = data.google_compute_network.default.id
   }
   database_version = "POSTGRES_14"
 
@@ -23,22 +22,6 @@ resource "google_alloydb_cluster" "default" {
   }
 }
 
-data "google_project" "project" {}
-
-resource "google_compute_network" "default" {
+data "google_compute_network" "default" {
   name = "alloydb-network-${local.name_suffix}"
 }
-
-resource "google_compute_global_address" "private_ip_alloc" {
-  name          =  "alloydb-cluster-${local.name_suffix}"
-  address_type  = "INTERNAL"
-  purpose       = "VPC_PEERING"
-  prefix_length = 16
-  network       = google_compute_network.default.id
-}
-
-resource "google_service_networking_connection" "vpc_connection" {
-  network                 = google_compute_network.default.id
-  service                 = "servicenetworking.googleapis.com"
-  reserved_peering_ranges = [google_compute_global_address.private_ip_alloc.name]
-}