Skip to content

Check Close error when generate downloader writes files #5523

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
simonfaltum wants to merge 2 commits into
base: main
Choose a base branch
from
+50 −1
Open

Check Close error when generate downloader writes files #5523

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
978544a
Check Close error when generate downloader writes files
simonfaltum Jun 9, 2026
d34c4ee
Remove redundant comments
simonfaltum Jun 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion bundle/generate/downloader.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,9 +321,13 @@ func (n *Downloader) FlushToDisk(ctx context.Context, force bool) error {
if err != nil {
return err
}
defer file.Close()

_, err = io.Copy(file, reader)
// Close flushes buffered writes; if it fails the file may be truncated.
cerr := file.Close()
if err == nil {
err = cerr
}
if err != nil {
return err
}
Expand Down
45 changes: 45 additions & 0 deletions bundle/generate/downloader_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (
"path/filepath"
"testing"

"github.com/databricks/cli/libs/cmdio"
"github.com/databricks/databricks-sdk-go"
"github.com/databricks/databricks-sdk-go/experimental/mocks"
"github.com/databricks/databricks-sdk-go/service/jobs"
Expand Down Expand Up @@ -261,6 +262,50 @@ func TestDownloader_MarkTasksForDownload_NoNotebooks(t *testing.T) {
assert.Empty(t, downloader.files)
}

func TestDownloader_FlushToDisk(t *testing.T) {

@janniklasrose janniklasrose Jun 10, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The test doesn't exercise the failure path

ctx := cmdio.MockDiscard(t.Context())

contents := map[string]string{
"/Users/user/project/notebook": "# Databricks notebook source\nprint(1)",
"/Users/user/project/utils.py": "def helper(): pass",
}
w := newTestWorkspaceClient(t, func(rw http.ResponseWriter, r *http.Request) {
if r.URL.Path != "/api/2.0/workspace/export" {
t.Fatalf("unexpected request path: %s", r.URL.Path)
}
content, ok := contents[r.URL.Query().Get("path")]
if !ok {
t.Fatalf("unexpected export path: %s", r.URL.Query().Get("path"))
}
_, err := rw.Write([]byte(content))
if err != nil {
t.Fatal(err)
}
})

sourceDir := t.TempDir()
downloader := NewDownloader(w, sourceDir, "config")
downloader.files[filepath.Join(sourceDir, "notebook.py")] = exportFile{
path: "/Users/user/project/notebook",
format: workspace.ExportFormatSource,
}
downloader.files[filepath.Join(sourceDir, "utils.py")] = exportFile{
path: "/Users/user/project/utils.py",
format: workspace.ExportFormatSource,
}

err := downloader.FlushToDisk(ctx, false)
require.NoError(t, err)

data, err := os.ReadFile(filepath.Join(sourceDir, "notebook.py"))
require.NoError(t, err)
assert.Equal(t, contents["/Users/user/project/notebook"], string(data))

data, err = os.ReadFile(filepath.Join(sourceDir, "utils.py"))
require.NoError(t, err)
assert.Equal(t, contents["/Users/user/project/utils.py"], string(data))
}

func TestDownloader_CleanupOldFiles(t *testing.T) {
ctx := t.Context()
sourceDir := t.TempDir()
Expand Down
Loading