Mark resources as new when doing import

This fixes #471

Author: alexott

CHANGELOG.md

@@ -14,6 +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))
 
 **Behavior changes**
 

go.sum

@@ -227,10 +227,13 @@ 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=
 github.com/hashicorp/terraform-plugin-sdk/v2 v2.4.0/go.mod h1:JBItawj+j8Ssla5Ib6BC/W9VQkOucBfnX7VRtyx1vw8=
+github.com/hashicorp/terraform-plugin-sdk/v2 v2.4.1 h1:k2rpom9wG2cdi5iLRH80EdQB7UX/E6UzYzUfzgsNLuU=
+github.com/hashicorp/terraform-plugin-sdk/v2 v2.4.2 h1:8oo4eMtv3nEZGqe8W0UzMxKnKWuwS/Tb2YyIFJkL59g=
 github.com/hashicorp/terraform-plugin-test/v2 v2.0.0 h1:fYGV3nZvs8KFGKuY2NPAJDMNfVSDHo+U2FGFl3bPv1s=
 github.com/hashicorp/terraform-plugin-test/v2 v2.0.0/go.mod h1:C6VALgUlvaif+PnHyRGKWPTdQkMJK4NQ20VJolxZLI0=
 github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM=

internal/util/common_resource.go

@@ -43,6 +43,20 @@ func (r CommonResource) ToResource() *schema.Resource {
 			v.ForceNew = true
 		}
 	}
+	readFunc := 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",
+				common.ResourceName.GetOrUnknown(ctx), d.Id())
+			d.SetId("")
+			return nil
+		}
+		if err != nil {
+			return diag.FromErr(err)
+		}
+		return nil
+	}
+
 	return &schema.Resource{
 		Schema:         r.Schema,
 		SchemaVersion:  r.SchemaVersion,
@@ -64,19 +78,7 @@ func (r CommonResource) ToResource() *schema.Resource {
 			}
 			return nil
 		},
-		ReadContext: 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",
-					common.ResourceName.GetOrUnknown(ctx), d.Id())
-				d.SetId("")
-				return nil
-			}
-			if err != nil {
-				return diag.FromErr(err)
-			}
-			return nil
-		},
+		ReadContext:   readFunc,
 		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 {
@@ -85,7 +87,15 @@ func (r CommonResource) ToResource() *schema.Resource {
 			return nil
 		},
 		Importer: &schema.ResourceImporter{
-			StateContext: schema.ImportStatePassthroughContext,
+			StateContext: func(ctx context.Context, d *schema.ResourceData, m interface{}) (data []*schema.ResourceData, e error) {
+				d.MarkNewResource()
+				diags := readFunc(ctx, d, m)
+				var err error
+				if diags.HasError() {
+					err = diags[0].Validate()
+				}
+				return []*schema.ResourceData{d}, err
+			},
 		},
 	}
 }