support master_global_access_config for flexible cluster (#8314) (#5995)

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

Author: modular-magician

.changelog/8314.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+container: support master_global_access_config for flexible cluster
+```

google-beta/resource_container_cluster_test.go

@@ -996,6 +996,36 @@ func TestAccContainerCluster_withPrivateClusterConfigMissingCidrBlock_withAutopi
 	})
 }
 
+func TestAccContainerCluster_withPrivateClusterConfigGlobalAccessEnabledOnly(t *testing.T) {
+	t.Parallel()
+
+	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_withPrivateClusterConfigGlobalAccessEnabledOnly(clusterName, true),
+			},
+			{
+				ResourceName:      "google_container_cluster.with_private_cluster",
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
+			{
+				Config: testAccContainerCluster_withPrivateClusterConfigGlobalAccessEnabledOnly(clusterName, false),
+			},
+			{
+				ResourceName:      "google_container_cluster.with_private_cluster",
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
+		},
+	})
+}
+
 func TestAccContainerCluster_withIntraNodeVisibility(t *testing.T) {
 	t.Parallel()
 
@@ -6754,6 +6784,22 @@ resource "google_container_cluster" "with_private_cluster" {
 `, containerNetName, clusterName, masterGlobalAccessEnabled)
 }
 
+func testAccContainerCluster_withPrivateClusterConfigGlobalAccessEnabledOnly(clusterName string, masterGlobalAccessEnabled bool) string {
+	return fmt.Sprintf(`
+resource "google_container_cluster" "with_private_cluster" {
+  name               = "%s"
+  location           = "us-central1-a"
+  initial_node_count = 1
+  private_cluster_config {
+    enable_private_endpoint = false
+    master_global_access_config {
+      enabled = %t
+	}
+  }
+}
+`, clusterName, masterGlobalAccessEnabled)
+}
+
 func testAccContainerCluster_withShieldedNodes(clusterName string, enabled bool) string {
 	return fmt.Sprintf(`
 resource "google_container_cluster" "with_shielded_nodes" {

google-beta/services/container/resource_container_cluster.go

@@ -5918,12 +5918,15 @@ func containerClusterPrivateClusterConfigSuppress(k, old, new string, d *schema.
 	// Do not suppress diffs when private_endpoint_subnetwork is configured
 	_, hasSubnet := d.GetOk("private_cluster_config.0.private_endpoint_subnetwork")
 
+	// Do not suppress diffs when master_global_access_config is configured
+	_, hasGlobalAccessConfig := d.GetOk("private_cluster_config.0.master_global_access_config")
+
 	if k == "private_cluster_config.0.enable_private_endpoint" {
 		return suppressEndpoint && !hasSubnet
 	} else if k == "private_cluster_config.0.enable_private_nodes" {
 		return suppressNodes && !hasSubnet
 	} else if k == "private_cluster_config.#" {
-		return suppressEndpoint && suppressNodes && !hasSubnet
+		return suppressEndpoint && suppressNodes && !hasSubnet && !hasGlobalAccessConfig
 	}
 	return false
 }