container: re-enable LB step in TestAccContainerCluster_withAddons (#12098)

Author: wyardley

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

@@ -201,9 +201,9 @@ func TestAccContainerCluster_withAddons(t *testing.T) {
 	pid := envvar.GetTestProjectFromEnv()
 
 	acctest.VcrTest(t, resource.TestCase{
-		PreCheck:     func() { acctest.AccTestPreCheck(t) },
+		PreCheck:                 func() { acctest.AccTestPreCheck(t) },
 		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
-		CheckDestroy: testAccCheckContainerClusterDestroyProducer(t),
+		CheckDestroy:             testAccCheckContainerClusterDestroyProducer(t),
 		Steps: []resource.TestStep{
 			{
 				Config: testAccContainerCluster_withAddons(pid, clusterName, networkName, subnetworkName),
@@ -212,7 +212,6 @@ func TestAccContainerCluster_withAddons(t *testing.T) {
 				ResourceName:            "google_container_cluster.primary",
 				ImportState:             true,
 				ImportStateVerify:       true,
-				// TODO: clean up this list in `4.0.0`, remove both `workload_identity_config` fields (same for below)
 				ImportStateVerifyIgnore: []string{"min_master_version", "deletion_protection"},
 			},
 			{
@@ -224,16 +223,15 @@ func TestAccContainerCluster_withAddons(t *testing.T) {
 				ImportStateVerify:       true,
 				ImportStateVerifyIgnore: []string{"min_master_version", "deletion_protection"},
 			},
-			// Issue with cloudrun_config addon: https://github.com/hashicorp/terraform-provider-google/issues/11943
-			// {
-			// 	Config: testAccContainerCluster_withInternalLoadBalancer(pid, clusterName, networkName, subnetworkName),
-			// },
-			// {
-			// 	ResourceName:            "google_container_cluster.primary",
-			// 	ImportState:             true,
-			// 	ImportStateVerify:       true,
-			// 	ImportStateVerifyIgnore: []string{"min_master_version", "deletion_protection"},
-			// },
+			{
+				Config: testAccContainerCluster_withInternalLoadBalancer(pid, clusterName, networkName, subnetworkName),
+			},
+			{
+				ResourceName:            "google_container_cluster.primary",
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"min_master_version", "deletion_protection"},
+			},
 		},
 	})
 }
@@ -5793,12 +5791,12 @@ resource "google_container_cluster" "primary" {
     gce_persistent_disk_csi_driver_config {
       enabled = false
     }
-	gke_backup_agent_config {
-	  enabled = false
-	}
-	config_connector_config {
-	  enabled = false
-	}
+    gke_backup_agent_config {
+      enabled = false
+    }
+    config_connector_config {
+      enabled = false
+    }
     gcs_fuse_csi_driver_config {
       enabled = false
     }
@@ -5818,9 +5816,10 @@ resource "google_container_cluster" "primary" {
     }
 {{- end }}
   }
-  deletion_protection = false
   network    = "%s"
-  subnetwork    = "%s"
+  subnetwork = "%s"
+
+  deletion_protection = false
 }
 `, projectID, clusterName, networkName, subnetworkName)
 }
@@ -5866,12 +5865,12 @@ resource "google_container_cluster" "primary" {
     gce_persistent_disk_csi_driver_config {
       enabled = true
     }
-  gke_backup_agent_config {
-    enabled = true
-  }
-  config_connector_config {
-    enabled = true
-  }
+    gke_backup_agent_config {
+      enabled = true
+    }
+    config_connector_config {
+      enabled = true
+    }
     gcs_fuse_csi_driver_config {
       enabled = true
     }
@@ -5897,52 +5896,53 @@ resource "google_container_cluster" "primary" {
     }
 {{- end }}
 	}
-  deletion_protection = false
   network    = "%s"
-  subnetwork    = "%s"
+  subnetwork = "%s"
+
+  deletion_protection = false
 }
 `, projectID, clusterName, networkName, subnetworkName)
 }
 
-// Issue with cloudrun_config addon: https://github.com/hashicorp/terraform-provider-google/issues/11943/
-// func testAccContainerCluster_withInternalLoadBalancer(projectID string, clusterName, networkName, subnetworkName string) string {
-// 	return fmt.Sprintf(`
-// data "google_project" "project" {
-//   project_id = "%s"
-// }
-
-// resource "google_container_cluster" "primary" {
-//   name               = "%s"
-//   location           = "us-central1-a"
-//   initial_node_count = 1
-
-//   min_master_version = "latest"
-
-//   workload_identity_config {
-//     workload_pool = "${data.google_project.project.project_id}.svc.id.goog"
-//   }
-
-//   addons_config {
-//     http_load_balancing {
-//       disabled = false
-//     }
-//     horizontal_pod_autoscaling {
-//       disabled = false
-//     }
-//     network_policy_config {
-//       disabled = false
-//     }
-//     cloudrun_config {
-// 	  disabled = false
-// 	  load_balancer_type = "LOAD_BALANCER_TYPE_INTERNAL"
-//     }
-//   }
-//   deletion_protection = false
-//   network    = "%s"
-//   subnetwork    = "%s"
-// }
-// `, projectID, clusterName, networkName, subnetworkName)
-// }
+func testAccContainerCluster_withInternalLoadBalancer(projectID string, clusterName, networkName, subnetworkName string) string {
+ 	return fmt.Sprintf(`
+data "google_project" "project" {
+  project_id = "%s"
+}
+
+resource "google_container_cluster" "primary" {
+  name               = "%s"
+  location           = "us-central1-a"
+  initial_node_count = 1
+
+  min_master_version = "latest"
+
+  workload_identity_config {
+    workload_pool = "${data.google_project.project.project_id}.svc.id.goog"
+  }
+
+  addons_config {
+    http_load_balancing {
+      disabled = false
+    }
+    horizontal_pod_autoscaling {
+      disabled = false
+    }
+    network_policy_config {
+      disabled = false
+    }
+    cloudrun_config {
+      disabled = false
+      load_balancer_type = "LOAD_BALANCER_TYPE_INTERNAL"
+    }
+  }
+  network    = "%s"
+  subnetwork = "%s"
+
+  deletion_protection = false
+}
+`, projectID, clusterName, networkName, subnetworkName)
+}
 
 func testAccContainerCluster_withNotificationConfig(clusterName, topic, networkName, subnetworkName string) string {
 	return fmt.Sprintf(`