mirror of https://github.com/databricks/cli.git
Use already instantiated WorkspaceClient in sync command (#867)
## Changes Since we use `root.MustWorkspaceClient` now, we should use already initialised version of WorkspaceClient instead of instantiating a new one. Fixes #836
This commit is contained in:
parent
c0903b8b7b
commit
ff01898b61
|
@ -13,7 +13,6 @@ import (
|
||||||
"github.com/databricks/cli/cmd/root"
|
"github.com/databricks/cli/cmd/root"
|
||||||
"github.com/databricks/cli/libs/flags"
|
"github.com/databricks/cli/libs/flags"
|
||||||
"github.com/databricks/cli/libs/sync"
|
"github.com/databricks/cli/libs/sync"
|
||||||
"github.com/databricks/databricks-sdk-go"
|
|
||||||
"github.com/spf13/cobra"
|
"github.com/spf13/cobra"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -70,7 +69,7 @@ func (f *syncFlags) syncOptionsFromArgs(cmd *cobra.Command, args []string) (*syn
|
||||||
// The sync code will automatically create this directory if it doesn't
|
// The sync code will automatically create this directory if it doesn't
|
||||||
// exist and add it to the `.gitignore` file in the root.
|
// exist and add it to the `.gitignore` file in the root.
|
||||||
SnapshotBasePath: filepath.Join(args[0], ".databricks"),
|
SnapshotBasePath: filepath.Join(args[0], ".databricks"),
|
||||||
WorkspaceClient: databricks.Must(databricks.NewWorkspaceClient()),
|
WorkspaceClient: root.WorkspaceClient(cmd.Context()),
|
||||||
}
|
}
|
||||||
return &opts, nil
|
return &opts, nil
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,12 +1,14 @@
|
||||||
package sync
|
package sync
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"context"
|
||||||
"flag"
|
"flag"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
"github.com/databricks/cli/bundle"
|
"github.com/databricks/cli/bundle"
|
||||||
"github.com/databricks/cli/bundle/config"
|
"github.com/databricks/cli/bundle/config"
|
||||||
|
"github.com/databricks/cli/cmd/root"
|
||||||
"github.com/stretchr/testify/assert"
|
"github.com/stretchr/testify/assert"
|
||||||
"github.com/stretchr/testify/require"
|
"github.com/stretchr/testify/require"
|
||||||
)
|
)
|
||||||
|
@ -49,7 +51,9 @@ func TestSyncOptionsFromArgsRequiredTwoArgs(t *testing.T) {
|
||||||
|
|
||||||
func TestSyncOptionsFromArgs(t *testing.T) {
|
func TestSyncOptionsFromArgs(t *testing.T) {
|
||||||
f := syncFlags{}
|
f := syncFlags{}
|
||||||
opts, err := f.syncOptionsFromArgs(New(), []string{"/local", "/remote"})
|
cmd := New()
|
||||||
|
cmd.SetContext(root.SetWorkspaceClient(context.Background(), nil))
|
||||||
|
opts, err := f.syncOptionsFromArgs(cmd, []string{"/local", "/remote"})
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
assert.Equal(t, "/local", opts.LocalPath)
|
assert.Equal(t, "/local", opts.LocalPath)
|
||||||
assert.Equal(t, "/remote", opts.RemotePath)
|
assert.Equal(t, "/remote", opts.RemotePath)
|
||||||
|
|
Loading…
Reference in New Issue