add datafusion versioning for terraform (#3734) (#2268)

* add datafusion versioning

* Update tf version override in terraform.yml

Co-authored-by: Connor Wilkes <[email protected]>
Signed-off-by: Modular Magician <[email protected]>

Co-authored-by: Connor Wilkes <[email protected]>

Author: modular-magician

.changelog/3734.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+datafusion: changed `version` field to selectable in `google_data_fusion_instance` resource
+```

google-beta/resource_data_fusion_instance.go

@@ -132,6 +132,13 @@ able to access the public internet.`,
 				ForceNew:    true,
 				Description: `The region of the Data Fusion instance.`,
 			},
+			"version": {
+				Type:        schema.TypeString,
+				Computed:    true,
+				Optional:    true,
+				ForceNew:    true,
+				Description: `Current version of the Data Fusion.`,
+			},
 			"create_time": {
 				Type:        schema.TypeString,
 				Computed:    true,
@@ -168,11 +175,6 @@ able to access the public internet.`,
 				Computed:    true,
 				Description: `The time the instance was last updated in RFC3339 UTC "Zulu" format, accurate to nanoseconds.`,
 			},
-			"version": {
-				Type:        schema.TypeString,
-				Computed:    true,
-				Description: `Current version of the Data Fusion.`,
-			},
 			"project": {
 				Type:     schema.TypeString,
 				Optional: true,
@@ -229,6 +231,12 @@ func resourceDataFusionInstanceCreate(d *schema.ResourceData, meta interface{})
 	} else if v, ok := d.GetOkExists("options"); !isEmptyValue(reflect.ValueOf(optionsProp)) && (ok || !reflect.DeepEqual(v, optionsProp)) {
 		obj["options"] = optionsProp
 	}
+	versionProp, err := expandDataFusionInstanceVersion(d.Get("version"), d, config)
+	if err != nil {
+		return err
+	} else if v, ok := d.GetOkExists("version"); !isEmptyValue(reflect.ValueOf(versionProp)) && (ok || !reflect.DeepEqual(v, versionProp)) {
+		obj["version"] = versionProp
+	}
 	privateInstanceProp, err := expandDataFusionInstancePrivateInstance(d.Get("private_instance"), d, config)
 	if err != nil {
 		return err
@@ -606,6 +614,10 @@ func expandDataFusionInstanceOptions(v interface{}, d TerraformResourceData, con
 	return m, nil
 }
 
+func expandDataFusionInstanceVersion(v interface{}, d TerraformResourceData, config *Config) (interface{}, error) {
+	return v, nil
+}
+
 func expandDataFusionInstancePrivateInstance(v interface{}, d TerraformResourceData, config *Config) (interface{}, error) {
 	return v, nil
 }

google-beta/resource_data_fusion_instance_generated_test.go

@@ -90,6 +90,7 @@ resource "google_data_fusion_instance" "extended_instance" {
     network = "default"
     ip_allocation = "10.89.48.0/22"
   }
+  version = "6.1.1"
 }
 `, context)
 }

google-beta/resource_data_fusion_instance_test.go

@@ -42,6 +42,7 @@ resource "google_data_fusion_instance" "foobar" {
   name   = "%s"
   region = "us-central1"
   type   = "BASIC"
+  version = "6.1.1"
 }
 `, instanceName)
 }
@@ -59,6 +60,7 @@ resource "google_data_fusion_instance" "foobar" {
     label1 = "value1"
     label2 = "value2"
   }
+  version = "6.1.1"
 }
 `, instanceName)
 }

website/docs/r/data_fusion_instance.html.markdown

@@ -74,6 +74,7 @@ resource "google_data_fusion_instance" "extended_instance" {
     network = "default"
     ip_allocation = "10.89.48.0/22"
   }
+  version = "6.1.1"
 }
 ```
 
@@ -125,6 +126,10 @@ The following arguments are supported:
   (Optional)
   Map of additional options used to configure the behavior of Data Fusion instance.
 
+* `version` -
+  (Optional)
+  Current version of the Data Fusion.
+
 * `private_instance` -
   (Optional)
   Specifies whether the Data Fusion instance should be private. If set to
@@ -183,9 +188,6 @@ In addition to the arguments listed above, the following computed attributes are
 * `service_endpoint` -
   Endpoint on which the Data Fusion UI and REST APIs are accessible.
 
-* `version` -
-  Current version of the Data Fusion.
-
 * `service_account` -
   Service account which will be used to access resources in the customer project.