Skip to content

Commit 9c9bf2b

Browse files
authored
Exporter: Emit directories during the listing only if they are explicitly configured in -listing (databricks#3673)
Exporter emitted directories even if they were specified only in `-services`, leading to exporting of not necessary objects...
1 parent a55dc7f commit 9c9bf2b

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

Diff for: exporter/util.go

+5-3
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ func (ic *importContext) emitInitScripts(initScripts []compute.InitScriptInfo) {
6262
ic.emitWorkspaceFileOrRepo(is.Workspace.Destination)
6363
}
6464
if is.Volumes != nil {
65+
// TODO: we should emit allow list for init scripts as well
6566
ic.emitIfVolumeFile(is.Volumes.Destination)
6667
}
6768
}
@@ -413,6 +414,7 @@ func (ic *importContext) emitLibraries(libs []compute.Library) {
413414
ic.emitIfWsfsFile(lib.Requirements)
414415
// Files on UC Volumes
415416
ic.emitIfVolumeFile(lib.Whl)
417+
// TODO: we should emit UC allow list as well
416418
ic.emitIfVolumeFile(lib.Jar)
417419
ic.emitIfVolumeFile(lib.Requirements)
418420
}
@@ -1160,7 +1162,7 @@ func listNotebooksAndWorkspaceFiles(ic *importContext) error {
11601162
allObjects := ic.getAllWorkspaceObjects(func(objects []workspace.ObjectStatus) {
11611163
for _, object := range objects {
11621164
if object.ObjectType == workspace.Directory {
1163-
if !ic.incremental && object.Path != "/" && ic.isServiceEnabled("directories") {
1165+
if !ic.incremental && object.Path != "/" && ic.isServiceInListing("directories") {
11641166
objectsChannel <- object
11651167
}
11661168
} else {
@@ -1185,9 +1187,9 @@ func listNotebooksAndWorkspaceFiles(ic *importContext) error {
11851187
if ic.shouldSkipWorkspaceObject(object, updatedSinceMs) {
11861188
continue
11871189
}
1188-
if object.ObjectType == workspace.Directory && !ic.incremental && ic.isServiceEnabled("directories") && object.Path != "/" {
1190+
if object.ObjectType == workspace.Directory && !ic.incremental && ic.isServiceInListing("directories") && object.Path != "/" {
11891191
emitWorkpaceObject(ic, object)
1190-
} else if (object.ObjectType == workspace.Notebook || object.ObjectType == workspace.File) && ic.isServiceEnabled("notebooks") {
1192+
} else if (object.ObjectType == workspace.Notebook || object.ObjectType == workspace.File) && ic.isServiceInListing("notebooks") {
11911193
emitWorkpaceObject(ic, object)
11921194
}
11931195
}

0 commit comments

Comments
 (0)