Added support for tf:suppress_diff on primitive types (#1074)

Fix #984

Author: nfx

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Version changelog
 
+## 0.4.8
+
+* Added support for `tf:suppress_diff` on primitive types ([#984](https://github.com/databrickslabs/terraform-provider-databricks/issues/984)).
+
+Updated dependency versions:
+
+* Bump google.golang.org/api from 0.65.0 to 0.66.0
+
 ## 0.4.7
 * Added optional `force` argument to `databricks_group` resource to ignore `cannot create group: Group with name X already exists.` errors and implicitly import the specific group into Terraform state, enforcing entitlements defined in the instance of resource ([#1066](https://github.com/databrickslabs/terraform-provider-databricks/pull/1066)).
 * Added support to configure permissions for all MLflow models ([#1044](https://github.com/databrickslabs/terraform-provider-databricks/issues/1044)).

common/reflect_resource.go

@@ -122,6 +122,16 @@ func handleSensitive(typeField reflect.StructField, schema *schema.Schema) {
 	}
 }
 
+func handleSuppressDiff(typeField reflect.StructField, v *schema.Schema) {
+	tfTags := strings.Split(typeField.Tag.Get("tf"), ",")
+	for _, tag := range tfTags {
+		if tag == "suppress_diff" {
+			v.DiffSuppressFunc = diffSuppressor(fmt.Sprintf("%v", v.Type.Zero()))
+			break
+		}
+	}
+}
+
 func getAlias(typeField reflect.StructField) string {
 	tfTags := strings.Split(typeField.Tag.Get("tf"), ",")
 	for _, tag := range tfTags {
@@ -198,12 +208,18 @@ func typeToSchema(v reflect.Value, t reflect.Type, path []string) map[string]*sc
 		switch typeField.Type.Kind() {
 		case reflect.Int, reflect.Int32, reflect.Int64:
 			scm[fieldName].Type = schema.TypeInt
+			// diff suppression needs type for zero value
+			handleSuppressDiff(typeField, scm[fieldName])
 		case reflect.Float64:
 			scm[fieldName].Type = schema.TypeFloat
+			// diff suppression needs type for zero value
+			handleSuppressDiff(typeField, scm[fieldName])
 		case reflect.Bool:
 			scm[fieldName].Type = schema.TypeBool
 		case reflect.String:
 			scm[fieldName].Type = schema.TypeString
+			// diff suppression needs type for zero value
+			handleSuppressDiff(typeField, scm[fieldName])
 		case reflect.Map:
 			scm[fieldName].Type = schema.TypeMap
 		case reflect.Ptr:

common/reflect_resource_test.go

@@ -197,7 +197,7 @@ type Address struct {
 
 type Dummy struct {
 	Enabled     bool              `json:"enabled" tf:"conflicts:workers"`
-	Workers     int               `json:"workers,omitempty"`
+	Workers     int               `json:"workers,omitempty" tf:"suppress_diff"`
 	Description string            `json:"description,omitempty"`
 	Addresses   []Address         `json:"addresses,omitempty" tf:"max_items:10"`
 	Unique      []Address         `json:"unique,omitempty" tf:"slice_set"`

common/version.go

@@ -3,7 +3,7 @@ package common
 import "context"
 
 var (
-	version = "0.4.7"
+	version = "0.4.8"
 	// ResourceName is resource name without databricks_ prefix
 	ResourceName contextKey = 1
 	// Provider is the current instance of provider

pools/resource_instance_pool.go

@@ -42,13 +42,13 @@ type InstancePool struct {
 	InstancePoolID                     string                       `json:"instance_pool_id,omitempty" tf:"computed"`
 	InstancePoolName                   string                       `json:"instance_pool_name"`
 	MinIdleInstances                   int32                        `json:"min_idle_instances,omitempty"`
-	MaxCapacity                        int32                        `json:"max_capacity,omitempty"`
+	MaxCapacity                        int32                        `json:"max_capacity,omitempty" tf:"suppress_diff"`
 	IdleInstanceAutoTerminationMinutes int32                        `json:"idle_instance_autotermination_minutes"`
 	AwsAttributes                      *InstancePoolAwsAttributes   `json:"aws_attributes,omitempty" tf:"force_new,suppress_diff"`
 	AzureAttributes                    *InstancePoolAzureAttributes `json:"azure_attributes,omitempty" tf:"force_new,suppress_diff"`
 	NodeTypeID                         string                       `json:"node_type_id" tf:"force_new"`
 	CustomTags                         map[string]string            `json:"custom_tags,omitempty" tf:"force_new"`
-	EnableElasticDisk                  bool                         `json:"enable_elastic_disk,omitempty" tf:"force_new"`
+	EnableElasticDisk                  bool                         `json:"enable_elastic_disk,omitempty" tf:"force_new,suppress_diff"`
 	DiskSpec                           *InstancePoolDiskSpec        `json:"disk_spec,omitempty" tf:"force_new"`
 	PreloadedSparkVersions             []string                     `json:"preloaded_spark_versions,omitempty" tf:"force_new"`
 	PreloadedDockerImages              []clusters.DockerImage       `json:"preloaded_docker_images,omitempty" tf:"force_new,slice_set,alias:preloaded_docker_image"`

scripts/gcp-integration/main.tf

@@ -43,6 +43,7 @@ resource "databricks_mws_workspaces" "this" {
       project_id = data.google_client_config.current.project
     }
   }
+  token {}
 }
 
 // google_service_account configured via env
@@ -76,6 +77,11 @@ output "databricks_host" {
   value = databricks_mws_workspaces.this.workspace_url
 }
 
+output "databricks_token" {
+  value     = databricks_mws_workspaces.this.token[0].token_value
+  sensitive = true
+}
+
 output "cloud_env" {
   value = "gcp"
 }