Based on the changes, here's a concise commit message:

denik · denik · commit 7b8dd11781a5 · 2024-12-16T12:41:59.000+01:00
refactor: Update destroyBundle to not return error in bundle tests
diff --git a/integration/bundle/basic_test.go b/integration/bundle/basic_test.go
@@ -23,7 +23,7 @@ func TestBasicBundleDeployWithFailOnActiveRuns(t *testing.T) {
 	})
 
 	t.Cleanup(func() {
-		require.NoError(t, destroyBundle(t, ctx, root))
+		destroyBundle(t, ctx, root)
 	})
 
 	// deploy empty bundle
diff --git a/integration/bundle/bind_resource_test.go b/integration/bundle/bind_resource_test.go
@@ -64,8 +64,7 @@ func TestBindJobToExistingJob(t *testing.T) {
 	err = os.RemoveAll(filepath.Join(bundleRoot, ".databricks"))
 	require.NoError(t, err)
 
-	err = destroyBundle(t, ctx, bundleRoot)
-	require.NoError(t, err)
+	destroyBundle(t, ctx, bundleRoot)
 
 	// Check that job is unbound and exists after bundle is destroyed
 	job, err = w.Jobs.Get(ctx, jobs.GetJobRequest{
@@ -91,9 +90,7 @@ func TestAbortBind(t *testing.T) {
 	jobId := gt.createTestJob(ctx)
 	t.Cleanup(func() {
 		gt.destroyJob(ctx, jobId)
-		if err := destroyBundle(t, ctx, bundleRoot); err != nil {
-			t.Error(err)
-		}
+		destroyBundle(t, ctx, bundleRoot)
 	})
 
 	// Bind should fail because prompting is not possible.
diff --git a/integration/bundle/clusters_test.go b/integration/bundle/clusters_test.go
@@ -27,8 +27,7 @@ func TestDeployBundleWithCluster(t *testing.T) {
 	})
 
 	t.Cleanup(func() {
-		err := destroyBundle(t, ctx, root)
-		require.NoError(t, err)
+		destroyBundle(t, ctx, root)
 
 		cluster, err := wt.W.Clusters.GetByClusterName(ctx, fmt.Sprintf("test-cluster-%s", uniqueId))
 		if err != nil {
diff --git a/integration/bundle/dashboards_test.go b/integration/bundle/dashboards_test.go
@@ -24,8 +24,7 @@ func TestDashboards(t *testing.T) {
 	})
 
 	t.Cleanup(func() {
-		err := destroyBundle(t, ctx, root)
-		require.NoError(t, err)
+		destroyBundle(t, ctx, root)
 	})
 
 	deployBundle(t, ctx, root)
diff --git a/integration/bundle/deploy_test.go b/integration/bundle/deploy_test.go
@@ -32,8 +32,7 @@ func setupUcSchemaBundle(t *testing.T, ctx context.Context, w *databricks.Worksp
 	deployBundle(t, ctx, bundleRoot)
 
 	t.Cleanup(func() {
-		err := destroyBundle(t, ctx, bundleRoot)
-		require.NoError(t, err)
+		destroyBundle(t, ctx, bundleRoot)
 	})
 
 	// Assert the schema is created
diff --git a/integration/bundle/deploy_then_remove_resources_test.go b/integration/bundle/deploy_then_remove_resources_test.go
@@ -55,7 +55,6 @@ func TestBundleDeployThenRemoveResources(t *testing.T) {
 	assert.ErrorContains(t, err, "does not exist")
 
 	t.Cleanup(func() {
-		err = destroyBundle(t, ctx, bundleRoot)
-		require.NoError(t, err)
+		destroyBundle(t, ctx, bundleRoot)
 	})
 }
diff --git a/integration/bundle/deploy_to_shared_test.go b/integration/bundle/deploy_to_shared_test.go
@@ -28,8 +28,7 @@ func TestDeployBasicToSharedWorkspacePath(t *testing.T) {
 	require.NoError(t, err)
 
 	t.Cleanup(func() {
-		err = destroyBundle(wt, ctx, bundleRoot)
-		require.NoError(wt, err)
+		destroyBundle(wt, ctx, bundleRoot)
 	})
 
 	deployBundle(wt, ctx, bundleRoot)
diff --git a/integration/bundle/deployment_state_test.go b/integration/bundle/deployment_state_test.go
@@ -42,7 +42,7 @@ func TestFilesAreSyncedCorrectlyWhenNoSnapshot(t *testing.T) {
 	deployBundle(t, ctx, bundleRoot)
 
 	t.Cleanup(func() {
-		require.NoError(t, destroyBundle(t, ctx, bundleRoot))
+		destroyBundle(t, ctx, bundleRoot)
 	})
 
 	remoteRoot := getBundleRemoteRootPath(w, t, uniqueId)
diff --git a/integration/bundle/destroy_test.go b/integration/bundle/destroy_test.go
@@ -58,8 +58,7 @@ func TestBundleDestroy(t *testing.T) {
 	assert.Equal(t, job.Settings.Name, jobName)
 
 	// destroy bundle
-	err = destroyBundle(t, ctx, bundleRoot)
-	require.NoError(t, err)
+	destroyBundle(t, ctx, bundleRoot)
 
 	// assert pipeline is deleted
 	_, err = w.Pipelines.GetByName(ctx, pipelineName)
diff --git a/integration/bundle/empty_bundle_test.go b/integration/bundle/empty_bundle_test.go
@@ -29,7 +29,6 @@ func TestEmptyBundleDeploy(t *testing.T) {
 	deployBundle(t, ctx, tmpDir)
 
 	t.Cleanup(func() {
-		err = destroyBundle(t, ctx, tmpDir)
-		require.NoError(t, err)
+		destroyBundle(t, ctx, tmpDir)
 	})
 }
diff --git a/integration/bundle/environments_test.go b/integration/bundle/environments_test.go
@@ -20,8 +20,7 @@ func TestPythonWheelTaskWithEnvironmentsDeployAndRun(t *testing.T) {
 	deployBundle(t, ctx, bundleRoot)
 
 	t.Cleanup(func() {
-		err := destroyBundle(t, ctx, bundleRoot)
-		require.NoError(t, err)
+		destroyBundle(t, ctx, bundleRoot)
 	})
 
 	out, err := runResource(t, ctx, bundleRoot, "some_other_job")
diff --git a/integration/bundle/generate_job_test.go b/integration/bundle/generate_job_test.go
@@ -63,8 +63,7 @@ func TestGenerateFromExistingJobAndDeploy(t *testing.T) {
 
 	deployBundle(t, ctx, bundleRoot)
 
-	err = destroyBundle(t, ctx, bundleRoot)
-	require.NoError(t, err)
+	destroyBundle(t, ctx, bundleRoot)
 }
 
 type generateJobTest struct {
diff --git a/integration/bundle/generate_pipeline_test.go b/integration/bundle/generate_pipeline_test.go
@@ -71,8 +71,7 @@ func TestGenerateFromExistingPipelineAndDeploy(t *testing.T) {
 
 	deployBundle(t, ctx, bundleRoot)
 
-	err = destroyBundle(t, ctx, bundleRoot)
-	require.NoError(t, err)
+	destroyBundle(t, ctx, bundleRoot)
 }
 
 type generatePipelineTest struct {
diff --git a/integration/bundle/helpers_test.go b/integration/bundle/helpers_test.go
@@ -132,11 +132,11 @@ func runResourceWithParams(t testutil.TestingT, ctx context.Context, path, key s
 	return stdout.String(), err
 }
 
-func destroyBundle(t testutil.TestingT, ctx context.Context, path string) error {
+func destroyBundle(t testutil.TestingT, ctx context.Context, path string) {
 	ctx = env.Set(ctx, "BUNDLE_ROOT", path)
 	c := testcli.NewRunner(t, ctx, "bundle", "destroy", "--auto-approve")
 	_, _, err := c.Run()
-	return err
+	require.NoError(t, err)
 }
 
 func getBundleRemoteRootPath(w *databricks.WorkspaceClient, t testutil.TestingT, uniqueId string) string {
diff --git a/integration/bundle/job_metadata_test.go b/integration/bundle/job_metadata_test.go
@@ -35,7 +35,7 @@ func TestJobsMetadataFile(t *testing.T) {
 
 	// Cleanup the deployed bundle
 	t.Cleanup(func() {
-		require.NoError(t, destroyBundle(t, ctx, bundleRoot))
+		destroyBundle(t, ctx, bundleRoot)
 	})
 
 	// assert job 1 is created
diff --git a/integration/bundle/local_state_staleness_test.go b/integration/bundle/local_state_staleness_test.go
@@ -34,8 +34,7 @@ func TestLocalStateStaleness(t *testing.T) {
 		})
 
 		t.Cleanup(func() {
-			err := destroyBundle(t, ctx, root)
-			require.NoError(t, err)
+			destroyBundle(t, ctx, root)
 		})
 
 		return root
diff --git a/integration/bundle/python_wheel_test.go b/integration/bundle/python_wheel_test.go
@@ -26,8 +26,7 @@ func runPythonWheelTest(t *testing.T, templateName, sparkVersion string, pythonW
 	deployBundle(t, ctx, bundleRoot)
 
 	t.Cleanup(func() {
-		err := destroyBundle(t, ctx, bundleRoot)
-		require.NoError(t, err)
+		destroyBundle(t, ctx, bundleRoot)
 	})
 
 	out, err := runResource(t, ctx, bundleRoot, "some_other_job")
diff --git a/integration/bundle/spark_jar_test.go b/integration/bundle/spark_jar_test.go
@@ -27,8 +27,7 @@ func runSparkJarTestCommon(t *testing.T, ctx context.Context, sparkVersion, arti
 	deployBundle(t, ctx, bundleRoot)
 
 	t.Cleanup(func() {
-		err := destroyBundle(t, ctx, bundleRoot)
-		require.NoError(t, err)
+		destroyBundle(t, ctx, bundleRoot)
 	})
 
 	out, err := runResource(t, ctx, bundleRoot, "jar_job")

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,6 @@ func TestBundleDeployThenRemoveResources(t *testing.T) {`
`55`	`55`	`assert.ErrorContains(t, err, "does not exist")`
`56`	`56`
`57`	`57`	`t.Cleanup(func() {`
`58`		`- err = destroyBundle(t, ctx, bundleRoot)`
`59`		`- require.NoError(t, err)`
	`58`	`+ destroyBundle(t, ctx, bundleRoot)`
`60`	`59`	`})`
`61`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,6 @@ func TestEmptyBundleDeploy(t *testing.T) {`
`29`	`29`	`deployBundle(t, ctx, tmpDir)`
`30`	`30`
`31`	`31`	`t.Cleanup(func() {`
`32`		`- err = destroyBundle(t, ctx, tmpDir)`
`33`		`- require.NoError(t, err)`
	`32`	`+ destroyBundle(t, ctx, tmpDir)`
`34`	`33`	`})`
`35`	`34`	`}`