Suppress diff for databricks_user.external_id

Fixes #1097

Author: nfx

CHANGELOG.md

@@ -5,7 +5,12 @@
 * Prevent creation of `databricks_group` with `users` and `admins` reserved names ([#1089](https://github.com/databrickslabs/terraform-provider-databricks/issues/1089)).
 * Added support for shared clusters in multi-task `databricks_job` ([#1082](https://github.com/databrickslabs/terraform-provider-databricks/issues/1082)).
 * Added diff suppression for `external_id` in `databricks_group` ([#1099](https://github.com/databrickslabs/terraform-provider-databricks/issues/1099)).
-* Various documentation improvements.
+* Added diff suppression for `external_id` in `databricks_user` ([#1097](https://github.com/databrickslabs/terraform-provider-databricks/issues/1097)).
+* Added various documentation improvements.
+
+Updated dependency versions:
+
+* Bump google.golang.org/api from 0.66.0 to 0.67.0
 
 ## 0.4.8
 

scim/acceptance/resource_user_test.go

@@ -1,15 +1,45 @@
 package acceptance
 
 import (
+	"context"
 	"os"
 	"testing"
 
+	"github.com/databrickslabs/terraform-provider-databricks/common"
 	"github.com/databrickslabs/terraform-provider-databricks/internal/acceptance"
+	"github.com/databrickslabs/terraform-provider-databricks/scim"
+	"github.com/stretchr/testify/assert"
 
 	"github.com/databrickslabs/terraform-provider-databricks/qa"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 )
 
+// https://github.com/databrickslabs/terraform-provider-databricks/issues/1097
+func TestAccForceUserImport(t *testing.T) {
+	if _, ok := os.LookupEnv("CLOUD_ENV"); !ok {
+		t.Skip("Acceptance tests skipped unless env 'CLOUD_ENV' is set")
+	}
+	username := qa.RandomEmail()
+	os.Setenv("TEST_USERNAME", username) 
+	ctx := context.Background()
+	client := common.CommonEnvironmentClient()
+	usersAPI := scim.NewUsersAPI(ctx, client)
+	user, err := usersAPI.Create(scim.User{
+		UserName: username,
+		ExternalID: qa.RandomName("ext-id"),
+	})
+	assert.NoError(t, err)
+	defer usersAPI.Delete(user.ID)
+	acceptance.Test(t, []acceptance.Step{
+		{
+			Template: `resource "databricks_user" "this" {
+				user_name = "{env.TEST_USERNAME}"
+				force     = true
+			}`,
+		},
+	})
+}
+
 func TestAccUserResource(t *testing.T) {
 	if _, ok := os.LookupEnv("CLOUD_ENV"); !ok {
 		t.Skip("Acceptance tests skipped unless env 'CLOUD_ENV' is set")

scim/resource_user.go

@@ -16,7 +16,7 @@ func ResourceUser() *schema.Resource {
 		UserName    string `json:"user_name" tf:"force_new"`
 		DisplayName string `json:"display_name,omitempty" tf:"computed"`
 		Active      bool   `json:"active,omitempty"`
-		ExternalID  string `json:"external_id,omitempty"`
+		ExternalID  string `json:"external_id,omitempty" tf:"suppress_diff"`
 	}
 	userSchema := common.StructToSchema(entity{},
 		func(m map[string]*schema.Schema) map[string]*schema.Schema {