Merge branch 'main' into cluster-id-config-1897

Author: alyssa-db

.wsignore

@@ -17,6 +17,10 @@ experimental/python/docs/images/databricks-logo.svg
 # In order to prevent that difference, hello.txt does not have a trailing newline.
 acceptance/selftest/record_cloud/volume-io/hello.txt
 
+# error output when artifact build fails contains trailing whitespace:
+acceptance/bundle/artifacts/shell/err-bash/output.txt
+acceptance/bundle/artifacts/shell/err-sh/output.txt
+
 # "bundle init" has trailing whitespace:
 acceptance/bundle/templates-machinery/helpers-error/output.txt
 

Makefile

@@ -48,6 +48,18 @@ checks: tidy ws links
 test:
 	${GOTESTSUM_CMD} -- ${PACKAGES}
 
+# Updates acceptance test output (local tests)
+test-update:
+	-go test ./acceptance -run '^TestAccept$$' -update
+	@# at the moment second pass is required because some tests show diff against output of another test for easier review
+	-go test ./acceptance -run '^TestAccept$$' -update
+
+# Updates acceptance test output (integration tests, requires access)
+test-update-aws:
+	deco env run -i -n aws-prod-ucws -- go test ./acceptance -run ^TestAccept$$ -update -timeout=1h -skiplocal -v
+
+test-update-all: test-update test-update-aws
+
 slowest:
 	go tool gotestsum tool slowest --jsonfile test-output.json --threshold 1s --num 50
 
@@ -94,4 +106,4 @@ generate:
 	[ ! -f .github/workflows/next-changelog.yml ] || rm .github/workflows/next-changelog.yml
 	pushd experimental/python && make codegen
 
-.PHONY: lint lintfull tidy lintcheck fmt fmtfull test cover showcover build snapshot schema integration integration-short acc-cover acc-showcover docs ws links checks
+.PHONY: lint lintfull tidy lintcheck fmt fmtfull test cover showcover build snapshot schema integration integration-short acc-cover acc-showcover docs ws links checks test-update test-update-aws test-update-all

acceptance/acceptance_test.go

@@ -43,6 +43,7 @@ var (
 	Forcerun    bool
 	LogRequests bool
 	LogConfig   bool
+	SkipLocal   bool
 )
 
 // In order to debug CLI running under acceptance test, search for TestInprocessMode and update
@@ -65,6 +66,7 @@ func init() {
 	flag.BoolVar(&Forcerun, "forcerun", false, "Force running the specified tests, ignore all reasons to skip")
 	flag.BoolVar(&LogRequests, "logrequests", false, "Log request and responses from testserver")
 	flag.BoolVar(&LogConfig, "logconfig", false, "Log merged for each test case")
+	flag.BoolVar(&SkipLocal, "skiplocal", false, "Skip tests that are enabled to run on Local")
 }
 
 const (
@@ -330,6 +332,10 @@ func getTests(t *testing.T) []string {
 
 // Return a reason to skip the test. Empty string means "don't skip".
 func getSkipReason(config *internal.TestConfig, configPath string) string {
+	if SkipLocal && isTruePtr(config.Local) {
+		return "Disabled via SkipLocal setting in " + configPath
+	}
+
 	if Forcerun {
 		return ""
 	}

acceptance/bundle/artifacts/shell/err-bash/databricks.yml

@@ -0,0 +1,8 @@
+artifacts:
+  my_artifact:
+    executable: bash
+    build: |-
+      echo "hello" > out.shell.txt
+      echo "world" >> out.shell.txt
+      false
+      echo "this should not be printed since bash is run with -e" >> out.shell.txt

acceptance/bundle/artifacts/shell/err-bash/out.shell.txt

@@ -0,0 +1,2 @@
+hello
+world

acceptance/bundle/artifacts/shell/err-bash/output.txt

@@ -0,0 +1,7 @@
+
+>>> [CLI] bundle deploy
+Building my_artifact...
+Error: build failed my_artifact, error: exit status 1, output: 
+
+
+Exit code: 1

acceptance/bundle/artifacts/shell/err-bash/script

@@ -0,0 +1 @@
+trace $CLI bundle deploy

acceptance/bundle/artifacts/shell/err-sh/databricks.yml

@@ -0,0 +1,8 @@
+artifacts:
+  my_artifact:
+    executable: sh
+    build: |-
+      echo "hello" > out.shell.txt
+      echo "world" >> out.shell.txt
+      false
+      echo "this should not be printed since sh is run with -e" >> out.shell.txt

acceptance/bundle/artifacts/shell/err-sh/out.shell.txt

@@ -0,0 +1,2 @@
+hello
+world

acceptance/bundle/artifacts/shell/err-sh/output.txt

@@ -0,0 +1,7 @@
+
+>>> [CLI] bundle deploy
+Building my_artifact...
+Error: build failed my_artifact, error: exit status 1, output: 
+
+
+Exit code: 1