Move integration tests to integration package

Makefile

@@ -37,6 +37,6 @@ vendor:
 	@go mod vendor
 
 integration:
-	gotestsum --format github-actions --rerun-fails --jsonfile output.json --packages "./internal/..." -- -run "TestAcc.*" -parallel 4 -timeout=2h
+	gotestsum --format github-actions --rerun-fails --jsonfile output.json --packages "./integration/..." -- -parallel 4 -timeout=2h
 
 .PHONY: fmt lint lintcheck test testonly coverage build snapshot vendor integration

integration/README.md

@@ -0,0 +1,37 @@
+# Integration tests
+
+This directory contains integration tests for the project.
+
+The tree structure generally mirrors the source code tree structure.
+
+Requirements for new files in this directory:
+* Every package **must** be named after its directory with `_test` appended
+  * Requiring a different package name for integration tests avoids aliasing with the main package.
+* Every integration test package **must** include a `main_test.go` file.
+
+These requirements are enforced by a unit test in this directory.
+
+## Running integration tests
+
+Integration tests require the following environment variables:
+* `CLOUD_ENV` - set to the cloud environment to use (e.g. `aws`, `azure`, `gcp`)
+* `DATABRICKS_HOST` - set to the Databricks workspace to use
+* `DATABRICKS_TOKEN` - set to the Databricks token to use
+
+Optional environment variables:
+* `TEST_DEFAULT_WAREHOUSE_ID` - set to the default warehouse ID to use
+* `TEST_METASTORE_ID` - set to the metastore ID to use
+* `TEST_INSTANCE_POOL_ID` - set to the instance pool ID to use
+* `TEST_BRICKS_CLUSTER_ID` - set to the cluster ID to use
+
+To run all integration tests, use the following command:
+
+```bash
+go test ./integration/...
+```
+
+Alternatively:
+
+```bash
+make integration
+```

internal/dashboard_assumptions_test.go → integration/assumptions/dashboard_assumptions_test.go

