Skip to content

Commit d10b859

Browse files
Fixed member_id reference of nested groups and databricks_group_member for exporter (#1723)
1 parent 510f600 commit d10b859

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

exporter/context.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -498,11 +498,10 @@ func (ic *importContext) reference(i importable, path []string, value string) hc
498498
Attribute: attr,
499499
Value: value,
500500
}, attr)
501-
502-
if traversal == nil {
503-
break
501+
//at least one invocation of ic.Find will assign Nil to traversal if resource with value is not found
502+
if traversal != nil {
503+
return hclwrite.TokensForTraversal(traversal)
504504
}
505-
return hclwrite.TokensForTraversal(traversal)
506505
}
507506
return hclwrite.TokensForValue(cty.StringVal(value))
508507
}

exporter/importables.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -627,7 +627,7 @@ var resourcesMap map[string]importable = map[string]importable{
627627
ic.Emit(&resource{
628628
Resource: "databricks_group_member",
629629
ID: fmt.Sprintf("%s|%s", g.ID, x.Value),
630-
Name: fmt.Sprintf("%s_%s_%s", g.DisplayName, x.Value, x.Display),
630+
Name: fmt.Sprintf("%s_%s_%s", g.DisplayName, g.ID, x.Display),
631631
})
632632
}
633633
if len(g.Members) > 10 {

0 commit comments

Comments
 (0)