GKE Multi-Subnet additional_ip_ranges_config: Change test subnet and network name from main to msc_main (#14839)

Author: gnossen

mmv1/third_party/terraform/services/container/resource_container_cluster_test.go.tmpl

@@ -14323,17 +14323,85 @@ resource "google_container_cluster" "primary" {
 `, name, networkName, subnetworkName, config)
 }
 
+type subnetRangeInfo struct {
+	SubnetName string
+	RangeNames []string
+}
+
+func bootstrapAdditionalIpRangesNetworkConfig(t *testing.T, name string, additionalSubnetCount int, secondaryRangeCount int) (string, []subnetRangeInfo) {
+	sri := []subnetRangeInfo{}
+
+	// We create our network to ensure no range collisions.
+	networkName := acctest.BootstrapSharedTestNetwork(t, fmt.Sprintf("%s-network", name))
+	mainSubnet := acctest.BootstrapSubnetWithOverrides(t, fmt.Sprintf("%s-subnet-main", name), networkName, map[string]interface{}{
+		"ipCidrRange": "10.2.0.0/24",
+		"secondaryIpRanges": []map[string]interface{}{
+			{
+				"rangeName": "pods",
+				"ipCidrRange": "10.3.0.0/16",
+			},
+			{
+				"rangeName": "services",
+				"ipCidrRange": "10.4.0.0/16",
+			},
+		},
+	})
+
+	si := subnetRangeInfo{
+		SubnetName: mainSubnet,
+		RangeNames: []string{"pods"},
+	}
+	sri = append(sri, si)
+
+	cumulativeRangeIndex := 0
+	for subnetIndex := 0; subnetIndex < additionalSubnetCount; subnetIndex++ {
+		ranges := []map[string]interface{}{}
+		rangeNames := []string{}
+		for rangeIndex := 0; rangeIndex < secondaryRangeCount; rangeIndex++ {
+			rangeName := fmt.Sprintf("range-%d", cumulativeRangeIndex)
+			r := map[string]interface{}{
+				"rangeName": rangeName,
+				"ipCidrRange": fmt.Sprintf("10.0.%d.0/24", cumulativeRangeIndex),
+			}
+			rangeNames = append(rangeNames, rangeName)
+			ranges = append(ranges, r)
+			cumulativeRangeIndex++
+		}
+
+		subnetOverrides := map[string]interface{}{
+			"ipCidrRange": fmt.Sprintf("10.1.%d.0/24", subnetIndex),
+			"secondaryIpRanges": ranges,
+		}
+
+		subnetName := fmt.Sprintf("%s-subnet-add-%d", name, subnetIndex)
+		acctest.BootstrapSubnetWithOverrides(t, subnetName, networkName, subnetOverrides)
+
+		si := subnetRangeInfo{
+			SubnetName: subnetName,
+			RangeNames: rangeNames,
+		}
+
+		sri = append(sri, si)
+	}
+
+	return networkName, sri
+}
+
 func TestAccContainerCluster_additional_ip_ranges_config_on_create(t *testing.T) {
 	t.Parallel()
 
+	testName := "gke-msc"
+	network, sri := bootstrapAdditionalIpRangesNetworkConfig(t, testName, 2, 2)
+
+
 	clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10))
 	acctest.VcrTest(t, resource.TestCase{
 		PreCheck:	  func() { acctest.AccTestPreCheck(t) },
 		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
 		CheckDestroy: testAccCheckContainerClusterDestroyProducer(t),
 		Steps: []resource.TestStep{
 			{
-				Config: testAccContainerCluster_additional_ip_ranges_config(clusterName, 2, 2),
+				Config: testAccContainerCluster_additional_ip_ranges_config(clusterName, network, sri),
 			},
 			{
 				ResourceName:      "google_container_cluster.primary",
@@ -14349,14 +14417,17 @@ func TestAccContainerCluster_additional_ip_ranges_config_on_create(t *testing.T)
 func TestAccContainerCluster_additional_ip_ranges_config_on_update(t *testing.T) {
 	t.Parallel()
 
+	testName := "gke-msc-update"
+	network, sri := bootstrapAdditionalIpRangesNetworkConfig(t, testName, 2, 2)
+
 	clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10))
 	acctest.VcrTest(t, resource.TestCase{
 		PreCheck:	  func() { acctest.AccTestPreCheck(t) },
 		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
 		CheckDestroy: testAccCheckContainerClusterDestroyProducer(t),
 		Steps: []resource.TestStep{
 			{
-				Config: testAccContainerCluster_additional_ip_ranges_config(clusterName, 0, 0),
+				Config: testAccContainerCluster_additional_ip_ranges_config(clusterName, network, sri),
 			},
 			{
 				ResourceName:      "google_container_cluster.primary",
@@ -14366,7 +14437,7 @@ func TestAccContainerCluster_additional_ip_ranges_config_on_update(t *testing.T)
 				Check: resource.TestCheckResourceAttrSet("google_container_cluster.primary", "node_pool.0.network_config.subnetwork"),
 			},
 			{
-				Config: testAccContainerCluster_additional_ip_ranges_config(clusterName, 1, 1),
+				Config: testAccContainerCluster_additional_ip_ranges_config(clusterName, network, sri[:len(sri)-1]),
 			},
 			{
 				ResourceName:      "google_container_cluster.primary",
@@ -14375,7 +14446,7 @@ func TestAccContainerCluster_additional_ip_ranges_config_on_update(t *testing.T)
 				ImportStateVerifyIgnore: []string{"deletion_protection"},
 			},
 			{
-				Config: testAccContainerCluster_additional_ip_ranges_config(clusterName, 0, 0),
+				Config: testAccContainerCluster_additional_ip_ranges_config(clusterName, network, sri[:1]),
 			},
 			{
 				ResourceName:      "google_container_cluster.primary",
@@ -14384,7 +14455,7 @@ func TestAccContainerCluster_additional_ip_ranges_config_on_update(t *testing.T)
 				ImportStateVerifyIgnore: []string{"deletion_protection"},
 			},
 			{
-				Config: testAccContainerCluster_additional_ip_ranges_config(clusterName, 2, 2),
+				Config: testAccContainerCluster_additional_ip_ranges_config(clusterName, network, sri),
 			},
 			{
 				ResourceName:      "google_container_cluster.primary",
@@ -14393,7 +14464,7 @@ func TestAccContainerCluster_additional_ip_ranges_config_on_update(t *testing.T)
 				ImportStateVerifyIgnore: []string{"deletion_protection"},
 			},
 			{
-				Config: testAccContainerCluster_additional_ip_ranges_config(clusterName, 0, 0),
+				Config: testAccContainerCluster_additional_ip_ranges_config(clusterName, network, sri[:1]),
 			},
 			{
 				ResourceName:      "google_container_cluster.primary",
@@ -14445,76 +14516,31 @@ func TestAccContainerCluster_withAnonymousAuthenticationConfig(t *testing.T) {
 	})
 }
 
-func testAccContainerCluster_additional_ip_ranges_config(name string, additionalSubnetCount int, secondaryRangeCount int) string {
-	var subnetStr string
+func testAccContainerCluster_additional_ip_ranges_config(clusterName string, networkName string, sri []subnetRangeInfo) string {
 	var additionalIpRangesStr string
-	cumulativeRangeIndex := 0
-	for subnetIndex := 0; subnetIndex < additionalSubnetCount; subnetIndex++ {
-		var secondaryRangeStr string
+
+	for _, si := range sri[1:] {
 		var podIpv4RangeStr string
-		for rangeIndex := 0; rangeIndex < secondaryRangeCount; rangeIndex++ {
-			secondaryRangeStr += fmt.Sprintf(`
-                            secondary_ip_range {
-                              range_name = "range-%d"
-                              ip_cidr_range = "10.0.%d.0/24"
-                            }
-                          `, cumulativeRangeIndex, cumulativeRangeIndex)
-
-			podIpv4RangeStr += fmt.Sprintf("google_compute_subnetwork.extra_%d.secondary_ip_range[%d].range_name", subnetIndex, rangeIndex)
-			if rangeIndex != secondaryRangeCount - 1 {
+		for i, rn := range si.RangeNames {
+			podIpv4RangeStr += fmt.Sprintf("\"%s\"", rn)
+			if i != len(si.RangeNames) - 1 {
 				podIpv4RangeStr += ", "
 			}
-			cumulativeRangeIndex++
 		}
-
-		subnetStr += fmt.Sprintf(`
-                           resource "google_compute_subnetwork" "extra_%d" {
-                             ip_cidr_range = "10.1.%d.0/24"
-                             name = "tf-test-subnet-%d"
-                             network = google_compute_network.main.self_link
-                             region = "us-central1"
-                             %s
-                           }
-                         `, subnetIndex, subnetIndex, subnetIndex, secondaryRangeStr)
-
 		additionalIpRangesStr += fmt.Sprintf(`
 			additional_ip_ranges_config {
-				subnetwork  = google_compute_subnetwork.extra_%d.id
+				subnetwork  = "%s"
 				pod_ipv4_range_names = [%s]
 			}
-		`, subnetIndex, podIpv4RangeStr)
+		`, si.SubnetName, podIpv4RangeStr)
 	}
 
 	return fmt.Sprintf(`
-	resource "google_compute_network" "main" {
-	  name                    = "%s"
-	  auto_create_subnetworks = false
-	}
-
-	resource "google_compute_subnetwork" "main" {
-	  ip_cidr_range = "10.2.0.0/24"
-	  name          = "%s"
-	  network       = google_compute_network.main.self_link
-	  region        = "us-central1"
-
-	  secondary_ip_range {
-	    range_name    = "services"
-	    ip_cidr_range = "10.3.0.0/16"
-	  }
-
-	  secondary_ip_range {
-	    range_name    = "pods"
-	    ip_cidr_range = "10.4.0.0/16"
-	  }
-	}
-
-        %s
-
 	resource "google_container_cluster" "primary" {
 	  name     = "%s"
 	  location = "us-central1-a"
-	  network    = google_compute_network.main.name
-	  subnetwork = google_compute_subnetwork.main.name
+	  network    = "%s"
+	  subnetwork = "%s"
           initial_node_count = 1
 
 	  ip_allocation_policy {
@@ -14525,7 +14551,7 @@ func testAccContainerCluster_additional_ip_ranges_config(name string, additional
 
 	  deletion_protection = false
 	}
-	`, name, name, subnetStr, name, additionalIpRangesStr)
+	`, clusterName, networkName, sri[0].SubnetName, additionalIpRangesStr)
 }
 
 func testAccContainerCluster_withAnonymousAuthenticationConfig(name, networkName, subnetworkName string, mode string) string {