All resource imports are now making call to corresponding Databricks API by default

Author: nfx

CHANGELOG.md

@@ -14,7 +14,7 @@
 * Added validation for secret scope name in `databricks_secret`, `databricks_secret_scope` and `databricks_secret_acl`. Non-compliant names may cause errors.
 * Added [databricks_spark_version](https://github.com/databrickslabs/terraform-provider-databricks/issues/347) data source.
 * Fixed support for [single node clusters](https://docs.databricks.com/clusters/single-node.html) support by allowing [`num_workers` to be `0`](https://github.com/databrickslabs/terraform-provider-databricks/pull/454).
-* Fixed import of resources, such as, `databricks_user` ([#471](https://github.com/databrickslabs/terraform-provider-databricks/issues/471))
+* All resource imports are now making call to corresponding Databricks API by default ([#471](https://github.com/databrickslabs/terraform-provider-databricks/issues/471))
 
 **Behavior changes**
 

go.sum

@@ -227,7 +227,6 @@ github.com/hashicorp/terraform-json v0.8.0 h1:XObQ3PgqU52YLQKEaJ08QtUshAfN3yu4u8
 github.com/hashicorp/terraform-json v0.8.0/go.mod h1:3defM4kkMfttwiE7VakJDwCd4R+umhSQnvJwORXbprE=
 github.com/hashicorp/terraform-plugin-go v0.1.0 h1:kyXZ0nkHxiRev/q18N40IbRRk4AV0zE/MDJkDM3u8dY=
 github.com/hashicorp/terraform-plugin-go v0.1.0/go.mod h1:10V6F3taeDWVAoLlkmArKttR3IULlRWFAGtQIQTIDr4=
-github.com/hashicorp/terraform-plugin-sdk v1.16.0 h1:NrkXMRjHErUPPTHQkZ6JIn6bByiJzGnlJzH1rVdNEuE=
 github.com/hashicorp/terraform-plugin-sdk/v2 v2.0.2-0.20200828083434-d39628234432 h1:IABUWxC+Atoelqy5Wk1GtbG6OR1DwIC5N0RPvePfvfw=
 github.com/hashicorp/terraform-plugin-sdk/v2 v2.0.2-0.20200828083434-d39628234432/go.mod h1:BRz6UtYmksQJU0eMfahQR8fcJf8tIe77gn7YVm6rGD4=
 github.com/hashicorp/terraform-plugin-sdk/v2 v2.4.0 h1:2c+vG46celrDCsfYEIzaXxvBaAXCqlVG77LwtFz8cfs=

internal/util/common_resource.go

@@ -43,7 +43,7 @@ func (r CommonResource) ToResource() *schema.Resource {
 			v.ForceNew = true
 		}
 	}
-	readFunc := func(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+	read := func(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 		err := r.Read(ctx, d, m.(*common.DatabricksClient))
 		if e, ok := err.(common.APIError); ok && e.IsMissing() {
 			log.Printf("[INFO] %s[id=%s] is removed on backend",
@@ -56,7 +56,6 @@ func (r CommonResource) ToResource() *schema.Resource {
 		}
 		return nil
 	}
-
 	return &schema.Resource{
 		Schema:         r.Schema,
 		SchemaVersion:  r.SchemaVersion,
@@ -78,7 +77,7 @@ func (r CommonResource) ToResource() *schema.Resource {
 			}
 			return nil
 		},
-		ReadContext:   readFunc,
+		ReadContext:   read,
 		UpdateContext: update,
 		DeleteContext: func(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 			if err := r.Delete(ctx, d, m.(*common.DatabricksClient)); err != nil {
@@ -89,7 +88,7 @@ func (r CommonResource) ToResource() *schema.Resource {
 		Importer: &schema.ResourceImporter{
 			StateContext: func(ctx context.Context, d *schema.ResourceData, m interface{}) (data []*schema.ResourceData, e error) {
 				d.MarkNewResource()
-				diags := readFunc(ctx, d, m)
+				diags := read(ctx, d, m)
 				var err error
 				if diags.HasError() {
 					err = diags[0].Validate()

internal/util/common_resource_test.go

@@ -0,0 +1,37 @@
+package util
+
+import (
+	"context"
+	"testing"
+
+	"github.com/databrickslabs/databricks-terraform/common"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+func TestImportingCallsRead(t *testing.T) {
+	r := CommonResource{
+		Read: func(ctx context.Context,
+			d *schema.ResourceData,
+			c *common.DatabricksClient) error {
+			d.SetId("abc")
+			return d.Set("foo", 1)
+		},
+		Schema: map[string]*schema.Schema{
+			"foo": {
+				Type:     schema.TypeInt,
+				Required: true,
+			},
+		},
+	}.ToResource()
+
+	d := r.TestResourceData()
+	datas, err := r.Importer.StateContext(
+		context.Background(), d,
+		&common.DatabricksClient{})
+	require.NoError(t, err)
+	assert.Len(t, datas, 1)
+	assert.Equal(t, "abc", d.Id())
+	assert.Equal(t, 1, d.Get("foo"))
+}