Skip to content

Commit 5d255ad

Browse files
authored
Exporter: ignore instance pools with the empty name (#3522)
Instance pools must have a name, but sometimes the resource don't have it because an instance pool was used in the `databricks_job` but was deleted, keeping the reference in the job definition. Fixes #3521
1 parent 7385f59 commit 5d255ad

File tree

2 files changed

+17
-2
lines changed

2 files changed

+17
-2
lines changed

exporter/importables.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -234,6 +234,11 @@ var resourcesMap map[string]importable = map[string]importable{
234234
"inst_pool_"+ic.Importables["databricks_instance_pool"].Name(ic, r.Data))
235235
return nil
236236
},
237+
Ignore: func(ic *importContext, r *resource) bool {
238+
isIgnored := r.Data.Get("instance_pool_name") == ""
239+
ic.addIgnoredResource(fmt.Sprintf("databricks_instance_pool. id=%s", r.ID))
240+
return isIgnored
241+
},
237242
},
238243
"databricks_instance_profile": {
239244
Service: "access",

exporter/importables_test.go

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,12 +93,22 @@ func TestInstancePool(t *testing.T) {
9393
assert.Equal(t, "def", name)
9494

9595
ic.meAdmin = true
96-
err := resourcesMap["databricks_instance_pool"].Import(ic, &resource{
96+
r := &resource{
9797
ID: "abc",
9898
Data: d,
99-
})
99+
}
100+
err := resourcesMap["databricks_instance_pool"].Import(ic, r)
100101
assert.NoError(t, err)
101102
assert.True(t, ic.testEmits["databricks_permissions[inst_pool_def] (id: /instance-pools/abc)"])
103+
104+
// Check ignore function
105+
assert.True(t, resourcesMap["databricks_instance_pool"].Ignore(ic, r))
106+
assert.Equal(t, 1, len(ic.ignoredResources))
107+
assert.Contains(t, ic.ignoredResources, "databricks_instance_pool. id=abc")
108+
//
109+
d.Set("instance_pool_name", "test")
110+
assert.False(t, resourcesMap["databricks_instance_pool"].Ignore(ic, r))
111+
assert.Equal(t, 1, len(ic.ignoredResources))
102112
}
103113

104114
func TestClusterPolicy(t *testing.T) {

0 commit comments

Comments
 (0)