Skip to content

Commit b60be7b

Browse files
authored
Exporter: added support for exporting databricks_access_control_rule_set on account level (#2699)
1 parent 034f1a3 commit b60be7b

File tree

4 files changed

+211
-68
lines changed

4 files changed

+211
-68
lines changed

docs/guides/experimental-exporter.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@ Exporter aims to generate HCL code for most of the resources within the Databric
9898

9999
| Resource | Generated code | Incremental |
100100
| --- | --- | --- |
101+
| [databricks_access_control_rule_set](../resources/access_control_rule_set.md) | Yes | No |
101102
| [databricks_cluster](../resources/cluster.md) | Yes | No |
102103
| [databricks_cluster_policy](../resources/cluster_policy.md) | Yes | No |
103104
| [databricks_dbfs_file](../resources/dbfs_file.md) | Yes | No |

exporter/context.go

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -287,15 +287,15 @@ func (ic *importContext) Run() error {
287287
} else if !info.IsDir() {
288288
return fmt.Errorf("the path %s is not a directory", ic.Directory)
289289
}
290-
w, err := ic.Client.WorkspaceClient()
291-
if err != nil {
292-
return err
293-
}
294290

295291
ic.accountLevel = ic.Client.Config.IsAccountClient()
296292
if ic.accountLevel {
297293
ic.meAdmin = true
298294
} else {
295+
w, err := ic.Client.WorkspaceClient()
296+
if err != nil {
297+
return err
298+
}
299299
me, err := w.CurrentUser.Me(ic.Context)
300300
if err != nil {
301301
return err
@@ -326,7 +326,11 @@ func (ic *importContext) Run() error {
326326
continue
327327
}
328328
if ic.accountLevel && !ir.AccountLevel {
329-
log.Printf("[DEBUG] %s (%s service) is not account level", resourceName, ir.Service)
329+
log.Printf("[DEBUG] %s (%s service) is not a account level resource", resourceName, ir.Service)
330+
continue
331+
}
332+
if !ic.accountLevel && !ir.WorkspaceLevel {
333+
log.Printf("[DEBUG] %s (%s service) is not a workspace level resource", resourceName, ir.Service)
330334
continue
331335
}
332336
ic.waitGroup.Add(1)

0 commit comments

Comments
 (0)