From 8e58e04e8ff3609d140f29bf0700709cc60eab36 Mon Sep 17 00:00:00 2001 From: Pieter Noordhuis Date: Wed, 7 Feb 2024 17:33:18 +0100 Subject: [PATCH] Move folders package into libs (#1184) ## Changes This is the last top-level package that doesn't need to be top-level. --- bundle/bundle.go | 2 +- bundle/root.go | 2 +- cmd/labs/project/installed.go | 2 +- {folders => libs/folders}/folders.go | 0 {folders => libs/folders}/folders_test.go | 2 +- libs/git/repository.go | 2 +- 6 files changed, 5 insertions(+), 5 deletions(-) rename {folders => libs/folders}/folders.go (100%) rename {folders => libs/folders}/folders_test.go (94%) diff --git a/bundle/bundle.go b/bundle/bundle.go index 9e21cb56..a178ea09 100644 --- a/bundle/bundle.go +++ b/bundle/bundle.go @@ -16,7 +16,7 @@ import ( "github.com/databricks/cli/bundle/config" "github.com/databricks/cli/bundle/env" "github.com/databricks/cli/bundle/metadata" - "github.com/databricks/cli/folders" + "github.com/databricks/cli/libs/folders" "github.com/databricks/cli/libs/git" "github.com/databricks/cli/libs/locker" "github.com/databricks/cli/libs/log" diff --git a/bundle/root.go b/bundle/root.go index 7518bf5f..efc21e0c 100644 --- a/bundle/root.go +++ b/bundle/root.go @@ -7,7 +7,7 @@ import ( "github.com/databricks/cli/bundle/config" "github.com/databricks/cli/bundle/env" - "github.com/databricks/cli/folders" + "github.com/databricks/cli/libs/folders" ) // getRootEnv returns the value of the bundle root environment variable diff --git a/cmd/labs/project/installed.go b/cmd/labs/project/installed.go index 9a98a780..fb349531 100644 --- a/cmd/labs/project/installed.go +++ b/cmd/labs/project/installed.go @@ -8,8 +8,8 @@ import ( "os" "path/filepath" - "github.com/databricks/cli/folders" "github.com/databricks/cli/libs/env" + "github.com/databricks/cli/libs/folders" "github.com/databricks/cli/libs/log" ) diff --git a/folders/folders.go b/libs/folders/folders.go similarity index 100% rename from folders/folders.go rename to libs/folders/folders.go diff --git a/folders/folders_test.go b/libs/folders/folders_test.go similarity index 94% rename from folders/folders_test.go rename to libs/folders/folders_test.go index 9aa38707..17afc402 100644 --- a/folders/folders_test.go +++ b/libs/folders/folders_test.go @@ -13,7 +13,7 @@ func TestFindDirWithLeaf(t *testing.T) { wd, err := os.Getwd() require.NoError(t, err) - root := filepath.Join(wd, "..") + root := filepath.Join(wd, "..", "..") // Find from working directory should work. { diff --git a/libs/git/repository.go b/libs/git/repository.go index d1641118..531fd74e 100644 --- a/libs/git/repository.go +++ b/libs/git/repository.go @@ -7,7 +7,7 @@ import ( "path/filepath" "strings" - "github.com/databricks/cli/folders" + "github.com/databricks/cli/libs/folders" ) const gitIgnoreFileName = ".gitignore"