From d7eac598cda4bd12aa75d7ff23f076189c13be46 Mon Sep 17 00:00:00 2001 From: Pieter Noordhuis Date: Tue, 17 Dec 2024 08:45:58 +0100 Subject: [PATCH] Move integration test helpers to `integration/internal` (#2022) ## Changes The `acc` package is exclusively used by integration tests, so it belongs under `integration/internal`. It's not the best name we can rename later. ## Tests n/a --- integration/assumptions/dashboard_assumptions_test.go | 2 +- integration/bundle/artifacts_test.go | 2 +- integration/bundle/basic_test.go | 2 +- integration/bundle/bind_resource_test.go | 2 +- integration/bundle/clusters_test.go | 2 +- integration/bundle/dashboards_test.go | 2 +- integration/bundle/deploy_test.go | 2 +- integration/bundle/deploy_then_remove_resources_test.go | 2 +- integration/bundle/deploy_to_shared_test.go | 2 +- integration/bundle/deployment_state_test.go | 2 +- integration/bundle/destroy_test.go | 2 +- integration/bundle/empty_bundle_test.go | 2 +- integration/bundle/environments_test.go | 2 +- integration/bundle/generate_job_test.go | 2 +- integration/bundle/generate_pipeline_test.go | 2 +- integration/bundle/init_test.go | 2 +- integration/bundle/job_metadata_test.go | 2 +- integration/bundle/local_state_staleness_test.go | 2 +- integration/bundle/python_wheel_test.go | 2 +- integration/bundle/spark_jar_test.go | 2 +- integration/cmd/clusters/clusters_test.go | 2 +- integration/cmd/fs/cat_test.go | 2 +- integration/cmd/fs/helpers_test.go | 2 +- integration/cmd/repos/repos_test.go | 2 +- integration/cmd/secrets/secrets_test.go | 2 +- integration/cmd/storage_credentials/storage_credentials_test.go | 2 +- integration/cmd/sync/sync_test.go | 2 +- integration/cmd/workspace/workspace_test.go | 2 +- {internal => integration/internal}/acc/debug.go | 0 {internal => integration/internal}/acc/fixtures.go | 0 {internal => integration/internal}/acc/workspace.go | 0 integration/libs/filer/helpers_test.go | 2 +- integration/libs/git/git_fetch_test.go | 2 +- integration/libs/locker/locker_test.go | 2 +- integration/libs/tags/tags_test.go | 2 +- integration/python/python_tasks_test.go | 2 +- 36 files changed, 33 insertions(+), 33 deletions(-) rename {internal => integration/internal}/acc/debug.go (100%) rename {internal => integration/internal}/acc/fixtures.go (100%) rename {internal => integration/internal}/acc/workspace.go (100%) diff --git a/integration/assumptions/dashboard_assumptions_test.go b/integration/assumptions/dashboard_assumptions_test.go index 51a80949..3a1dcc90 100644 --- a/integration/assumptions/dashboard_assumptions_test.go +++ b/integration/assumptions/dashboard_assumptions_test.go @@ -4,7 +4,7 @@ import ( "encoding/base64" "testing" - "github.com/databricks/cli/internal/acc" + "github.com/databricks/cli/integration/internal/acc" "github.com/databricks/cli/internal/testutil" "github.com/databricks/cli/libs/dyn" "github.com/databricks/cli/libs/dyn/convert" diff --git a/integration/bundle/artifacts_test.go b/integration/bundle/artifacts_test.go index 3a5da721..1b71a1c3 100644 --- a/integration/bundle/artifacts_test.go +++ b/integration/bundle/artifacts_test.go @@ -12,7 +12,7 @@ import ( "github.com/databricks/cli/bundle/config" "github.com/databricks/cli/bundle/config/resources" "github.com/databricks/cli/bundle/libraries" - "github.com/databricks/cli/internal/acc" + "github.com/databricks/cli/integration/internal/acc" "github.com/databricks/cli/internal/testcli" "github.com/databricks/cli/internal/testutil" "github.com/databricks/cli/libs/env" diff --git a/integration/bundle/basic_test.go b/integration/bundle/basic_test.go index e458706e..79301b85 100644 --- a/integration/bundle/basic_test.go +++ b/integration/bundle/basic_test.go @@ -5,7 +5,7 @@ import ( "path/filepath" "testing" - "github.com/databricks/cli/internal/acc" + "github.com/databricks/cli/integration/internal/acc" "github.com/databricks/cli/internal/testutil" "github.com/google/uuid" "github.com/stretchr/testify/require" diff --git a/integration/bundle/bind_resource_test.go b/integration/bundle/bind_resource_test.go index b5123577..508aa341 100644 --- a/integration/bundle/bind_resource_test.go +++ b/integration/bundle/bind_resource_test.go @@ -6,7 +6,7 @@ import ( "path/filepath" "testing" - "github.com/databricks/cli/internal/acc" + "github.com/databricks/cli/integration/internal/acc" "github.com/databricks/cli/internal/testcli" "github.com/databricks/cli/internal/testutil" "github.com/databricks/cli/libs/env" diff --git a/integration/bundle/clusters_test.go b/integration/bundle/clusters_test.go index 7992ecd7..f9e5c9b6 100644 --- a/integration/bundle/clusters_test.go +++ b/integration/bundle/clusters_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/databricks/cli/internal/acc" + "github.com/databricks/cli/integration/internal/acc" "github.com/databricks/cli/internal/testutil" "github.com/databricks/databricks-sdk-go/service/compute" "github.com/google/uuid" diff --git a/integration/bundle/dashboards_test.go b/integration/bundle/dashboards_test.go index 985ef861..83b4b8b0 100644 --- a/integration/bundle/dashboards_test.go +++ b/integration/bundle/dashboards_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/databricks/cli/internal/acc" + "github.com/databricks/cli/integration/internal/acc" "github.com/databricks/cli/internal/testutil" "github.com/databricks/databricks-sdk-go/service/dashboards" "github.com/databricks/databricks-sdk-go/service/workspace" diff --git a/integration/bundle/deploy_test.go b/integration/bundle/deploy_test.go index 2c311019..0b37e563 100644 --- a/integration/bundle/deploy_test.go +++ b/integration/bundle/deploy_test.go @@ -11,7 +11,7 @@ import ( "testing" "github.com/databricks/cli/cmd/root" - "github.com/databricks/cli/internal/acc" + "github.com/databricks/cli/integration/internal/acc" "github.com/databricks/cli/internal/testcli" "github.com/databricks/cli/internal/testutil" "github.com/databricks/cli/libs/env" diff --git a/integration/bundle/deploy_then_remove_resources_test.go b/integration/bundle/deploy_then_remove_resources_test.go index b792d362..052d84dd 100644 --- a/integration/bundle/deploy_then_remove_resources_test.go +++ b/integration/bundle/deploy_then_remove_resources_test.go @@ -5,7 +5,7 @@ import ( "path/filepath" "testing" - "github.com/databricks/cli/internal/acc" + "github.com/databricks/cli/integration/internal/acc" "github.com/databricks/cli/internal/testutil" "github.com/google/uuid" "github.com/stretchr/testify/assert" diff --git a/integration/bundle/deploy_to_shared_test.go b/integration/bundle/deploy_to_shared_test.go index c9793321..b4395f4c 100644 --- a/integration/bundle/deploy_to_shared_test.go +++ b/integration/bundle/deploy_to_shared_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/databricks/cli/internal/acc" + "github.com/databricks/cli/integration/internal/acc" "github.com/databricks/cli/internal/testutil" "github.com/google/uuid" "github.com/stretchr/testify/require" diff --git a/integration/bundle/deployment_state_test.go b/integration/bundle/deployment_state_test.go index a7e01643..fff1504d 100644 --- a/integration/bundle/deployment_state_test.go +++ b/integration/bundle/deployment_state_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/databricks/cli/bundle/deploy" - "github.com/databricks/cli/internal/acc" + "github.com/databricks/cli/integration/internal/acc" "github.com/databricks/cli/internal/testutil" "github.com/databricks/cli/libs/env" "github.com/google/uuid" diff --git a/integration/bundle/destroy_test.go b/integration/bundle/destroy_test.go index 59d1816e..f18138ce 100644 --- a/integration/bundle/destroy_test.go +++ b/integration/bundle/destroy_test.go @@ -6,7 +6,7 @@ import ( "path/filepath" "testing" - "github.com/databricks/cli/internal/acc" + "github.com/databricks/cli/integration/internal/acc" "github.com/databricks/cli/internal/testutil" "github.com/databricks/databricks-sdk-go/apierr" "github.com/google/uuid" diff --git a/integration/bundle/empty_bundle_test.go b/integration/bundle/empty_bundle_test.go index 0cf9aad3..1ab240d1 100644 --- a/integration/bundle/empty_bundle_test.go +++ b/integration/bundle/empty_bundle_test.go @@ -6,7 +6,7 @@ import ( "path/filepath" "testing" - "github.com/databricks/cli/internal/acc" + "github.com/databricks/cli/integration/internal/acc" "github.com/google/uuid" "github.com/stretchr/testify/require" ) diff --git a/integration/bundle/environments_test.go b/integration/bundle/environments_test.go index 4f831cf6..e0dc9153 100644 --- a/integration/bundle/environments_test.go +++ b/integration/bundle/environments_test.go @@ -3,7 +3,7 @@ package bundle_test import ( "testing" - "github.com/databricks/cli/internal/acc" + "github.com/databricks/cli/integration/internal/acc" "github.com/google/uuid" "github.com/stretchr/testify/require" ) diff --git a/integration/bundle/generate_job_test.go b/integration/bundle/generate_job_test.go index 9d0b466b..b68bb7d6 100644 --- a/integration/bundle/generate_job_test.go +++ b/integration/bundle/generate_job_test.go @@ -9,7 +9,7 @@ import ( "strings" "testing" - "github.com/databricks/cli/internal/acc" + "github.com/databricks/cli/integration/internal/acc" "github.com/databricks/cli/internal/testcli" "github.com/databricks/cli/internal/testutil" "github.com/databricks/cli/libs/env" diff --git a/integration/bundle/generate_pipeline_test.go b/integration/bundle/generate_pipeline_test.go index 303d5cb2..7843ec0c 100644 --- a/integration/bundle/generate_pipeline_test.go +++ b/integration/bundle/generate_pipeline_test.go @@ -9,7 +9,7 @@ import ( "strings" "testing" - "github.com/databricks/cli/internal/acc" + "github.com/databricks/cli/integration/internal/acc" "github.com/databricks/cli/internal/testcli" "github.com/databricks/cli/internal/testutil" "github.com/databricks/cli/libs/env" diff --git a/integration/bundle/init_test.go b/integration/bundle/init_test.go index bc3757fd..f5c263ca 100644 --- a/integration/bundle/init_test.go +++ b/integration/bundle/init_test.go @@ -11,7 +11,7 @@ import ( "testing" "github.com/databricks/cli/bundle/config" - "github.com/databricks/cli/internal/acc" + "github.com/databricks/cli/integration/internal/acc" "github.com/databricks/cli/internal/testcli" "github.com/databricks/cli/internal/testutil" "github.com/databricks/cli/libs/iamutil" diff --git a/integration/bundle/job_metadata_test.go b/integration/bundle/job_metadata_test.go index f470b37d..a7290c6e 100644 --- a/integration/bundle/job_metadata_test.go +++ b/integration/bundle/job_metadata_test.go @@ -10,7 +10,7 @@ import ( "github.com/databricks/cli/bundle/config" "github.com/databricks/cli/bundle/metadata" - "github.com/databricks/cli/internal/acc" + "github.com/databricks/cli/integration/internal/acc" "github.com/databricks/cli/internal/testutil" "github.com/databricks/cli/libs/filer" "github.com/google/uuid" diff --git a/integration/bundle/local_state_staleness_test.go b/integration/bundle/local_state_staleness_test.go index c02a38bb..39848150 100644 --- a/integration/bundle/local_state_staleness_test.go +++ b/integration/bundle/local_state_staleness_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "github.com/databricks/cli/internal/acc" + "github.com/databricks/cli/integration/internal/acc" "github.com/databricks/cli/internal/testutil" "github.com/databricks/databricks-sdk-go/listing" "github.com/databricks/databricks-sdk-go/service/jobs" diff --git a/integration/bundle/python_wheel_test.go b/integration/bundle/python_wheel_test.go index a90642ec..5cca1cb5 100644 --- a/integration/bundle/python_wheel_test.go +++ b/integration/bundle/python_wheel_test.go @@ -3,7 +3,7 @@ package bundle_test import ( "testing" - "github.com/databricks/cli/internal/acc" + "github.com/databricks/cli/integration/internal/acc" "github.com/databricks/cli/internal/testutil" "github.com/databricks/cli/libs/env" "github.com/google/uuid" diff --git a/integration/bundle/spark_jar_test.go b/integration/bundle/spark_jar_test.go index 98acb75a..65893052 100644 --- a/integration/bundle/spark_jar_test.go +++ b/integration/bundle/spark_jar_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "github.com/databricks/cli/internal/acc" + "github.com/databricks/cli/integration/internal/acc" "github.com/databricks/cli/internal/testutil" "github.com/databricks/cli/libs/env" "github.com/google/uuid" diff --git a/integration/cmd/clusters/clusters_test.go b/integration/cmd/clusters/clusters_test.go index 4cc6cb65..4e20a055 100644 --- a/integration/cmd/clusters/clusters_test.go +++ b/integration/cmd/clusters/clusters_test.go @@ -6,7 +6,7 @@ import ( "regexp" "testing" - "github.com/databricks/cli/internal/acc" + "github.com/databricks/cli/integration/internal/acc" "github.com/databricks/cli/internal/testcli" "github.com/databricks/databricks-sdk-go/listing" "github.com/databricks/databricks-sdk-go/service/compute" diff --git a/integration/cmd/fs/cat_test.go b/integration/cmd/fs/cat_test.go index b0f99ae4..3e964fe6 100644 --- a/integration/cmd/fs/cat_test.go +++ b/integration/cmd/fs/cat_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "github.com/databricks/cli/internal/acc" + "github.com/databricks/cli/integration/internal/acc" "github.com/databricks/cli/internal/testcli" "github.com/databricks/cli/libs/filer" "github.com/stretchr/testify/assert" diff --git a/integration/cmd/fs/helpers_test.go b/integration/cmd/fs/helpers_test.go index da4fd48c..e1bebb28 100644 --- a/integration/cmd/fs/helpers_test.go +++ b/integration/cmd/fs/helpers_test.go @@ -5,7 +5,7 @@ import ( "path" "path/filepath" - "github.com/databricks/cli/internal/acc" + "github.com/databricks/cli/integration/internal/acc" "github.com/databricks/cli/internal/testutil" "github.com/databricks/cli/libs/filer" diff --git a/integration/cmd/repos/repos_test.go b/integration/cmd/repos/repos_test.go index b5ad120d..7526a14c 100644 --- a/integration/cmd/repos/repos_test.go +++ b/integration/cmd/repos/repos_test.go @@ -6,7 +6,7 @@ import ( "strconv" "testing" - "github.com/databricks/cli/internal/acc" + "github.com/databricks/cli/integration/internal/acc" "github.com/databricks/cli/internal/testcli" "github.com/databricks/cli/internal/testutil" "github.com/databricks/databricks-sdk-go" diff --git a/integration/cmd/secrets/secrets_test.go b/integration/cmd/secrets/secrets_test.go index 4dd133c2..43ad54de 100644 --- a/integration/cmd/secrets/secrets_test.go +++ b/integration/cmd/secrets/secrets_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/databricks/cli/internal/acc" + "github.com/databricks/cli/integration/internal/acc" "github.com/databricks/cli/internal/testcli" "github.com/databricks/cli/internal/testutil" "github.com/databricks/databricks-sdk-go/service/workspace" diff --git a/integration/cmd/storage_credentials/storage_credentials_test.go b/integration/cmd/storage_credentials/storage_credentials_test.go index 73727a87..e4b86131 100644 --- a/integration/cmd/storage_credentials/storage_credentials_test.go +++ b/integration/cmd/storage_credentials/storage_credentials_test.go @@ -3,7 +3,7 @@ package storage_credentials_test import ( "testing" - "github.com/databricks/cli/internal/acc" + "github.com/databricks/cli/integration/internal/acc" "github.com/databricks/cli/internal/testcli" "github.com/databricks/cli/internal/testutil" "github.com/stretchr/testify/assert" diff --git a/integration/cmd/sync/sync_test.go b/integration/cmd/sync/sync_test.go index 077a0607..984f6ac4 100644 --- a/integration/cmd/sync/sync_test.go +++ b/integration/cmd/sync/sync_test.go @@ -15,7 +15,7 @@ import ( "testing" "time" - "github.com/databricks/cli/internal/acc" + "github.com/databricks/cli/integration/internal/acc" "github.com/databricks/cli/internal/testcli" "github.com/databricks/cli/internal/testutil" "github.com/databricks/cli/libs/filer" diff --git a/integration/cmd/workspace/workspace_test.go b/integration/cmd/workspace/workspace_test.go index 9338f60a..4edbbfc8 100644 --- a/integration/cmd/workspace/workspace_test.go +++ b/integration/cmd/workspace/workspace_test.go @@ -11,7 +11,7 @@ import ( "strings" "testing" - "github.com/databricks/cli/internal/acc" + "github.com/databricks/cli/integration/internal/acc" "github.com/databricks/cli/internal/testcli" "github.com/databricks/cli/libs/filer" "github.com/databricks/databricks-sdk-go/service/workspace" diff --git a/internal/acc/debug.go b/integration/internal/acc/debug.go similarity index 100% rename from internal/acc/debug.go rename to integration/internal/acc/debug.go diff --git a/internal/acc/fixtures.go b/integration/internal/acc/fixtures.go similarity index 100% rename from internal/acc/fixtures.go rename to integration/internal/acc/fixtures.go diff --git a/internal/acc/workspace.go b/integration/internal/acc/workspace.go similarity index 100% rename from internal/acc/workspace.go rename to integration/internal/acc/workspace.go diff --git a/integration/libs/filer/helpers_test.go b/integration/libs/filer/helpers_test.go index 2383ae35..a3a3aaae 100644 --- a/integration/libs/filer/helpers_test.go +++ b/integration/libs/filer/helpers_test.go @@ -7,7 +7,7 @@ import ( "path" "path/filepath" - "github.com/databricks/cli/internal/acc" + "github.com/databricks/cli/integration/internal/acc" "github.com/databricks/cli/internal/testutil" "github.com/databricks/cli/libs/filer" diff --git a/integration/libs/git/git_fetch_test.go b/integration/libs/git/git_fetch_test.go index e53b5469..0998d775 100644 --- a/integration/libs/git/git_fetch_test.go +++ b/integration/libs/git/git_fetch_test.go @@ -8,7 +8,7 @@ import ( "strings" "testing" - "github.com/databricks/cli/internal/acc" + "github.com/databricks/cli/integration/internal/acc" "github.com/databricks/cli/libs/dbr" "github.com/databricks/cli/libs/git" "github.com/stretchr/testify/assert" diff --git a/integration/libs/locker/locker_test.go b/integration/libs/locker/locker_test.go index 7624afde..c51972b9 100644 --- a/integration/libs/locker/locker_test.go +++ b/integration/libs/locker/locker_test.go @@ -11,7 +11,7 @@ import ( "testing" "time" - "github.com/databricks/cli/internal/acc" + "github.com/databricks/cli/integration/internal/acc" "github.com/databricks/cli/internal/testutil" "github.com/databricks/cli/libs/filer" lockpkg "github.com/databricks/cli/libs/locker" diff --git a/integration/libs/tags/tags_test.go b/integration/libs/tags/tags_test.go index b7c47b5f..8a54a966 100644 --- a/integration/libs/tags/tags_test.go +++ b/integration/libs/tags/tags_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - "github.com/databricks/cli/internal/acc" + "github.com/databricks/cli/integration/internal/acc" "github.com/databricks/cli/internal/testutil" "github.com/databricks/databricks-sdk-go/service/compute" "github.com/databricks/databricks-sdk-go/service/jobs" diff --git a/integration/python/python_tasks_test.go b/integration/python/python_tasks_test.go index d0a92e08..9ad3ed5d 100644 --- a/integration/python/python_tasks_test.go +++ b/integration/python/python_tasks_test.go @@ -14,7 +14,7 @@ import ( "time" "github.com/databricks/cli/bundle/run/output" - "github.com/databricks/cli/internal/acc" + "github.com/databricks/cli/integration/internal/acc" "github.com/databricks/cli/internal/testutil" "github.com/databricks/cli/libs/filer" "github.com/databricks/databricks-sdk-go"