@@ -1,4 +1,4 @@
-package internal
+package assumptions_test
 
 import (
 	"encoding/base64"

integration/assumptions/main_test.go

@@ -0,0 +1,13 @@
+package assumptions_test
+
+import (
+	"testing"
+
+	"github.com/databricks/cli/integration/internal"
+)
+
+// TestMain is the entrypoint executed by the test runner.
+// See [internal.Main] for prerequisites for running integration tests.
+func TestMain(m *testing.M) {
+	internal.Main(m)
+}

internal/bundle/artifacts_test.go → integration/bundle/artifacts_test.go

@@ -1,4 +1,4 @@
-package bundle
+package bundle_test
 
 import (
 	"fmt"

internal/bundle/basic_test.go → integration/bundle/basic_test.go

@@ -1,4 +1,4 @@
-package bundle
+package bundle_test
 
 import (
 	"os"

internal/bundle/bind_resource_test.go → integration/bundle/bind_resource_test.go

@@ -1,4 +1,4 @@
-package bundle
+package bundle_test
 
 import (
 	"fmt"

internal/bundle/clusters_test.go → integration/bundle/clusters_test.go

@@ -1,4 +1,4 @@
-package bundle
+package bundle_test
 
 import (
 	"fmt"

internal/bundle/dashboards_test.go → integration/bundle/dashboards_test.go

@@ -1,4 +1,4 @@
-package bundle
+package bundle_test
 
 import (
 	"fmt"

internal/bundle/deploy_test.go → integration/bundle/deploy_test.go

@@ -1,4 +1,4 @@
-package bundle
+package bundle_test
 
 import (
 	"context"

internal/bundle/deploy_then_remove_resources_test.go → integration/bundle/deploy_then_remove_resources_test.go

@@ -1,4 +1,4 @@
-package bundle
+package bundle_test
 
 import (
 	"os"

internal/bundle/deploy_to_shared_test.go → integration/bundle/deploy_to_shared_test.go

@@ -1,4 +1,4 @@
-package bundle
+package bundle_test
 
 import (
 	"fmt"

internal/bundle/deployment_state_test.go → integration/bundle/deployment_state_test.go

@@ -1,4 +1,4 @@
-package bundle
+package bundle_test
 
 import (
 	"os"

internal/bundle/destroy_test.go → integration/bundle/destroy_test.go

@@ -1,4 +1,4 @@
-package bundle
+package bundle_test
 
 import (
 	"errors"

internal/bundle/empty_bundle_test.go → integration/bundle/empty_bundle_test.go

@@ -1,4 +1,4 @@
-package bundle
+package bundle_test
 
 import (
 	"fmt"

internal/bundle/environments_test.go → integration/bundle/environments_test.go

@@ -1,4 +1,4 @@
-package bundle
+package bundle_test
 
 import (
 	"testing"

internal/bundle/generate_job_test.go → integration/bundle/generate_job_test.go

@@ -1,4 +1,4 @@
-package bundle
+package bundle_test
 
 import (
 	"context"

internal/bundle/generate_pipeline_test.go → integration/bundle/generate_pipeline_test.go

@@ -1,4 +1,4 @@
-package bundle
+package bundle_test
 
 import (
 	"context"

internal/bundle/helpers.go → integration/bundle/helpers_test.go

@@ -1,4 +1,4 @@
-package bundle
+package bundle_test
 
 import (
 	"bytes"

internal/init_test.go → integration/bundle/init_test.go

@@ -1,4 +1,4 @@
-package internal
+package bundle_test
 
 import (
 	"context"
@@ -67,8 +67,8 @@ func TestAccBundleInitOnMlopsStacks(t *testing.T) {
 	testcli.RequireSuccessfulRun(t, "bundle", "init", "mlops-stacks", "--output-dir", tmpDir2, "--config-file", filepath.Join(tmpDir1, "config.json"))
 
 	// Assert that the README.md file was created
-	assert.FileExists(t, filepath.Join(tmpDir2, "repo_name", projectName, "README.md"))
-	assertLocalFileContents(t, filepath.Join(tmpDir2, "repo_name", projectName, "README.md"), fmt.Sprintf("# %s", projectName))
+	contents := testutil.ReadFile(t, filepath.Join(tmpDir2, "repo_name", projectName, "README.md"))
+	assert.Contains(t, contents, fmt.Sprintf("# %s", projectName))
 
 	// Validate the stack
 	testutil.Chdir(t, filepath.Join(tmpDir2, "repo_name", projectName))
@@ -163,6 +163,7 @@ func TestAccBundleInitHelpers(t *testing.T) {
 		testcli.RequireSuccessfulRun(t, "bundle", "init", tmpDir, "--output-dir", tmpDir2)
 
 		// Assert that the helper function was correctly computed.
-		assertLocalFileContents(t, filepath.Join(tmpDir2, "foo.txt"), test.expected)
+		contents := testutil.ReadFile(t, filepath.Join(tmpDir2, "foo.txt"))
+		assert.Contains(t, contents, test.expected)
 	}
 }

internal/bundle/job_metadata_test.go → integration/bundle/job_metadata_test.go

@@ -1,4 +1,4 @@
-package bundle
+package bundle_test
 
 import (
 	"context"

internal/bundle/local_state_staleness_test.go → integration/bundle/local_state_staleness_test.go

@@ -1,4 +1,4 @@
-package bundle
+package bundle_test
 
 import (
 	"context"

integration/bundle/main_test.go

@@ -0,0 +1,13 @@
+package bundle_test
+
+import (
+	"testing"
+
+	"github.com/databricks/cli/integration/internal"
+)
+
+// TestMain is the entrypoint executed by the test runner.
+// See [internal.Main] for prerequisites for running integration tests.
+func TestMain(m *testing.M) {
+	internal.Main(m)
+}

internal/bundle/python_wheel_test.go → integration/bundle/python_wheel_test.go

@@ -1,4 +1,4 @@
-package bundle
+package bundle_test
 
 import (
 	"testing"

internal/bundle/spark_jar_test.go → integration/bundle/spark_jar_test.go

@@ -1,4 +1,4 @@
-package bundle
+package bundle_test
 
 import (
 	"context"

internal/bundle/validate_test.go → integration/bundle/validate_test.go

@@ -1,4 +1,4 @@
-package bundle
+package bundle_test
 
 import (
 	"context"

internal/alerts_test.go → integration/cmd/alerts/alerts_test.go

@@ -1,4 +1,4 @@
-package internal
+package alerts_test
 
 import (
 	"testing"

integration/cmd/alerts/main_test.go

@@ -0,0 +1,13 @@
+package alerts_test
+
+import (
+	"testing"
+
+	"github.com/databricks/cli/integration/internal"
+)
+
+// TestMain is the entrypoint executed by the test runner.
+// See [internal.Main] for prerequisites for running integration tests.
+func TestMain(m *testing.M) {
+	internal.Main(m)
+}

internal/api_test.go → integration/cmd/api/api_test.go

@@ -1,4 +1,4 @@
-package internal
+package api_test
 
 import (
 	"encoding/json"

integration/cmd/api/main_test.go

@@ -0,0 +1,13 @@
+package api_test
+
+import (
+	"testing"
+
+	"github.com/databricks/cli/integration/internal"
+)
+
+// TestMain is the entrypoint executed by the test runner.
+// See [internal.Main] for prerequisites for running integration tests.
+func TestMain(m *testing.M) {
+	internal.Main(m)
+}

internal/auth_describe_test.go → integration/cmd/auth/describe_test.go

@@ -1,4 +1,4 @@
-package internal
+package auth_test
 
 import (
 	"context"
@@ -14,6 +14,8 @@ import (
 func TestAuthDescribeSuccess(t *testing.T) {
 	t.Log(testutil.GetEnvOrSkipTest(t, "CLOUD_ENV"))
 
+	t.Skipf("Skipping because of https://github.com/databricks/cli/issues/2010")
+
 	stdout, _ := testcli.RequireSuccessfulRun(t, "auth", "describe")
 	outStr := stdout.String()
 
@@ -35,6 +37,8 @@ func TestAuthDescribeSuccess(t *testing.T) {
 func TestAuthDescribeFailure(t *testing.T) {
 	t.Log(testutil.GetEnvOrSkipTest(t, "CLOUD_ENV"))
 
+	t.Skipf("Skipping because of https://github.com/databricks/cli/issues/2010")
+
 	stdout, _ := testcli.RequireSuccessfulRun(t, "auth", "describe", "--profile", "nonexistent")
 	outStr := stdout.String()
 

integration/cmd/auth/main_test.go

@@ -0,0 +1,13 @@
+package auth_test
+
+import (
+	"testing"
+
+	"github.com/databricks/cli/integration/internal"
+)
+
+// TestMain is the entrypoint executed by the test runner.
+// See [internal.Main] for prerequisites for running integration tests.
+func TestMain(m *testing.M) {
+	internal.Main(m)
+}

internal/clusters_test.go → integration/cmd/clusters/clusters_test.go

@@ -1,4 +1,4 @@
-package internal
+package clusters_test
 
 import (
 	"fmt"

integration/cmd/clusters/main_test.go

@@ -0,0 +1,13 @@
+package clusters_test
+
+import (
+	"testing"
+
+	"github.com/databricks/cli/integration/internal"
+)
+
+// TestMain is the entrypoint executed by the test runner.
+// See [internal.Main] for prerequisites for running integration tests.
+func TestMain(m *testing.M) {
+	internal.Main(m)
+}

internal/fs_cat_test.go → integration/cmd/fs/cat_test.go

@@ -1,4 +1,4 @@
-package internal
+package fs_test
 
 import (
 	"context"

internal/completer_test.go → integration/cmd/fs/completion_test.go

@@ -1,4 +1,4 @@
-package internal
+package fs_test
 
 import (
 	"context"

internal/fs_cp_test.go → integration/cmd/fs/cp_test.go

@@ -1,4 +1,4 @@
-package internal
+package fs_test
 
 import (
 	"context"

integration/cmd/fs/helpers_test.go

@@ -0,0 +1,46 @@
+package fs_test
+
+import (
+	"os"
+	"path"
+	"path/filepath"
+
+	"github.com/databricks/cli/internal/acc"
+	"github.com/databricks/cli/internal/testutil"
+
+	"github.com/databricks/cli/libs/filer"
+	"github.com/stretchr/testify/require"
+)
+
+func setupLocalFiler(t testutil.TestingT) (filer.Filer, string) {
+	t.Log(testutil.GetEnvOrSkipTest(t, "CLOUD_ENV"))
+
+	tmp := t.TempDir()
+	f, err := filer.NewLocalClient(tmp)
+	require.NoError(t, err)
+
+	return f, path.Join(filepath.ToSlash(tmp))
+}
+
+func setupDbfsFiler(t testutil.TestingT) (filer.Filer, string) {
+	_, wt := acc.WorkspaceTest(t)
+
+	tmpdir := acc.TemporaryDbfsDir(wt)
+	f, err := filer.NewDbfsClient(wt.W, tmpdir)
+	require.NoError(t, err)
+	return f, path.Join("dbfs:/", tmpdir)
+}
+
+func setupUcVolumesFiler(t testutil.TestingT) (filer.Filer, string) {
+	_, wt := acc.WorkspaceTest(t)
+
+	if os.Getenv("TEST_METASTORE_ID") == "" {
+		t.Skip("Skipping tests that require a UC Volume when metastore id is not set.")
+	}
+
+	tmpdir := acc.TemporaryVolume(wt)
+	f, err := filer.NewFilesClient(wt.W, tmpdir)
+	require.NoError(t, err)
+
+	return f, path.Join("dbfs:/", tmpdir)
+}

internal/fs_ls_test.go → integration/cmd/fs/ls_test.go

@@ -1,4 +1,4 @@
-package internal
+package fs_test
 
 import (
 	"context"