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

Author: alyssa-db

.github/workflows/push.yml

@@ -112,10 +112,10 @@ jobs:
         with:
           version: "0.9.1"
           args: "format --check"
-      - name: "make fmt: Python and Go formatting"
+      - name: "make fmtfull: Python and Go formatting"
         # This is already done by actions, but good to check that make command is working
         run: |
-          make fmt
+          make fmtfull
           git diff --exit-code
       - name: "make checks: custom checks outside of fmt and lint"
         run: |

Makefile

@@ -6,20 +6,27 @@ GOTESTSUM_FORMAT ?= pkgname-and-test-fails
 GOTESTSUM_CMD ?= go tool gotestsum --format ${GOTESTSUM_FORMAT} --no-summary=skipped --jsonfile test-output.json
 
 
-lint:
+lintfull:
 	golangci-lint run --fix
 
+lint:
+	./tools/lintdiff.py run --fix
+
 tidy:
 	@# not part of golangci-lint, apparently
 	go mod tidy
 
 lintcheck:
 	golangci-lint run ./...
 
-fmt:
-	ruff format -qn
+fmtfull:
+	ruff format -n
 	golangci-lint fmt
 
+fmt:
+	ruff format -n
+	./tools/lintdiff.py fmt
+
 ws:
 	./tools/validate_whitespace.py
 
@@ -78,4 +85,4 @@ generate:
 	[ ! -f .github/workflows/next-changelog.yml ] || rm .github/workflows/next-changelog.yml
 	pushd experimental/python && make codegen
 
-.PHONY: lint tidy lintcheck fmt 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

NEXT_CHANGELOG.md

@@ -4,6 +4,8 @@
 
 ### Notable Changes
 
+* Fix `databricks auth login` to tolerate URLs copied from the browser ([#3001](https://github.com/databricks/cli/pull/3001)).
+
 ### Dependency updates
 
 ### CLI
@@ -12,5 +14,6 @@
 
 ### Bundles
 * Fix "bundle summary -o json" to render null values properly ([#2990](https://github.com/databricks/cli/pull/2990))
+* Fixed null pointer de-reference if artifacts missing fields ([#3022](https://github.com/databricks/cli/pull/3022))
 
 ### API Changes

acceptance/bundle/artifacts/nil_artifacts/databricks.yml

@@ -0,0 +1,10 @@
+bundle:
+  name: nil_artifacts_test
+
+artifacts:
+  # This reproduces the issue from GitHub #3017
+  # where artifacts have empty definitions (only comments)
+  my_artifact:
+    # build: <first_option_command>
+    # path: <path>
+    # build: <second_option_command>

acceptance/bundle/artifacts/nil_artifacts/output.txt

@@ -0,0 +1,16 @@
+
+>>> [CLI] bundle validate
+Error: Artifact not properly configured
+  in databricks.yml:7:15
+
+please specify artifact properties
+
+Name: nil_artifacts_test
+Target: default
+Workspace:
+  User: [USERNAME]
+  Path: /Workspace/Users/[USERNAME]/.bundle/nil_artifacts_test/default
+
+Found 1 error
+
+Exit code: 1

acceptance/bundle/artifacts/nil_artifacts/script

@@ -0,0 +1 @@
+errcode trace $CLI bundle validate

acceptance/bundle/artifacts/nil_artifacts/test.toml

@@ -0,0 +1,9 @@
+RecordRequests = false
+
+[[Repls]]
+Old = '\\\\'
+New = '/'
+
+[[Repls]]
+Old = '\\'
+New = '/'

acceptance/bundle/deploy/dashboard/nested-folders/dashboards/sample-dashboard.lvdash.json

@@ -0,0 +1 @@
+{"pages":[{"name":"02724bf2","displayName":"Dashboard test bundle-deploy-dashboard"}]}

acceptance/bundle/deploy/dashboard/nested-folders/databricks.yml.tmpl

@@ -0,0 +1,5 @@
+bundle:
+  name: deploy-dashboard-nested-folders-$UNIQUE_NAME
+
+include:
+  - "resources/*.yml"

acceptance/bundle/deploy/dashboard/nested-folders/output.txt

@@ -0,0 +1,23 @@
+
+>>> [CLI] bundle deploy
+Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/deploy-dashboard-nested-folders-[UNIQUE_NAME]/default/files...
+Deploying resources...
+Updating deployment state...
+Deployment complete!
+
+>>> [CLI] lakeview get [DASHBOARD_ID]
+{
+  "lifecycle_state": "ACTIVE",
+  "parent_path": "/Users/[USERNAME]",
+  "path": "/Users/[USERNAME]/test bundle-deploy-dashboard [UUID].lvdash.json",
+  "serialized_dashboard": "{\"pages\":[{\"name\":\"02724bf2\",\"displayName\":\"Dashboard test bundle-deploy-dashboard\",\"pageType\":\"PAGE_TYPE_CANVAS\"}]}"
+}
+
+>>> [CLI] bundle destroy --auto-approve
+The following resources will be deleted:
+  delete dashboard dashboard1
+
+All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/deploy-dashboard-nested-folders-[UNIQUE_NAME]/default
+
+Deleting files...
+Destroy complete!