Merge pull request #456 from rawmind0/tfup

Fix Error: string is required upgrading rancher2 provider from v1.10.0 or lower

Author: rawmind0

CHANGELOG.md

@@ -1,3 +1,17 @@
+## 1.10.3 (September 14, 2020)
+
+FEATURES:
+
+
+
+ENHANCEMENTS:
+
+
+
+BUG FIXES:
+
+* Fix `Error: string is required` upgrading rancher2 provider from v1.10.0 or lower
+
 ## 1.10.2 (September 10, 2020)
 
 FEATURES:

rancher2/data_source_rancher2_cluster.go

@@ -28,7 +28,7 @@ func dataSourceRancher2Cluster() *schema.Resource {
 				MaxItems: 1,
 				Computed: true,
 				Elem: &schema.Resource{
-					Schema: clusterRKEConfigFields(),
+					Schema: clusterRKEConfigFieldsData(),
 				},
 			},
 			"k3s_config": {

rancher2/data_source_rancher2_cluster_template.go

@@ -40,7 +40,7 @@ func dataSourceRancher2ClusterTemplate() *schema.Resource {
 				Computed:    true,
 				Description: "Cluster template revisions",
 				Elem: &schema.Resource{
-					Schema: clusterTemplateRevisionFields(),
+					Schema: clusterTemplateRevisionFieldsData(),
 				},
 			},
 			"annotations": {

rancher2/resource_rancher2_cluster.go

@@ -20,7 +20,15 @@ func resourceRancher2Cluster() *schema.Resource {
 		Importer: &schema.ResourceImporter{
 			State: resourceRancher2ClusterImport,
 		},
-		Schema: clusterFields(),
+		Schema:        clusterFields(),
+		SchemaVersion: 1,
+		StateUpgraders: []schema.StateUpgrader{
+			{
+				Type:    resourceRancher2ClusterResourceV0().CoreConfigSchema().ImpliedType(),
+				Upgrade: resourceRancher2ClusterStateUpgradeV0,
+				Version: 0,
+			},
+		},
 		// Setting default timeouts to be liberal in order to accommodate managed Kubernetes providers like EKS, GKE, and AKS
 		Timeouts: &schema.ResourceTimeout{
 			Create: schema.DefaultTimeout(30 * time.Minute),
@@ -30,6 +38,66 @@ func resourceRancher2Cluster() *schema.Resource {
 	}
 }
 
+func resourceRancher2ClusterResourceV0() *schema.Resource {
+	return &schema.Resource{
+		Schema: clusterFieldsV0(),
+	}
+}
+
+func resourceRancher2ClusterStateUpgradeV0(rawState map[string]interface{}, meta interface{}) (map[string]interface{}, error) {
+	if rkeConfigs, ok := rawState["rke_config"].([]interface{}); ok && len(rkeConfigs) > 0 {
+		for i1 := range rkeConfigs {
+			if rkeConfig, ok := rkeConfigs[i1].(map[string]interface{}); ok && len(rkeConfig) > 0 {
+				if services, ok := rkeConfig["services"].([]interface{}); ok && len(services) > 0 {
+					for i2 := range services {
+						if service, ok := services[i2].(map[string]interface{}); ok && len(service) > 0 {
+							if kubeApis, ok := service["kube_api"].([]interface{}); ok && len(kubeApis) > 0 {
+								for i3 := range kubeApis {
+									if kubeAPI, ok := kubeApis[i3].(map[string]interface{}); ok && len(kubeAPI) > 0 {
+										if eventRates, ok := kubeAPI["event_rate_limit"].([]interface{}); ok && len(eventRates) > 0 {
+											for i4 := range eventRates {
+												if eventRate, ok := eventRates[i4].(map[string]interface{}); ok && len(eventRate) > 0 {
+													if config, ok := eventRate["configuration"].(map[string]interface{}); ok {
+														newValue := ""
+														if len(config) > 0 {
+															conf, err := mapInterfaceToYAML(config)
+															if err == nil {
+																newValue = conf
+															}
+														}
+														rawState["rke_config"].([]interface{})[i1].(map[string]interface{})["services"].([]interface{})[i2].(map[string]interface{})["kube_api"].([]interface{})[i3].(map[string]interface{})["event_rate_limit"].([]interface{})[i4].(map[string]interface{})["configuration"] = newValue
+													}
+												}
+											}
+										}
+										if secretEncs, ok := kubeAPI["secrets_encryption_config"].([]interface{}); ok && len(secretEncs) > 0 {
+											for i4 := range secretEncs {
+												if secretEnc, ok := secretEncs[i4].(map[string]interface{}); ok && len(secretEnc) > 0 {
+													if config, ok := secretEnc["custom_config"].(map[string]interface{}); ok {
+														newValue := ""
+														if len(config) > 0 {
+															conf, err := mapInterfaceToYAML(config)
+															if err == nil {
+																newValue = conf
+															}
+														}
+														rawState["rke_config"].([]interface{})[i1].(map[string]interface{})["services"].([]interface{})[i2].(map[string]interface{})["kube_api"].([]interface{})[i3].(map[string]interface{})["secrets_encryption_config"].([]interface{})[i4].(map[string]interface{})["custom_config"] = newValue
+													}
+												}
+											}
+										}
+									}
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+	return rawState, nil
+}
+
 func resourceRancher2ClusterCreate(d *schema.ResourceData, meta interface{}) error {
 	client, err := meta.(*Config).ManagementClient()
 	if err != nil {

rancher2/resource_rancher2_cluster_template.go

@@ -19,7 +19,15 @@ func resourceRancher2ClusterTemplate() *schema.Resource {
 		Importer: &schema.ResourceImporter{
 			State: resourceRancher2ClusterTemplateImport,
 		},
-		Schema: clusterTemplateFields(),
+		Schema:        clusterTemplateFields(),
+		SchemaVersion: 1,
+		StateUpgraders: []schema.StateUpgrader{
+			{
+				Type:    resourceRancher2ClusterTemplateResourceV0().CoreConfigSchema().ImpliedType(),
+				Upgrade: resourceRancher2ClusterTemplateStateUpgradeV0,
+				Version: 0,
+			},
+		},
 		Timeouts: &schema.ResourceTimeout{
 			Create: schema.DefaultTimeout(10 * time.Minute),
 			Update: schema.DefaultTimeout(10 * time.Minute),
@@ -106,6 +114,33 @@ func resourceRancher2ClusterTemplate() *schema.Resource {
 	}
 }
 
+func resourceRancher2ClusterTemplateResourceV0() *schema.Resource {
+	return &schema.Resource{
+		Schema: clusterTemplateFieldsV0(),
+	}
+}
+
+func resourceRancher2ClusterTemplateStateUpgradeV0(rawState map[string]interface{}, meta interface{}) (map[string]interface{}, error) {
+	if tmplRevisions, ok := rawState["template_revisions"].([]interface{}); ok && len(tmplRevisions) > 0 {
+		for i1 := range tmplRevisions {
+			if tmplRevision, ok := tmplRevisions[i1].(map[string]interface{}); ok && len(tmplRevision) > 0 {
+				if clusterConfigs, ok := tmplRevision["cluster_config"].([]interface{}); ok && len(clusterConfigs) > 0 {
+					for i2 := range clusterConfigs {
+						if clusterConfig, ok := clusterConfigs[i2].(map[string]interface{}); ok && len(clusterConfig) > 0 {
+							newValue, err := resourceRancher2ClusterStateUpgradeV0(clusterConfig, meta)
+							if err != nil {
+								return nil, fmt.Errorf("Upgrading Cluster Template schema V0: %v", err)
+							}
+							rawState["template_revisions"].([]interface{})[i1].(map[string]interface{})["cluster_config"].([]interface{})[i2] = newValue
+						}
+					}
+				}
+			}
+		}
+	}
+	return rawState, nil
+}
+
 func resourceRancher2ClusterTemplateCreate(d *schema.ResourceData, meta interface{}) error {
 	ctrIndex, clusterTemplate, clusterTemplateRevisions, err := expandClusterTemplate(d)
 	if err != nil {