Merge remote-tracking branch 'origin/main' into simonfaltum/auth-picker-search-mode

# Conflicts:
#	NEXT_CHANGELOG.md
#	cmd/auth/profile_picker.go

Author: simonfaltum

NEXT_CHANGELOG.md

@@ -1,6 +1,6 @@
 # NEXT CHANGELOG
 
-## Release v0.300.0
+## Release v0.299.2
 
 ### CLI
 
@@ -10,6 +10,7 @@
 
 ### Bundles
 
+* Propagate authentication environment (including `DATABRICKS_CONFIG_PROFILE`) to the `experimental.python` subprocess so bundle validate/deploy no longer fails with a multi-profile host ambiguity error when several profiles in `~/.databrickscfg` share the same host.
 * Fixed `--force-pull` on `bundle summary` and `bundle open` so the flag bypasses the local state cache and reads state from the workspace.
 
 ### Dependency updates

acceptance/bin/echo_browser.py

@@ -0,0 +1,19 @@
+#!/usr/bin/env python3
+"""
+Fake browser that prints the URL it was asked to open and exits.
+
+Used by acceptance tests that exercise commands which call libs/browser.Open
+but don't need to follow the URL (unlike auth tests, which use browser.py to
+close the OAuth callback loop). Setting BROWSER=echo_browser.py is portable
+across darwin/linux/windows because libs/browser routes through libs/exec.
+
+Usage: echo_browser.py <url>
+"""
+
+import sys
+
+if len(sys.argv) < 2:
+    sys.stderr.write("Usage: echo_browser.py <url>\n")
+    sys.exit(1)
+
+print(sys.argv[1])

acceptance/bundle/open/open

@@ -17,11 +17,11 @@ Deploying resources...
 Updating deployment state...
 Deployment complete!
 
-=== Modify PATH so that real open is not run
-=== open after deployment. This will fail to open browser and complain, that's ok, we only want the message
+=== Use a fake browser that just prints the URL it would have opened
+=== open after deployment
 >>> [CLI] bundle open foo
 Opening browser at [DATABRICKS_URL]/jobs/[NUMID]?o=[NUMID]
-Error: exec: "open": cannot run executable found relative to current directory
+[DATABRICKS_URL]/jobs/[NUMID]?o=[NUMID]
 
 === test auto-completion handler
 >>> [CLI] __complete bundle open ,

acceptance/bundle/open/out.test.toml

@@ -6,11 +6,11 @@ errcode trace $CLI bundle open foo
 
 errcode trace $CLI bundle deploy
 
-title "Modify PATH so that real open is not run"
-export PATH=.:$PATH
+title "Use a fake browser that just prints the URL it would have opened"
+export BROWSER="echo_browser.py"
 
-title "open after deployment. This will fail to open browser and complain, that's ok, we only want the message"
-musterr trace $CLI bundle open foo
+title "open after deployment"
+trace $CLI bundle open foo
 
 title "test auto-completion handler"
 trace $CLI __complete bundle open ,

acceptance/bundle/open/output.txt

@@ -0,0 +1,7 @@
+[my-profile]
+host = $DATABRICKS_HOST
+token = $DATABRICKS_TOKEN
+
+[other-profile]
+host = $DATABRICKS_HOST
+token = other-token

acceptance/bundle/open/script

@@ -0,0 +1,16 @@
+bundle:
+  name: my_project
+
+sync: {paths: []} # don't need to copy files
+
+python:
+  mutators:
+    - "mutators:capture_profile_env"
+
+workspace:
+  profile: my-profile
+
+resources:
+  jobs:
+    my_job:
+      name: "Job"

acceptance/bundle/open/test.toml

@@ -0,0 +1,13 @@
+from databricks.bundles.jobs import Job
+from databricks.bundles.core import job_mutator, Bundle
+import os
+
+
+@job_mutator
+def capture_profile_env(bundle: Bundle, job: Job) -> Job:
+    # The CLI must propagate DATABRICKS_CONFIG_PROFILE to the python subprocess
+    # so the Databricks SDK can disambiguate when multiple profiles share a host.
+    value = os.getenv("DATABRICKS_CONFIG_PROFILE", "<unset>")
+    with open("captured_env.txt", "w") as f:
+        f.write(value)
+    return job