steve/databricks-cli
steve
/
databricks-cli
mirror of https://github.com/databricks/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix test

This commit is contained in:
Shreyas Goenka 2025-01-06 15:40:11 +05:30
parent af89580f8e
commit 9f83fe0362
No known key found for this signature in database
GPG Key ID: 92A07DF49CCB0622
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
libs/filer/workspace_files_extensions_client.go
View File

@ -16,7 +16,7 @@ import (
"github.com/databricks/databricks-sdk-go/service/workspace" "github.com/databricks/databricks-sdk-go/service/workspace"
) )
type workspaceFilesExtensionsClient struct { type WorkspaceFilesExtensionsClient struct {
workspaceClient *databricks.WorkspaceClient workspaceClient *databricks.WorkspaceClient
wsfs Filer wsfs Filer
@ -32,7 +32,7 @@ type workspaceFileStatus struct {
nameForWorkspaceAPI string nameForWorkspaceAPI string
} }
func (w *workspaceFilesExtensionsClient) stat(ctx context.Context, name string) (wsfsFileInfo, error) { func (w *WorkspaceFilesExtensionsClient) stat(ctx context.Context, name string) (wsfsFileInfo, error) {
info, err := w.wsfs.Stat(ctx, name) info, err := w.wsfs.Stat(ctx, name)
if err != nil { if err != nil {
return wsfsFileInfo{}, err return wsfsFileInfo{}, err
@ -42,7 +42,7 @@ func (w *workspaceFilesExtensionsClient) stat(ctx context.Context, name string)
// This function returns the stat for the provided notebook. The stat object itself contains the path // This function returns the stat for the provided notebook. The stat object itself contains the path
// with the extension since it is meant to be used in the context of a fs.FileInfo. // with the extension since it is meant to be used in the context of a fs.FileInfo.
func (w *workspaceFilesExtensionsClient) getNotebookStatByNameWithExt(ctx context.Context, name string) (*workspaceFileStatus, error) { func (w *WorkspaceFilesExtensionsClient) getNotebookStatByNameWithExt(ctx context.Context, name string) (*workspaceFileStatus, error) {
ext := path.Ext(name) ext := path.Ext(name)
nameWithoutExt := strings.TrimSuffix(name, ext) nameWithoutExt := strings.TrimSuffix(name, ext)
@ -104,7 +104,7 @@ func (w *workspaceFilesExtensionsClient) getNotebookStatByNameWithExt(ctx contex
}, nil }, nil
} }
func (w *workspaceFilesExtensionsClient) getNotebookStatByNameWithoutExt(ctx context.Context, name string) (*workspaceFileStatus, error) { func (w *WorkspaceFilesExtensionsClient) getNotebookStatByNameWithoutExt(ctx context.Context, name string) (*workspaceFileStatus, error) {
stat, err := w.stat(ctx, name) stat, err := w.stat(ctx, name)
if err != nil { if err != nil {
return nil, err return nil, err
@ -184,7 +184,7 @@ func newWorkspaceFilesExtensionsClient(w *databricks.WorkspaceClient, root strin
filer = newWorkspaceFilesReadaheadCache(filer) filer = newWorkspaceFilesReadaheadCache(filer)
} }
return &workspaceFilesExtensionsClient{ return &WorkspaceFilesExtensionsClient{
workspaceClient: w, workspaceClient: w,
wsfs: filer, wsfs: filer,
@ -193,7 +193,7 @@ func newWorkspaceFilesExtensionsClient(w *databricks.WorkspaceClient, root strin
}, nil }, nil
} }
func (w *workspaceFilesExtensionsClient) ReadDir(ctx context.Context, name string) ([]fs.DirEntry, error) { func (w *WorkspaceFilesExtensionsClient) ReadDir(ctx context.Context, name string) ([]fs.DirEntry, error) {
entries, err := w.wsfs.ReadDir(ctx, name) entries, err := w.wsfs.ReadDir(ctx, name)
if err != nil { if err != nil {
return nil, err return nil, err
@ -235,7 +235,7 @@ func (w *workspaceFilesExtensionsClient) ReadDir(ctx context.Context, name strin
// Note: The import API returns opaque internal errors for namespace clashes // Note: The import API returns opaque internal errors for namespace clashes
// (e.g. a file and a notebook or a directory and a notebook). Thus users of this // (e.g. a file and a notebook or a directory and a notebook). Thus users of this
// method should be careful to avoid such clashes. // method should be careful to avoid such clashes.
func (w *workspaceFilesExtensionsClient) Write(ctx context.Context, name string, reader io.Reader, mode ...WriteMode) error { func (w *WorkspaceFilesExtensionsClient) Write(ctx context.Context, name string, reader io.Reader, mode ...WriteMode) error {
if w.readonly { if w.readonly {
return ReadOnlyError{"write"} return ReadOnlyError{"write"}
} }
@ -244,7 +244,7 @@ func (w *workspaceFilesExtensionsClient) Write(ctx context.Context, name string,
} }
// Try to read the file as a regular file. If the file is not found, try to read it as a notebook. // Try to read the file as a regular file. If the file is not found, try to read it as a notebook.
func (w *workspaceFilesExtensionsClient) Read(ctx context.Context, name string) (io.ReadCloser, error) { func (w *WorkspaceFilesExtensionsClient) Read(ctx context.Context, name string) (io.ReadCloser, error) {
// Ensure that the file / notebook exists. We do this check here to avoid reading // Ensure that the file / notebook exists. We do this check here to avoid reading
// the content of a notebook called `foo` when the user actually wanted // the content of a notebook called `foo` when the user actually wanted
// to read the content of a file called `foo`. // to read the content of a file called `foo`.
@ -283,7 +283,7 @@ func (w *workspaceFilesExtensionsClient) Read(ctx context.Context, name string)
} }
// Try to delete the file as a regular file. If the file is not found, try to delete it as a notebook. // Try to delete the file as a regular file. If the file is not found, try to delete it as a notebook.
func (w *workspaceFilesExtensionsClient) Delete(ctx context.Context, name string, mode ...DeleteMode) error { func (w *WorkspaceFilesExtensionsClient) Delete(ctx context.Context, name string, mode ...DeleteMode) error {
if w.readonly { if w.readonly {
return ReadOnlyError{"delete"} return ReadOnlyError{"delete"}
} }
@ -320,7 +320,7 @@ func (w *workspaceFilesExtensionsClient) Delete(ctx context.Context, name string
} }
// Try to stat the file as a regular file. If the file is not found, try to stat it as a notebook. // Try to stat the file as a regular file. If the file is not found, try to stat it as a notebook.
func (w *workspaceFilesExtensionsClient) Stat(ctx context.Context, name string) (fs.FileInfo, error) { func (w *WorkspaceFilesExtensionsClient) Stat(ctx context.Context, name string) (fs.FileInfo, error) {
info, err := w.wsfs.Stat(ctx, name) info, err := w.wsfs.Stat(ctx, name)
// If the file is not found, it might be a notebook. // If the file is not found, it might be a notebook.
@ -361,7 +361,7 @@ func (w *workspaceFilesExtensionsClient) Stat(ctx context.Context, name string)
// Note: The import API returns opaque internal errors for namespace clashes // Note: The import API returns opaque internal errors for namespace clashes
// (e.g. a file and a notebook or a directory and a notebook). Thus users of this // (e.g. a file and a notebook or a directory and a notebook). Thus users of this
// method should be careful to avoid such clashes. // method should be careful to avoid such clashes.
func (w *workspaceFilesExtensionsClient) Mkdir(ctx context.Context, name string) error { func (w *WorkspaceFilesExtensionsClient) Mkdir(ctx context.Context, name string) error {
if w.readonly { if w.readonly {
return ReadOnlyError{"mkdir"} return ReadOnlyError{"mkdir"}
} }

2
libs/filer/workspace_files_extensions_client_test.go
View File

@ -181,7 +181,7 @@ func TestFilerWorkspaceFilesExtensionsErrorsOnDupName(t *testing.T) {
root: NewWorkspaceRootPath("/dir"), root: NewWorkspaceRootPath("/dir"),
} }
workspaceFilesExtensionsClient := workspaceFilesExtensionsClient{ workspaceFilesExtensionsClient := WorkspaceFilesExtensionsClient{
workspaceClient: mockedWorkspaceClient.WorkspaceClient, workspaceClient: mockedWorkspaceClient.WorkspaceClient,
wsfs: &workspaceFilesClient, wsfs: &workspaceFilesClient,
} }

2
libs/template/writer_test.go
View File

@ -32,7 +32,7 @@ func TestDefaultWriterConfigure(t *testing.T) {
assert.NoError(t, err) assert.NoError(t, err)
assert.Equal(t, "/foo/bar", w2.configPath) assert.Equal(t, "/foo/bar", w2.configPath)
assert.IsType(t, &filer.WorkspaceFilesClient{}, w2.outputFiler) assert.IsType(t, &filer.WorkspaceFilesExtensionsClient{}, w2.outputFiler)
} }
func TestMaterializeForNonTemplateDirectory(t *testing.T) { func TestMaterializeForNonTemplateDirectory(t *testing.T) {