fix allow_external_traffic not being settable if other dns_endpoint_config fields are set (GoogleCloudPlatform#17127)

Author: gkrantz

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

@@ -6789,17 +6789,17 @@ func expandControlPlaneEndpointsConfig(d *schema.ResourceData) *container.Contro
 	dns := &container.DNSEndpointConfig{}
 	if v := d.Get("control_plane_endpoints_config.0.dns_endpoint_config.0.allow_external_traffic"); v != nil {
 		dns.AllowExternalTraffic = v.(bool)
-		dns.ForceSendFields = []string{"AllowExternalTraffic"}
+		dns.ForceSendFields = append(dns.ForceSendFields, "AllowExternalTraffic")
 	}
 
 	if v := d.Get("control_plane_endpoints_config.0.dns_endpoint_config.0.enable_k8s_tokens_via_dns"); v != nil {
 		dns.EnableK8sTokensViaDns = v.(bool)
-		dns.ForceSendFields = []string{"EnableK8sTokensViaDns"}
+		dns.ForceSendFields = append(dns.ForceSendFields, "EnableK8sTokensViaDns")
 	}
 
 	if v := d.Get("control_plane_endpoints_config.0.dns_endpoint_config.0.enable_k8s_certs_via_dns"); v != nil {
 		dns.EnableK8sCertsViaDns = v.(bool)
-		dns.ForceSendFields = []string{"EnableK8sCertsViaDns"}
+		dns.ForceSendFields = append(dns.ForceSendFields, "EnableK8sCertsViaDns")
 	}
 
 	ip := &container.IPEndpointsConfig{

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

@@ -16052,6 +16052,19 @@ func TestAccContainerCluster_withDnsEndpoint(t *testing.T) {
 				ImportStateVerify:       true,
 				ImportStateVerifyIgnore: []string{"deletion_protection"},
 			},
+			{
+				Config: testAccContainerCluster_withDnsEndpoint(clusterName, networkName, subnetworkName, false),
+				Check: resource.ComposeAggregateTestCheckFunc(
+					resource.TestCheckResourceAttrSet("google_container_cluster.primary", "control_plane_endpoints_config.0.dns_endpoint_config.0.endpoint"),
+					resource.TestCheckResourceAttr("google_container_cluster.primary", "control_plane_endpoints_config.0.dns_endpoint_config.0.allow_external_traffic", "false"),
+				),
+			},
+			{
+				ResourceName:            "google_container_cluster.primary",
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"deletion_protection"},
+			},
 		},
 	})
 }
@@ -16068,9 +16081,11 @@ resource "google_container_cluster" "primary" {
   control_plane_endpoints_config {
     dns_endpoint_config {
       allow_external_traffic = %t
+      enable_k8s_tokens_via_dns = %t
+      enable_k8s_certs_via_dns = %t
     }
   }
-}`, name, networkName, subnetworkName, enabled)
+}`, name, networkName, subnetworkName, enabled, enabled, enabled)
 }
 
 func TestAccContainerCluster_withDnsEndpointAndEnableK8sTokensViaDns(t *testing.T) {