fix(resource_container_cluster): allow passing empty list to monitoring_config and logging_config (#6468) (#4700)

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

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

Author: modular-magician

.changelog/6468.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+container: fixed allow passing empty list to monitoring_config and logging_config in `google_container_cluster`
+```

google-beta/resource_container_cluster.go

@@ -4015,14 +4015,19 @@ func expandDnsConfig(configured interface{}) *container.DNSConfig {
 
 func expandContainerClusterLoggingConfig(configured interface{}) *container.LoggingConfig {
 	l := configured.([]interface{})
-	if len(l) == 0 || l[0] == nil {
+	if len(l) == 0 {
 		return nil
 	}
 
-	config := l[0].(map[string]interface{})
+	var components []string
+	if l[0] != nil {
+		config := l[0].(map[string]interface{})
+		components = convertStringArr(config["enable_components"].([]interface{}))
+	}
+
 	return &container.LoggingConfig{
 		ComponentConfig: &container.LoggingComponentConfig{
-			EnableComponents: convertStringArr(config["enable_components"].([]interface{})),
+			EnableComponents: components,
 		},
 	}
 }
@@ -4035,7 +4040,7 @@ func expandMonitoringConfig(configured interface{}) *container.MonitoringConfig
 	mc := &container.MonitoringConfig{}
 	config := l[0].(map[string]interface{})
 
-	if v, ok := config["enable_components"]; ok && len(v.([]interface{})) > 0 {
+	if v, ok := config["enable_components"]; ok {
 		enable_components := v.([]interface{})
 		mc.ComponentConfig = &container.MonitoringComponentConfig{
 			EnableComponents: convertStringArr(enable_components),

google-beta/resource_container_cluster_test.go

@@ -2236,6 +2236,14 @@ func TestAccContainerCluster_withLoggingConfig(t *testing.T) {
 				ImportState:       true,
 				ImportStateVerify: true,
 			},
+			{
+				Config: testAccContainerCluster_withLoggingConfigDisabled(clusterName),
+			},
+			{
+				ResourceName:      "google_container_cluster.primary",
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
 			{
 				Config: testAccContainerCluster_withLoggingConfigUpdated(clusterName),
 			},
@@ -2283,6 +2291,15 @@ func TestAccContainerCluster_withMonitoringConfig(t *testing.T) {
 				ImportStateVerify:       true,
 				ImportStateVerifyIgnore: []string{"min_master_version"},
 			},
+			{
+				Config: testAccContainerCluster_withMonitoringConfigDisabled(clusterName),
+			},
+			{
+				ResourceName:            "google_container_cluster.primary",
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"min_master_version"},
+			},
 			{
 				Config: testAccContainerCluster_withMonitoringConfigUpdated(clusterName),
 			},
@@ -6010,6 +6027,19 @@ resource "google_container_cluster" "primary" {
 `, name)
 }
 
+func testAccContainerCluster_withLoggingConfigDisabled(name string) string {
+	return fmt.Sprintf(`
+resource "google_container_cluster" "primary" {
+  name               = "%s"
+  location           = "us-central1-a"
+  initial_node_count = 1
+  logging_config {
+	  enable_components = []
+  }
+}
+`, name)
+}
+
 func testAccContainerCluster_withLoggingConfigUpdated(name string) string {
 	return fmt.Sprintf(`
 resource "google_container_cluster" "primary" {
@@ -6051,6 +6081,19 @@ resource "google_container_cluster" "primary" {
 `, name)
 }
 
+func testAccContainerCluster_withMonitoringConfigDisabled(name string) string {
+	return fmt.Sprintf(`
+resource "google_container_cluster" "primary" {
+  name               = "%s"
+  location           = "us-central1-a"
+  initial_node_count = 1
+  monitoring_config {
+      enable_components = []
+  }
+}
+`, name)
+}
+
 func testAccContainerCluster_withMonitoringConfigUpdated(name string) string {
 	return fmt.Sprintf(`
 resource "google_container_cluster" "primary" {