From 0f1cb67c985ba024e981d5ec35d94cbafd6b99e4 Mon Sep 17 00:00:00 2001 From: Shreyas Goenka Date: Mon, 5 Jun 2023 18:07:41 +0200 Subject: [PATCH] remove underscore --- cmd/workspace/workspace/import_dir.go | 2 +- internal/import_dir_test.go | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cmd/workspace/workspace/import_dir.go b/cmd/workspace/workspace/import_dir.go index 3d4657229..33febe2bd 100644 --- a/cmd/workspace/workspace/import_dir.go +++ b/cmd/workspace/workspace/import_dir.go @@ -11,7 +11,7 @@ import ( // TODO: add some comments here var importDirCmd = &cobra.Command{ - Use: "import_dir SOURCE_PATH TARGET_PATH", + Use: "import-dir SOURCE_PATH TARGET_PATH", Short: `Recursively imports a directory from local to the Databricks workspace.`, Long: ` Imports directory to the workspace. diff --git a/internal/import_dir_test.go b/internal/import_dir_test.go index 6120607ff..2c2966b79 100644 --- a/internal/import_dir_test.go +++ b/internal/import_dir_test.go @@ -22,8 +22,8 @@ func TestWorkspaceImportDir(t *testing.T) { w := databricks.Must(databricks.NewWorkspaceClient()) tmpdir := temporaryWorkspaceDir(t, w) - // run import_dir command - RequireSuccessfulRun(t, "workspace", "import_dir", "./testdata/import_dir/default", tmpdir) + // run import-dir command + RequireSuccessfulRun(t, "workspace", "import-dir", "./testdata/import_dir/default", tmpdir) // assert files are uploaded f, err := filer.NewWorkspaceFilesClient(w, tmpdir) @@ -41,8 +41,8 @@ func TestWorkspaceImportDirOverwriteFlag(t *testing.T) { w := databricks.Must(databricks.NewWorkspaceClient()) tmpdir := temporaryWorkspaceDir(t, w) - // run import_dir command - RequireSuccessfulRun(t, "workspace", "import_dir", "./testdata/import_dir/override/a", tmpdir) + // run import-dir command + RequireSuccessfulRun(t, "workspace", "import-dir", "./testdata/import_dir/override/a", tmpdir) // // assert files are uploaded // f, err := filer.NewWorkspaceFilesClient(w, tmpdir) @@ -50,11 +50,11 @@ func TestWorkspaceImportDirOverwriteFlag(t *testing.T) { // assertFileContains(t, ctx, f, "bar.txt", "from directory A") // Assert another run fails with path already exists error from the server - _, _, err := RequireErrorRun(t, "workspace", "import_dir", "./testdata/import_dir/override/b", tmpdir) + _, _, err := RequireErrorRun(t, "workspace", "import-dir", "./testdata/import_dir/override/b", tmpdir) assert.Regexp(t, regexp.MustCompile("Path (.*) already exists."), err.Error()) // // Succeeds with the overwrite flag - // RequireSuccessfulRun(t, "workspace", "import_dir", "./testdata/import_dir/override/b", tmpdir, "--overwrite") + // RequireSuccessfulRun(t, "workspace", "import-dir", "./testdata/import_dir/override/b", tmpdir, "--overwrite") // require.NoError(t, err) // assertFileContains(t, ctx, f, "bar.txt", "from directory B") }