Add state upgrader to DCL resource google_dataproc_workflow_template (G…

…oogleCloudPlatform#9432)

mmv1/third_party/terraform/tpgresource/labels.go

@@ -196,3 +196,19 @@ func LabelsStateUpgrade(rawState map[string]interface{}, labesPrefix string) (ma
 
 	return rawState, nil
 }
+
+// Upgrade the field "terraform_labels" in the state to have the value of filed "labels"
+// when it is not set but "labels" field is set in the state
+func TerraformLabelsStateUpgrade(rawState map[string]interface{}) (map[string]interface{}, error) {
+	log.Printf("[DEBUG] Attributes before migration: %#v", rawState)
+	log.Printf("[DEBUG] Attributes before migration terraform_labels: %#v", rawState["terraform_labels"])
+
+	if rawState["terraform_labels"] == nil && rawState["labels"] != nil {
+		rawState["terraform_labels"] = rawState["labels"]
+	}
+
+	log.Printf("[DEBUG] Attributes after migration: %#v", rawState)
+	log.Printf("[DEBUG] Attributes after migration terraform_labels: %#v", rawState["terraform_labels"])
+
+	return rawState, nil
+}

tpgtools/override.go

@@ -54,6 +54,7 @@ const (
 	CustomSerializer                   = "CUSTOM_SERIALIZER"
 	TerraformProductName               = "CUSTOM_TERRAFORM_PRODUCT_NAME"
 	CustomTimeout                      = "CUSTOM_TIMEOUT"
+	StateUpgrade                       = "STATE_UPGRADE"
 )
 
 // Field-level Overrides

tpgtools/override_details.go

@@ -225,3 +225,8 @@ type CustomTimeoutDetails struct {
 	// The overriding Timeouts in Terraform
 	TimeoutMinutes int
 }
+
+type StateUpgradeDetails struct {
+	// The current schema version
+	SchemaVersion int
+}

tpgtools/overrides/dataproc/beta/workflow_template.yaml

@@ -13,3 +13,6 @@
   details:
     functions: 
     - tpgresource.DefaultProviderProject
+- type: STATE_UPGRADE
+  details:
+    schemaversion: 1

tpgtools/overrides/dataproc/workflow_template.yaml

@@ -13,3 +13,6 @@
   details:
     functions: 
     - tpgresource.DefaultProviderProject
+- type: STATE_UPGRADE
+  details:
+    schemaversion: 1

tpgtools/resource.go

@@ -173,6 +173,11 @@ type Resource struct {
 	Reference *Link
 	// Guides point to non-rest useful context for the resource.
 	Guides []Link
+
+	// The current schema version
+	SchemaVersion int
+	// The schema versions from 0 to the current schema version
+	SchemaVersions []int
 }
 
 type Link struct {
@@ -682,6 +687,20 @@ func createResource(schema *openapi.Schema, info *openapi.Info, typeFetcher *Typ
 		res.TerraformProductName = &scpn
 	}
 
+	// Resource Override: StateUpgrade
+	stateUpgrade := StateUpgradeDetails{}
+	stateUpgradeOk, err := overrides.ResourceOverrideWithDetails(StateUpgrade, &stateUpgrade, location)
+	if err != nil {
+		return nil, fmt.Errorf("Failed to decode state upgrade details: %v", err)
+	}
+	if stateUpgradeOk {
+		res.SchemaVersion = stateUpgrade.SchemaVersion
+		res.SchemaVersions = make([]int, res.SchemaVersion)
+		for i := range res.SchemaVersions {
+			res.SchemaVersions[i] = i
+		}
+	}
+
 	res.Samples = res.loadSamples()
 
 	return &res, nil

tpgtools/templates/resource.go.tmpl

@@ -85,6 +85,19 @@ func Resource{{$.PathType}}() *schema.Resource {
 		),
 {{- end }}
 
+{{- if gt $.SchemaVersion 0 }}
+		SchemaVersion: {{$.SchemaVersion}},
+		StateUpgraders: []schema.StateUpgrader{
+  {{- range $v := $.SchemaVersions }}
+			{
+				Type:    resource{{$.PathType}}ResourceV{{$v}}().CoreConfigSchema().ImpliedType(),
+				Upgrade: Resource{{$.PathType}}UpgradeV{{$v}},
+				Version: {{$v}},
+			},
+  {{- end }}
+		},
+{{- end }}
+
 		Schema: map[string]*schema.Schema{
 {{- range $p := $.SchemaProperties }}
 			"{{$p.Name}}": {