Convert TestBasicBundleDeployWithDoubleUnderscoreVariables integration test to an acceptance test (#2882)

## Why
<!-- Why are these changes needed? Provide the context that the reviewer
might be missing.
For example, were there any decisions behind the change that are not
reflected in the code itself? -->

One change in the series of changes for converting integration tests
into acceptance tests.
This will allow for easier testing of various backing solutions for
bundle deployment

Author: anton-107

…h_variables/template/databricks.yml.tmpl …uble-underscore-keys/databricks.yml.tmplintegration/bundle/bundles/basic_with_variables/template/databricks.yml.tmpl renamed to acceptance/bundle/deploy/jobs/double-underscore-keys/databricks.yml.tmpl integration/bundle/bundles/basic_with_variables/template/databricks.yml.tmpl renamed to acceptance/bundle/deploy/jobs/double-underscore-keys/databricks.yml.tmpl

@@ -1,12 +1,5 @@
 bundle:
-  name: basic
-
-workspace:
-  {{ if .root_path }}
-  root_path: "{{.root_path}}/.bundle/{{.unique_id}}"
-  {{ else }}
-  root_path: "~/.bundle/{{.unique_id}}"
-  {{ end }}
+  name: deploy-jobs-test-$UNIQUE_NAME
 
 variables:
   task__key: # Note: the variable has double underscore
@@ -15,17 +8,17 @@ variables:
 resources:
   jobs:
     foo__bar: # Note: the resource has double underscore to check that TF provider can use such names
-      name: test-job-basic-{{.unique_id}}
+      name: test-job-basic-$UNIQUE_NAME
       tasks:
         - task_key: ${var.task__key}
           new_cluster:
             num_workers: 1
-            spark_version: "{{.spark_version}}"
-            node_type_id: "{{.node_type_id}}"
+            spark_version: $DEFAULT_SPARK_VERSION
+            node_type_id: $NODE_TYPE_ID
           spark_python_task:
             python_file: ./hello_world.py
     foo:
-      name: test-job-basic-ref-{{.unique_id}}
+      name: test-job-basic-ref-$UNIQUE_NAME
       tasks:
         - task_key: job_task
           run_job_task:

…c_with_variables/template/hello_world.py …bs/double-underscore-keys/hello_world.pyintegration/bundle/bundles/basic_with_variables/template/hello_world.py renamed to acceptance/bundle/deploy/jobs/double-underscore-keys/hello_world.py integration/bundle/bundles/basic_with_variables/template/hello_world.py renamed to acceptance/bundle/deploy/jobs/double-underscore-keys/hello_world.py

@@ -0,0 +1,25 @@
+
+>>> [CLI] bundle validate
+Name: deploy-jobs-test-[UNIQUE_NAME]
+Target: default
+Workspace:
+  User: [USERNAME]
+  Path: /Workspace/Users/[USERNAME]/.bundle/deploy-jobs-test-[UNIQUE_NAME]/default
+
+Validation OK!
+
+>>> [CLI] bundle deploy
+Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/deploy-jobs-test-[UNIQUE_NAME]/default/files...
+Deploying resources...
+Updating deployment state...
+Deployment complete!
+
+>>> [CLI] bundle destroy --auto-approve
+The following resources will be deleted:
+  delete job foo
+  delete job foo__bar
+
+All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/deploy-jobs-test-[UNIQUE_NAME]/default
+
+Deleting files...
+Destroy complete!

acceptance/bundle/deploy/jobs/double-underscore-keys/output.txt

@@ -0,0 +1,9 @@
+envsubst < databricks.yml.tmpl > databricks.yml
+
+cleanup() {
+    trace $CLI bundle destroy --auto-approve
+}
+trap cleanup EXIT
+
+trace $CLI bundle validate
+trace $CLI bundle deploy

acceptance/bundle/deploy/jobs/double-underscore-keys/script

@@ -0,0 +1,6 @@
+Local = true
+Cloud = true
+
+Ignore = [
+    "databricks.yml",
+]

acceptance/bundle/deploy/jobs/double-underscore-keys/test.toml

@@ -153,6 +153,17 @@ func addDefaultHandlers(server *testserver.Server) {
 		return req.Workspace.JobsCreate(request)
 	})
 
+	server.Handle("POST", "/api/2.2/jobs/delete", func(req testserver.Request) any {
+		var request jobs.DeleteJob
+		if err := json.Unmarshal(req.Body, &request); err != nil {
+			return testserver.Response{
+				Body:       fmt.Sprintf("internal error: %s", err),
+				StatusCode: 500,
+			}
+		}
+		return testserver.MapDelete(req.Workspace, req.Workspace.Jobs, request.JobId)
+	})
+
 	server.Handle("POST", "/api/2.2/jobs/reset", func(req testserver.Request) any {
 		var request jobs.ResetJob
 		if err := json.Unmarshal(req.Body, &request); err != nil {

acceptance/internal/handlers.go

@@ -6,9 +6,7 @@ import (
 	"testing"
 
 	"github.com/databricks/cli/integration/internal/acc"
-	"github.com/databricks/cli/internal/testcli"
 	"github.com/databricks/cli/internal/testutil"
-	"github.com/databricks/cli/libs/testdiff"
 	"github.com/google/uuid"
 	"github.com/stretchr/testify/require"
 )
@@ -37,40 +35,3 @@ func TestBasicBundleDeployWithFailOnActiveRuns(t *testing.T) {
 	// deploy empty bundle again
 	deployBundleWithFlags(t, ctx, root, []string{"--fail-on-active-runs"})
 }
-
-func TestBasicBundleDeployWithDoubleUnderscoreVariables(t *testing.T) {
-	ctx, wt := acc.WorkspaceTest(t)
-
-	nodeTypeId := testutil.GetCloud(t).NodeTypeID()
-	uniqueId := uuid.New().String()
-	root := initTestTemplate(t, ctx, "basic_with_variables", map[string]any{
-		"unique_id":     uniqueId,
-		"node_type_id":  nodeTypeId,
-		"spark_version": defaultSparkVersion,
-	})
-
-	currentUser, err := wt.W.CurrentUser.Me(ctx)
-	require.NoError(t, err)
-
-	ctx, replacements := testdiff.WithReplacementsMap(ctx)
-	replacements.Set(uniqueId, "$UNIQUE_PRJ")
-	replacements.Set(currentUser.UserName, "$USERNAME")
-
-	t.Cleanup(func() {
-		destroyBundle(t, ctx, root)
-	})
-
-	testutil.Chdir(t, root)
-	testcli.AssertOutput(
-		t,
-		ctx,
-		[]string{"bundle", "validate"},
-		testutil.TestData("testdata/basic_with_variables/bundle_validate.txt"),
-	)
-	testcli.AssertOutput(
-		t,
-		ctx,
-		[]string{"bundle", "deploy", "--force-lock", "--auto-approve"},
-		testutil.TestData("testdata/basic_with_variables/bundle_deploy.txt"),
-	)
-}