Merge branch 'main' into feature/prevent-destroy

Author: andrewnester

.gitignore

@@ -36,3 +36,6 @@ tools/yamlfmt.exe
 
 # Cache for tools/gh_report.py
 .gh-logs
+
+# Release artifacts
+dist/

.golangci.yaml

@@ -16,6 +16,7 @@ linters:
     - unused
     - exhaustruct
     - copyloopvar
+    - forbidigo
   settings:
     copyloopvar:
       check-alias: true
@@ -72,6 +73,9 @@ linters:
       - path: bundle/terranova/tnresources/all_test.go
         linters:
           - exhaustruct
+      - path-except: ^cmd
+        linters:
+          - forbidigo
 issues:
   max-issues-per-linter: 1000
   max-same-issues: 1000

Makefile

@@ -91,6 +91,11 @@ build-vm: tidy
 snapshot:
 	go build -o .databricks/databricks
 
+# Produce release binaries and archives in the dist folder without uploading them anywhere.
+# Useful for "databricks ssh" development, as it needs to upload linux releases to the /Workspace.
+snapshot-release:
+	goreleaser release --clean --skip docker --snapshot
+
 schema:
 	go run ./bundle/internal/schema ./bundle/internal/schema ./bundle/schema/jsonschema.json
 

acceptance/acceptance_test.go

@@ -84,7 +84,7 @@ const (
 	EntryPointScript = "script"
 	CleanupScript    = "script.cleanup"
 	PrepareScript    = "script.prepare"
-	MaxFileSize      = 100_000
+	MaxFileSize      = 1_000_000
 	// Filename to save replacements to (used by diff.py)
 	ReplsFile = "repls.json"
 	// Filename for materialized config (used as golden file)

acceptance/bundle/bundle_tag/url_ref/out.deploy.direct-exp.txt

@@ -1,5 +1,5 @@
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
-Error: schema mismatch for ${resources.jobs.foo.url}: url: field "url" not found in resources.Job
+Error: cannot resolve "${resources.jobs.foo.url}": schema mismatch: url: field "url" not found in resources.Job; url: field "url" not found in jobs.Job
 
 Error: cannot plan jobs.bar: dependency failed: jobs.foo
 

acceptance/bundle/bundle_tag/url_ref/out.plan.direct-exp.txt

@@ -1,4 +1,4 @@
-Error: schema mismatch for ${resources.jobs.foo.url}: url: field "url" not found in resources.Job
+Error: cannot resolve "${resources.jobs.foo.url}": schema mismatch: url: field "url" not found in resources.Job; url: field "url" not found in jobs.Job
 
 Error: cannot plan jobs.bar: dependency failed: jobs.foo
 

acceptance/bundle/bundle_tag/url_ref/test.toml

@@ -1 +1,2 @@
+Badness = "Error message in direct is developer-focussed, includes struct names that were checked; could be made more user friendly and point to the right doc and maybe even give a list of allowed fields"
 RecordRequests = true

acceptance/bundle/debug/output.txt

@@ -1,7 +1,19 @@
-Name: test-bundle
-Target: default
-Workspace:
-  User: [USERNAME]
-  Path: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default
+Debug information about bundles
 
-Validation OK!
+Usage:
+  databricks bundle debug [command]
+
+Available Commands:
+  refschema   Dump all relevant fields all bundle resources
+
+Flags:
+  -h, --help   help for debug
+
+Global Flags:
+      --debug            enable debug logging
+  -o, --output type      output type: text or json (default text)
+  -p, --profile string   ~/.databrickscfg profile
+  -t, --target string    bundle target to use (if applicable)
+      --var strings      set values for variables defined in bundle config. Example: --var="foo=bar"
+
+Use "databricks bundle debug [command] --help" for more information about a command.

acceptance/bundle/debug/script

@@ -1 +1 @@
-$CLI bundle validate --debug 2> out.stderr.$DATABRICKS_CLI_DEPLOYMENT.txt
+$CLI bundle debug