From 1e9867ba13c6d6784fa5435ed9e31784bae39aff Mon Sep 17 00:00:00 2001 From: Edward Sun Date: Fri, 22 Jul 2022 15:38:15 -0700 Subject: [PATCH] updated a test --- .../resource_container_cluster_test.go.erb | 115 ++++-------------- 1 file changed, 27 insertions(+), 88 deletions(-) diff --git a/mmv1/third_party/terraform/tests/resource_container_cluster_test.go.erb b/mmv1/third_party/terraform/tests/resource_container_cluster_test.go.erb index 3c058bc45772..9f0d8179d888 100644 --- a/mmv1/third_party/terraform/tests/resource_container_cluster_test.go.erb +++ b/mmv1/third_party/terraform/tests/resource_container_cluster_test.go.erb @@ -353,7 +353,6 @@ func TestAccContainerCluster_withMasterAuthConfig_NoCert(t *testing.T) { func TestAccContainerCluster_withAuthenticatorGroupsConfig(t *testing.T) { t.Parallel() clusterName := fmt.Sprintf("tf-test-cluster-%s", randString(t, 10)) - containerNetName := fmt.Sprintf("tf-test-container-net-%s", randString(t, 10)) orgDomain := getTestOrgDomainFromEnv(t) vcrTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -361,26 +360,38 @@ func TestAccContainerCluster_withAuthenticatorGroupsConfig(t *testing.T) { CheckDestroy: testAccCheckContainerClusterDestroyProducer(t), Steps: []resource.TestStep{ { - Config: testAccContainerCluster_withAuthenticatorGroupsConfig(containerNetName, clusterName), + Config: testAccContainerCluster_basic(clusterName), Check: resource.ComposeTestCheckFunc( - resource.TestCheckNoResourceAttr("google_container_cluster.with_authenticator_groups", + resource.TestCheckNoResourceAttr("google_container_cluster.primary", "authenticator_groups_config.0.enabled"), ), }, { - ResourceName: "google_container_cluster.with_authenticator_groups", + ResourceName: "google_container_cluster.primary", ImportState: true, ImportStateVerify: true, }, { - Config: testAccContainerCluster_withAuthenticatorGroupsConfigUpdate(containerNetName, clusterName, orgDomain), + Config: testAccContainerCluster_withAuthenticatorGroupsConfigUpdate(clusterName, orgDomain), Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr("google_container_cluster.with_authenticator_groups", + resource.TestCheckResourceAttr("google_container_cluster.primary", "authenticator_groups_config.0.security_group", fmt.Sprintf("gke-security-groups@%s", orgDomain)), ), }, { - ResourceName: "google_container_cluster.with_authenticator_groups", + ResourceName: "google_container_cluster.primary", + ImportState: true, + ImportStateVerify: true, + }, + { + Config: testAccContainerCluster_basic(clusterName), + Check: resource.ComposeTestCheckFunc( + resource.TestCheckNoResourceAttr("google_container_cluster.primary", + "authenticator_groups_config.0.enabled"), + ), + }, + { + ResourceName: "google_container_cluster.primary", ImportState: true, ImportStateVerify: true, }, @@ -3323,90 +3334,18 @@ resource "google_container_cluster" "with_network_policy_enabled" { `, clusterName) } -func testAccContainerCluster_withAuthenticatorGroupsConfig(containerNetName string, clusterName string) string { - return fmt.Sprintf(` -resource "google_compute_network" "container_network" { - name = "%s" - auto_create_subnetworks = false -} - -resource "google_compute_subnetwork" "container_subnetwork" { - name = google_compute_network.container_network.name - network = google_compute_network.container_network.name - ip_cidr_range = "10.0.36.0/24" - region = "us-central1" - private_ip_google_access = true - - secondary_ip_range { - range_name = "pod" - ip_cidr_range = "10.0.0.0/19" - } - - secondary_ip_range { - range_name = "svc" - ip_cidr_range = "10.0.32.0/22" - } -} - -resource "google_container_cluster" "with_authenticator_groups" { - name = "%s" - location = "us-central1-a" - initial_node_count = 1 - network = google_compute_network.container_network.name - subnetwork = google_compute_subnetwork.container_subnetwork.name - - networking_mode = "VPC_NATIVE" - ip_allocation_policy { - cluster_secondary_range_name = google_compute_subnetwork.container_subnetwork.secondary_ip_range[0].range_name - services_secondary_range_name = google_compute_subnetwork.container_subnetwork.secondary_ip_range[1].range_name - } -} -`, containerNetName, clusterName) -} - -func testAccContainerCluster_withAuthenticatorGroupsConfigUpdate(containerNetName string, clusterName string, orgDomain string) string { +func testAccContainerCluster_withAuthenticatorGroupsConfigUpdate(name string, orgDomain string) string { return fmt.Sprintf(` -resource "google_compute_network" "container_network" { - name = "%s" - auto_create_subnetworks = false -} - -resource "google_compute_subnetwork" "container_subnetwork" { - name = google_compute_network.container_network.name - network = google_compute_network.container_network.name - ip_cidr_range = "10.0.36.0/24" - region = "us-central1" - private_ip_google_access = true - - secondary_ip_range { - range_name = "pod" - ip_cidr_range = "10.0.0.0/19" - } - - secondary_ip_range { - range_name = "svc" - ip_cidr_range = "10.0.32.0/22" - } -} - -resource "google_container_cluster" "with_authenticator_groups" { - name = "%s" - location = "us-central1-a" - initial_node_count = 1 - network = google_compute_network.container_network.name - subnetwork = google_compute_subnetwork.container_subnetwork.name - - authenticator_groups_config { - security_group = "gke-security-groups@%s" - } +resource "google_container_cluster" "primary" { + name = "%s" + location = "us-central1-a" + initial_node_count = 1 - networking_mode = "VPC_NATIVE" - ip_allocation_policy { - cluster_secondary_range_name = google_compute_subnetwork.container_subnetwork.secondary_ip_range[0].range_name - services_secondary_range_name = google_compute_subnetwork.container_subnetwork.secondary_ip_range[1].range_name - } + authenticator_groups_config { + security_group = "gke-security-groups@%s" + } } -`, containerNetName, clusterName, orgDomain) +`, name, orgDomain) }