Move cloudrun_config from beta to GA, fix doc. (#3470) (#2037)

Signed-off-by: Modular Magician <[email protected]>
hashicorp · May 5, 2020 · b39e73a · b39e73a
1 parent 51f2b5b
commit b39e73a
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 32 deletions.
diff --git a/.changelog/3470.txt b/.changelog/3470.txt
@@ -0,0 +1,3 @@
+```release-note:enhancement
+container: Moved `google_container_cluster.addons_config.cloudrun_config` from beta to GA.
+```
diff --git a/google-beta/resource_container_cluster.go b/google-beta/resource_container_cluster.go
@@ -53,8 +53,8 @@ var (
 		"addons_config.0.http_load_balancing",
 		"addons_config.0.horizontal_pod_autoscaling",
 		"addons_config.0.network_policy_config",
-		"addons_config.0.istio_config",
 		"addons_config.0.cloudrun_config",
+		"addons_config.0.istio_config",
 		"addons_config.0.dns_cache_config",
 		"addons_config.0.gce_persistent_disk_csi_driver_config",
 		"addons_config.0.kalm_config",
@@ -236,7 +236,7 @@ func resourceContainerCluster() *schema.Resource {
 								},
 							},
 						},
-						"istio_config": {
+						"cloudrun_config": {
 							Type:         schema.TypeList,
 							Optional:     true,
 							Computed:     true,
@@ -248,17 +248,10 @@ func resourceContainerCluster() *schema.Resource {
 										Type:     schema.TypeBool,
 										Required: true,
 									},
-									"auth": {
-										Type:     schema.TypeString,
-										Optional: true,
-										// We can't use a Terraform-level default because it won't be true when the block is disabled: true
-										DiffSuppressFunc: emptyOrDefaultStringSuppress("AUTH_NONE"),
-										ValidateFunc:     validation.StringInSlice([]string{"AUTH_NONE", "AUTH_MUTUAL_TLS"}, false),
-									},
 								},
 							},
 						},
-						"cloudrun_config": {
+						"istio_config": {
 							Type:         schema.TypeList,
 							Optional:     true,
 							Computed:     true,
@@ -270,6 +263,13 @@ func resourceContainerCluster() *schema.Resource {
 										Type:     schema.TypeBool,
 										Required: true,
 									},
+									"auth": {
+										Type:     schema.TypeString,
+										Optional: true,
+										// We can't use a Terraform-level default because it won't be true when the block is disabled: true
+										DiffSuppressFunc: emptyOrDefaultStringSuppress("AUTH_NONE"),
+										ValidateFunc:     validation.StringInSlice([]string{"AUTH_NONE", "AUTH_MUTUAL_TLS"}, false),
+									},
 								},
 							},
 						},
@@ -2195,19 +2195,19 @@ func expandClusterAddonsConfig(configured interface{}) *containerBeta.AddonsConf
 		}
 	}
 
-	if v, ok := config["istio_config"]; ok && len(v.([]interface{})) > 0 {
+	if v, ok := config["cloudrun_config"]; ok && len(v.([]interface{})) > 0 {
 		addon := v.([]interface{})[0].(map[string]interface{})
-		ac.IstioConfig = &containerBeta.IstioConfig{
+		ac.CloudRunConfig = &containerBeta.CloudRunConfig{
 			Disabled:        addon["disabled"].(bool),
-			Auth:            addon["auth"].(string),
 			ForceSendFields: []string{"Disabled"},
 		}
 	}
 
-	if v, ok := config["cloudrun_config"]; ok && len(v.([]interface{})) > 0 {
+	if v, ok := config["istio_config"]; ok && len(v.([]interface{})) > 0 {
 		addon := v.([]interface{})[0].(map[string]interface{})
-		ac.CloudRunConfig = &containerBeta.CloudRunConfig{
+		ac.IstioConfig = &containerBeta.IstioConfig{
 			Disabled:        addon["disabled"].(bool),
+			Auth:            addon["auth"].(string),
 			ForceSendFields: []string{"Disabled"},
 		}
 	}
@@ -2616,19 +2616,19 @@ func flattenClusterAddonsConfig(c *containerBeta.AddonsConfig) []map[string]inte
 		}
 	}
 
-	if c.IstioConfig != nil {
-		result["istio_config"] = []map[string]interface{}{
+	if c.CloudRunConfig != nil {
+		result["cloudrun_config"] = []map[string]interface{}{
 			{
-				"disabled": c.IstioConfig.Disabled,
-				"auth":     c.IstioConfig.Auth,
+				"disabled": c.CloudRunConfig.Disabled,
 			},
 		}
 	}
 
-	if c.CloudRunConfig != nil {
-		result["cloudrun_config"] = []map[string]interface{}{
+	if c.IstioConfig != nil {
+		result["istio_config"] = []map[string]interface{}{
 			{
-				"disabled": c.CloudRunConfig.Disabled,
+				"disabled": c.IstioConfig.Disabled,
+				"auth":     c.IstioConfig.Auth,
 			},
 		}
 	}

diff --git a/google-beta/resource_container_cluster_test.go b/google-beta/resource_container_cluster_test.go
@@ -1962,12 +1962,12 @@ resource "google_container_cluster" "primary" {
     network_policy_config {
       disabled = true
     }
-    istio_config {
+    cloudrun_config {
       disabled = true
-      auth     = "AUTH_MUTUAL_TLS"
     }
-    cloudrun_config {
+    istio_config {
       disabled = true
+      auth     = "AUTH_MUTUAL_TLS"
     }
     dns_cache_config {
       enabled = false
@@ -2002,12 +2002,12 @@ resource "google_container_cluster" "primary" {
     network_policy_config {
       disabled = false
     }
-    istio_config {
+    cloudrun_config {
       disabled = false
-      auth     = "AUTH_NONE"
     }
-    cloudrun_config {
+    istio_config {
       disabled = false
+      auth     = "AUTH_NONE"
     }
     dns_cache_config {
       enabled = true

diff --git a/website/docs/r/container_cluster.html.markdown b/website/docs/r/container_cluster.html.markdown
@@ -321,13 +321,13 @@ The `addons_config` block supports:
     It can only be disabled if the nodes already do not have network policies enabled.
     Defaults to disabled; set `disabled = false` to enable.
 
+* `cloudrun_config` - (Optional).
+    The status of the CloudRun addon. It is disabled by default.
+    Set `disabled = false` to enable.
+
 * `istio_config` - (Optional, [Beta](https://terraform.io/docs/providers/google/guides/provider_versions.html)).
     Structure is documented below.
 
-* `cloudrun_config` - (Optional, [Beta](https://terraform.io/docs/providers/google/guides/provider_versions.html)).
-    The status of the CloudRun addon. It requires `istio_config` enabled. It is disabled by default.
-    Set `disabled = false` to enable. This addon can only be enabled at cluster creation time.
-
 * `dns_cache_config` - (Optional, [Beta](https://terraform.io/docs/providers/google/guides/provider_versions.html)).
     The status of the NodeLocal DNSCache addon. It is disabled by default.
     Set `enabled = true` to enable.