Fix cluster policy configuration exporter bug

Author: nfx

exporter/exporter_test.go

@@ -679,7 +679,23 @@ func TestImportingJobs_JobList(t *testing.T) {
 				Resource: "/api/2.0/permissions/cluster-policies/123",
 				Response: getJSONObject("test-data/get-cluster-policy-permissions.json"),
 			},
-
+			{
+				Method:   "GET",
+				Resource: "/api/2.0/instance-profiles/list",
+				Response: getJSONObject("test-data/list-instance-profiles.json"),
+			},
+			{
+				Method:       "GET",
+				Resource:     "/api/2.0/instance-pools/get?instance_pool_id=pool1",
+				ReuseRequest: true,
+				Response:     getJSONObject("test-data/get-instance-pool1.json"),
+			},
+			{
+				Method:       "GET",
+				Resource:     "/api/2.0/permissions/instance-pools/pool1",
+				ReuseRequest: true,
+				Response:     getJSONObject("test-data/get-job-14-permissions.json"),
+			},
 			{
 				Method:   "GET",
 				Resource: "/api/2.0/jobs/runs/list?completed_only=true&job_id=14&limit=1",
@@ -865,3 +881,49 @@ func TestImportingGlobalInitScripts(t *testing.T) {
 			assert.NoError(t, err)
 		})
 }
+
+func TestImportingUser(t *testing.T) {
+	qa.HTTPFixturesApply(t,
+		[]qa.HTTPFixture{
+			{
+				Method:       "GET",
+				ReuseRequest: true,
+				Resource:     "/api/2.0/preview/scim/v2/Users?filter=userName%20eq%20%27me%27",
+				Response: identity.UserList{
+					Resources: []identity.ScimUser{
+						{
+							ID:       "123",
+							UserName: "me",
+							Groups: []identity.GroupsListItem{
+								{
+									Value: "abc",
+									Type:  "direct",
+								},
+							},
+						},
+					},
+				},
+			},
+		}, func(ctx context.Context, client *common.DatabricksClient) {
+			ic := newImportContext(client)
+			err := resourcesMap["databricks_user"].Search(ic, &resource{
+				Resource: "databricks_user",
+				Value:    "me",
+			})
+			assert.NoError(t, err)
+
+			d := ic.Resources["databricks_user"].TestResourceData()
+			d.Set("user_name", "me")
+			err = resourcesMap["databricks_user"].Import(ic, &resource{
+				Resource: "databricks_user",
+				Data:     d,
+			})
+			assert.NoError(t, err)
+		})
+}
+
+func TestEitherString(t *testing.T) {
+	assert.Equal(t, "a", eitherString("a", nil))
+	assert.Equal(t, "a", eitherString(nil, "a"))
+	assert.Equal(t, "", eitherString(nil, nil))
+}

exporter/importables.go

@@ -309,19 +309,19 @@ var resourcesMap map[string]importable = map[string]importable{
 			for k, policy := range definition {
 				value, vok := policy["value"]
 				defaultValue, dok := policy["defaultValue"]
-				if !vok || !dok {
+				if !vok && !dok {
 					continue
 				}
 				if k == "aws_attributes.instance_profile_arn" {
 					ic.Emit(&resource{
 						Resource: "databricks_instance_profile",
-						ID:       fmt.Sprintf("%s%s", value, defaultValue),
+						ID:       eitherString(value, defaultValue),
 					})
 				}
 				if k == "instance_pool_id" {
 					ic.Emit(&resource{
 						Resource: "databricks_instance_pool",
-						ID:       fmt.Sprintf("%s%s", value, defaultValue),
+						ID:       eitherString(value, defaultValue),
 					})
 				}
 			}

exporter/test-data/get-cluster-policy.json

@@ -1,6 +1,6 @@
 {
   "created_at_timestamp": 1606308550000,
-  "definition": "{\"autoscale.max_workers\":{\"defaultValue\":2,\"maxValue\":5,\"type\":\"range\"},\"autoscale.min_workers\":{\"hidden\":true,\"type\":\"fixed\",\"value\":1},\"autotermination_minutes\":{\"defaultValue\":20,\"maxValue\":30,\"type\":\"range\"},\"cluster_log_conf.path\":{\"hidden\":true,\"type\":\"fixed\",\"value\":\"dbfs:/cluster-logs\"},\"cluster_log_conf.type\":{\"hidden\":true,\"type\":\"fixed\",\"value\":\"DBFS\"},\"custom_tags.team\":{\"type\":\"fixed\",\"value\":\"users\"},\"dbus_per_hour\":{\"maxValue\":10,\"type\":\"range\"},\"driver_node_type_id\":{\"defaultValue\":\"Standard_F4s\",\"type\":\"whitelist\",\"values\":[\"Standard_F4s\",\"Standard_F8s\"]},\"node_type_id\":{\"defaultValue\":\"Standard_F4s\",\"type\":\"whitelist\",\"values\":[\"Standard_F4s\",\"Standard_F8s\"]},\"spark_version\":{\"defaultValue\":\"7.3.x-scala2.12\",\"type\":\"whitelist\",\"values\":[\"7.2.x-scala2.12\",\"7.3.x-scala2.12\"]}}",
+  "definition": "{\"aws_attributes.instance_profile_arn\":{\"hidden\":true,\"type\":\"fixed\",\"value\":\"arn:aws:iam::12345:instance-profile/shard-s3-access\"},\"instance_pool_id\":{\"hidden\":true,\"type\":\"fixed\",\"value\":\"pool1\"},\"autoscale.max_workers\":{\"defaultValue\":2,\"maxValue\":5,\"type\":\"range\"}}",
   "name": "users cluster policy",
   "policy_id": "123"
 }

exporter/util.go

@@ -245,3 +245,13 @@ func (ic *importContext) getMountsThroughCluster(
 	err = json.Unmarshal([]byte(lines[0]), &mm)
 	return
 }
+
+func eitherString(a interface{}, b interface{}) string {
+	if a != nil {
+		return a.(string)
+	}
+	if b != nil {
+		return b.(string)
+	}
+	return ""
+}

identity/resource_service_principal_test.go

@@ -193,6 +193,17 @@ func TestResourceServicePrincipalCreate_Error(t *testing.T) {
 	require.Error(t, err, err)
 }
 
+func TestResourceServicePrincipalCreate_Error_AzureNoApplicationID(t *testing.T) {
+	qa.ResourceFixture{
+		Resource: ResourceServicePrincipal(),
+		Create:   true,
+		Azure:    true,
+		HCL: `
+		display_name = "abc"
+		`,
+	}.ExpectError(t, "application_id is required for service principals in Azure Databricks")
+}
+
 func TestResourceServicePrincipalUpdate(t *testing.T) {
 	newServicePrincipal := ScimUser{
 		Schemas:     []URN{ServicePrincipalSchema},