gke_backup_agent_config: support from beta to ga (#6898) (#4970)

* promote backup to ga

* gke_backup_agent_config: doc update

* fix typo in a test func name

* retrigger checks

* update test for gke backup config in ga

Co-authored-by: Shubham Singh <[email protected]>
Signed-off-by: Modular Magician <[email protected]>

Signed-off-by: Modular Magician <[email protected]>
Co-authored-by: Shubham Singh <[email protected]>

Author: modular-magician

.changelog/6898.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+container: promoted `gke_backup_agent_config` in `google_container_cluster` to GA
+```

google-beta/resource_container_cluster.go

@@ -68,10 +68,10 @@ var (
 		"addons_config.0.gcp_filestore_csi_driver_config",
 		"addons_config.0.dns_cache_config",
 		"addons_config.0.gce_persistent_disk_csi_driver_config",
+		"addons_config.0.gke_backup_agent_config",
 		"addons_config.0.istio_config",
 		"addons_config.0.kalm_config",
 		"addons_config.0.config_connector_config",
-		"addons_config.0.gke_backup_agent_config",
 	}
 
 	privateClusterConfigKeys = []string{
@@ -371,6 +371,22 @@ func resourceContainerCluster() *schema.Resource {
 								},
 							},
 						},
+						"gke_backup_agent_config": {
+							Type:         schema.TypeList,
+							Optional:     true,
+							Computed:     true,
+							AtLeastOneOf: addonsConfigKeys,
+							MaxItems:     1,
+							Description:  `The status of the Backup for GKE Agent addon. It is disabled by default. Set enabled = true to enable.`,
+							Elem: &schema.Resource{
+								Schema: map[string]*schema.Schema{
+									"enabled": {
+										Type:     schema.TypeBool,
+										Required: true,
+									},
+								},
+							},
+						},
 						"istio_config": {
 							Type:         schema.TypeList,
 							Optional:     true,
@@ -428,22 +444,6 @@ func resourceContainerCluster() *schema.Resource {
 								},
 							},
 						},
-						"gke_backup_agent_config": {
-							Type:         schema.TypeList,
-							Optional:     true,
-							Computed:     true,
-							AtLeastOneOf: addonsConfigKeys,
-							MaxItems:     1,
-							Description:  `The status of the Backup for GKE Agent addon. It is disabled by default. Set enabled = true to enable.`,
-							Elem: &schema.Resource{
-								Schema: map[string]*schema.Schema{
-									"enabled": {
-										Type:     schema.TypeBool,
-										Required: true,
-									},
-								},
-							},
-						},
 					},
 				},
 			},
@@ -3714,6 +3714,13 @@ func expandClusterAddonsConfig(configured interface{}) *container.AddonsConfig {
 			ForceSendFields: []string{"Enabled"},
 		}
 	}
+	if v, ok := config["gke_backup_agent_config"]; ok && len(v.([]interface{})) > 0 {
+		addon := v.([]interface{})[0].(map[string]interface{})
+		ac.GkeBackupAgentConfig = &container.GkeBackupAgentConfig{
+			Enabled:         addon["enabled"].(bool),
+			ForceSendFields: []string{"Enabled"},
+		}
+	}
 
 	if v, ok := config["istio_config"]; ok && len(v.([]interface{})) > 0 {
 		addon := v.([]interface{})[0].(map[string]interface{})
@@ -3738,13 +3745,6 @@ func expandClusterAddonsConfig(configured interface{}) *container.AddonsConfig {
 			ForceSendFields: []string{"Enabled"},
 		}
 	}
-	if v, ok := config["gke_backup_agent_config"]; ok && len(v.([]interface{})) > 0 {
-		addon := v.([]interface{})[0].(map[string]interface{})
-		ac.GkeBackupAgentConfig = &container.GkeBackupAgentConfig{
-			Enabled:         addon["enabled"].(bool),
-			ForceSendFields: []string{"Enabled"},
-		}
-	}
 
 	return ac
 }
@@ -4669,6 +4669,13 @@ func flattenClusterAddonsConfig(c *container.AddonsConfig) []map[string]interfac
 			},
 		}
 	}
+	if c.GkeBackupAgentConfig != nil {
+		result["gke_backup_agent_config"] = []map[string]interface{}{
+			{
+				"enabled": c.GkeBackupAgentConfig.Enabled,
+			},
+		}
+	}
 
 	if c.IstioConfig != nil {
 		result["istio_config"] = []map[string]interface{}{
@@ -4693,13 +4700,6 @@ func flattenClusterAddonsConfig(c *container.AddonsConfig) []map[string]interfac
 			},
 		}
 	}
-	if c.GkeBackupAgentConfig != nil {
-		result["gke_backup_agent_config"] = []map[string]interface{}{
-			{
-				"enabled": c.GkeBackupAgentConfig.Enabled,
-			},
-		}
-	}
 	return []map[string]interface{}{result}
 }
 

google-beta/resource_container_cluster_test.go

@@ -3702,6 +3702,9 @@ resource "google_container_cluster" "primary" {
     gce_persistent_disk_csi_driver_config {
       enabled = false
     }
+	gke_backup_agent_config {
+	  enabled = false
+	}
     istio_config {
       disabled = true
       auth     = "AUTH_MUTUAL_TLS"
@@ -3712,9 +3715,6 @@ resource "google_container_cluster" "primary" {
 	config_connector_config {
 	  enabled = false
 	}
-    gke_backup_agent_config {
-	  enabled = false
-	}
   }
 }
 `, projectID, clusterName)
@@ -3761,6 +3761,9 @@ resource "google_container_cluster" "primary" {
     gce_persistent_disk_csi_driver_config {
       enabled = true
     }
+	gke_backup_agent_config {
+	  enabled = true
+	}
     istio_config {
       disabled = false
       auth     = "AUTH_NONE"
@@ -3771,9 +3774,6 @@ resource "google_container_cluster" "primary" {
 	config_connector_config {
 	  enabled = true
 	}
-	gke_backup_agent_config {
-	  enabled = true
-	}
   }
 }
 `, projectID, clusterName)

google-beta/validation_test.go

@@ -10,7 +10,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
 )
 
-func TestvalidateGCEName(t *testing.T) {
+func TestValidateGCEName(t *testing.T) {
 	x := []StringValidationTestCase{
 		// No errors
 		{TestName: "basic", Value: "foobar"},

website/docs/r/container_cluster.html.markdown

@@ -403,14 +403,15 @@ subnetwork in which the cluster's instances are launched.
 * `gce_persistent_disk_csi_driver_config` - (Optional).
     Whether this cluster should enable the Google Compute Engine Persistent Disk Container Storage Interface (CSI) Driver. Defaults to disabled; set `enabled = true` to enabled.
 
+*  `gke_backup_agent_config` -  (Optional).
+    The status of the Backup for GKE agent addon. It is disabled by default; Set `enabled = true` to enable.
+
 * `kalm_config` - (Optional, [Beta](https://terraform.io/docs/providers/google/guides/provider_versions.html)).
     Configuration for the KALM addon, which manages the lifecycle of k8s. It is disabled by default; Set `enabled = true` to enable.
 
 *  `config_connector_config` -  (Optional, [Beta](https://terraform.io/docs/providers/google/guides/provider_versions.html)).
     The status of the ConfigConnector addon. It is disabled by default; Set `enabled = true` to enable.
 
-*  `gke_backup_agent_config` -  (Optional, [Beta](https://terraform.io/docs/providers/google/guides/provider_versions.html)).
-    The status of the Backup for GKE agent addon. It is disabled by default; Set `enabled = true` to enable.
 
 This example `addons_config` disables two addons: