Merge b66dfa3fa2 into f2096eddcc

## Changes
- Only print replacements if VERBOSE_TEST flag is set.
- This is set on CI but not when you do "go test" or "make test".

Note, env var is used, so that it can be set in Makefile.

## Tests
Manually.

Makefile

@@ -28,7 +28,7 @@ test:
 
 cover:
 	rm -fr ./acceptance/build/cover/
-	CLI_GOCOVERDIR=build/cover ${GOTESTSUM_CMD} -- -coverprofile=coverage.txt ${PACKAGES}
+	VERBOSE_TEST=1 CLI_GOCOVERDIR=build/cover ${GOTESTSUM_CMD} -- -coverprofile=coverage.txt ${PACKAGES}
 	rm -fr ./acceptance/build/cover-merged/
 	mkdir -p acceptance/build/cover-merged/
 	go tool covdata merge -i $$(printf '%s,' acceptance/build/cover/* | sed 's/,$$//') -o acceptance/build/cover-merged/
@@ -61,6 +61,6 @@ integration: vendor
 	$(INTEGRATION)
 
 integration-short: vendor
-	$(INTEGRATION) -short
+	VERBOSE_TEST=1 $(INTEGRATION) -short
 
 .PHONY: lint tidy lintcheck fmt test cover showcover build snapshot vendor schema integration integration-short acc-cover acc-showcover docs

acceptance/acceptance_test.go

@@ -32,6 +32,7 @@ import (
 var (
 	KeepTmp     bool
 	NoRepl      bool
+	VerboseTest bool = os.Getenv("VERBOSE_TEST") != ""
 )
 
 // In order to debug CLI running under acceptance test, set this to full subtest name, e.g. "bundle/variables/empty"
@@ -412,7 +413,7 @@ func doComparison(t *testing.T, repls testdiff.ReplacementsContext, dirRef, dirN
 		testutil.WriteFile(t, pathRef, valueNew)
 	}
 
-	if !equal && printedRepls != nil && !*printedRepls {
+	if VerboseTest && !equal && printedRepls != nil && !*printedRepls {
 		*printedRepls = true
 		var items []string
 		for _, item := range repls.Repls {

acceptance/bundle/templates/dbt-sql/output/my_dbt_sql/databricks.yml

@@ -28,7 +28,7 @@ targets:
       # We explicitly specify /Workspace/Users/[USERNAME] to make sure we only have a single copy.
       root_path: /Workspace/Users/[USERNAME]/.bundle/${bundle.name}/${bundle.target}
     permissions:
-      - user_name: [USERNAME]
+      - $USER_NAME_KEY: [USERNAME]
         level: CAN_MANAGE
     run_as:
-      user_name: [USERNAME]
+      $USER_NAME_KEY: [USERNAME]

acceptance/bundle/templates/dbt-sql/output/my_dbt_sql/resources/my_dbt_sql.job.yml

@@ -33,7 +33,7 @@ resources:
 
           new_cluster:
             spark_version: 15.4.x-scala2.12
-            node_type_id: i3.xlarge
+            node_type_id: (redacted)
             data_security_mode: SINGLE_USER
             num_workers: 0
             spark_conf:

acceptance/bundle/templates/default-python/output/my_default_python/databricks.yml

@@ -25,7 +25,7 @@ targets:
       # We explicitly specify /Workspace/Users/[USERNAME] to make sure we only have a single copy.
       root_path: /Workspace/Users/[USERNAME]/.bundle/${bundle.name}/${bundle.target}
     permissions:
-      - user_name: [USERNAME]
+      - $USER_NAME_KEY: [USERNAME]
         level: CAN_MANAGE
     run_as:
-      user_name: [USERNAME]
+      $USER_NAME_KEY: [USERNAME]

acceptance/bundle/templates/default-python/output/my_default_python/resources/my_default_python.job.yml

@@ -43,7 +43,7 @@ resources:
         - job_cluster_key: job_cluster
           new_cluster:
             spark_version: 15.4.x-scala2.12
-            node_type_id: i3.xlarge
+            node_type_id: (redacted)
             autoscale:
                 min_workers: 1
                 max_workers: 4

acceptance/bundle/templates/default-sql/output/my_default_sql/databricks.yml

@@ -42,7 +42,7 @@ targets:
       catalog: main
       schema: default
     permissions:
-      - user_name: [USERNAME]
+      - $USER_NAME_KEY: [USERNAME]
         level: CAN_MANAGE
     run_as:
-      user_name: [USERNAME]
+      $USER_NAME_KEY: [USERNAME]

acceptance/bundle/templates/experimental-jobs-as-code/output/my_jobs_as_code/databricks.yml

@@ -43,7 +43,7 @@ targets:
       # We explicitly specify /Workspace/Users/[USERNAME] to make sure we only have a single copy.
       root_path: /Workspace/Users/[USERNAME]/.bundle/${bundle.name}/${bundle.target}
     permissions:
-      - user_name: [USERNAME]
+      - $USER_NAME_KEY: [USERNAME]
         level: CAN_MANAGE
     run_as:
-      user_name: [USERNAME]
+      $USER_NAME_KEY: [USERNAME]

acceptance/bundle/templates/test.toml

@@ -1,2 +1,20 @@
-# At the moment, there are many differences across different envs w.r.t to catalog use, node type and so on.
+[[Repls]]
-LocalOnly = true
+Old = 'service_principal_name:'
+New = '$$USER_NAME_KEY:'
+
+[[Repls]]
+Old = 'user_name:'
+New = '$$USER_NAME_KEY:'
+
+[[Repls]]
+Old = '''
+      email_notifications:
+        on_failure:
+          - \$USERNAME
+
+'''
+New = ''
+
+[[Repls]]
+Old = '\bnode_type_id: [0-9a-zA-Z_.-]+\b'
+New = 'node_type_id: (redacted)'