Merge branch 'main' into ssh-tunnel-integ-tests

Author: ilia-db

.codegen.json

@@ -3,12 +3,12 @@
     "api_changelog": true,
     "formatter": "go run golang.org/x/tools/cmd/goimports@latest -w $FILENAMES && go fmt ./...",
     "version": {
-        "experimental/python/README.md": "version $VERSION or above",
-        "experimental/python/databricks/bundles/version.py": "__version__ = \"$VERSION\"",
-        "experimental/python/pyproject.toml": "version = \"$VERSION\"",
-        "experimental/python/uv.lock": "name = \"databricks-bundles\"\nversion = \"$VERSION\"",
-        "libs/template/templates/experimental-jobs-as-code/library/versions.tmpl": "{{define \"latest_databricks_bundles_version\" -}}$VERSION{{- end}}"
-        "libs/template/templates/default-python/library/versions.tmpl": "{{define \"latest_databricks_bundles_version\" -}}$VERSION{{- end}}"
+        "python/README.md": "version $VERSION or above",
+        "python/databricks/bundles/version.py": "__version__ = \"$VERSION\"",
+        "python/pyproject.toml": "version = \"$VERSION\"",
+        "python/uv.lock": "name = \"databricks-bundles\"\nversion = \"$VERSION\"",
+        "libs/template/templates/experimental-jobs-as-code/library/versions.tmpl": "{{define \"latest_databricks_bundles_version\" -}}$VERSION{{- end}}",
+        "libs/template/templates/default/library/versions.tmpl": "{{define \"latest_databricks_bundles_version\" -}}$VERSION{{- end}}"
     },
     "toolchain": {
         "required": [

.codegen/_openapi_sha

@@ -1 +1 @@
-c4784cea599325a13472b1455e7434d639362d8b
+e2018bb00cba203508f8afe5a6d41bd49789ba25

.github/workflows/push.yml

@@ -54,7 +54,7 @@ jobs:
         run: echo "${{ matrix.deployment }}" > deployment-type.txt
 
       - name: Setup Go
-        uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
+        uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
         with:
           go-version-file: go.mod
           cache-dependency-path: |
@@ -67,7 +67,7 @@ jobs:
           python-version: '3.13'
 
       - name: Install uv
-        uses: astral-sh/setup-uv@e92bafb6253dcd438e0484186d7669ea7a8ca1cc # v6.4.3
+        uses: astral-sh/setup-uv@85856786d1ce8acfbcc2f13a5f3fbd6b938f9f41 # v7.1.2
         with:
           version: "0.8.9"
 
@@ -107,7 +107,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-      - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
+      - uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
         with:
           go-version-file: go.mod
           # Use different schema from regular job, to avoid overwriting the same key
@@ -147,7 +147,7 @@ jobs:
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
       - name: Setup Go
-        uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
+        uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
         with:
           go-version-file: go.mod
           # Use different schema from regular job, to avoid overwriting the same key
@@ -209,17 +209,17 @@ jobs:
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
       - name: Install uv
-        uses: astral-sh/setup-uv@e92bafb6253dcd438e0484186d7669ea7a8ca1cc # v6.4.3
+        uses: astral-sh/setup-uv@85856786d1ce8acfbcc2f13a5f3fbd6b938f9f41 # v7.1.2
         with:
           version: "0.6.5"
 
       - name: Verify that python/codegen is up to date
-        working-directory: experimental/python
+        working-directory: python
         run: |-
           make codegen
 
           if ! ( git diff --exit-code ); then
-            echo "Generated Python code is not up-to-date. Please run 'pushd experimental/python && make codegen' and commit the changes."
+            echo "Generated Python code is not up-to-date. Please run 'pushd python && make codegen' and commit the changes."
 
             exit 1
           fi

.github/workflows/python_push.yml

@@ -4,11 +4,11 @@ on:
   pull_request:
     types: [opened, synchronize]
     paths:
-      - experimental/python/**
+      - python/**
   merge_group:
     types: [checks_requested]
     paths:
-      - experimental/python/**
+      - python/**
   push:
     # Always run on push to main. The build cache can only be reused
     # if it was saved by a run from the repository's default branch.
@@ -33,13 +33,13 @@ jobs:
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
       - name: Install uv
-        uses: astral-sh/setup-uv@e92bafb6253dcd438e0484186d7669ea7a8ca1cc # v6.4.3
+        uses: astral-sh/setup-uv@85856786d1ce8acfbcc2f13a5f3fbd6b938f9f41 # v7.1.2
         with:
           python-version: ${{ matrix.pyVersion }}
           version: "0.6.5"
 
       - name: Run tests
-        working-directory: experimental/python
+        working-directory: python
         run: make test
 
   python_linters:
@@ -51,12 +51,12 @@ jobs:
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
       - name: Install uv
-        uses: astral-sh/setup-uv@e92bafb6253dcd438e0484186d7669ea7a8ca1cc # v6.4.3
+        uses: astral-sh/setup-uv@85856786d1ce8acfbcc2f13a5f3fbd6b938f9f41 # v7.1.2
         with:
           version: "0.6.5"
 
       - name: Run lint
-        working-directory: experimental/python
+        working-directory: python
         run: make lint
 
   python_docs:
@@ -68,10 +68,10 @@ jobs:
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
       - name: Install uv
-        uses: astral-sh/setup-uv@e92bafb6253dcd438e0484186d7669ea7a8ca1cc # v6.4.3
+        uses: astral-sh/setup-uv@85856786d1ce8acfbcc2f13a5f3fbd6b938f9f41 # v7.1.2
         with:
           version: "0.6.5"
 
       - name: Run docs
-        working-directory: experimental/python
+        working-directory: python
         run: make docs

.github/workflows/release-snapshot.yml

@@ -32,7 +32,7 @@ jobs:
           fetch-tags: true
 
       - name: Setup Go
-        uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
+        uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
         with:
           go-version-file: go.mod
 
@@ -54,21 +54,21 @@ jobs:
           args: release --snapshot --skip docker
 
       - name: Upload macOS binaries
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         with:
           name: cli_darwin_snapshot
           path: |
             dist/*_darwin_*/
 
       - name: Upload Linux binaries
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         with:
           name: cli_linux_snapshot
           path: |
             dist/*_linux_*/
 
       - name: Upload Windows binaries
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         with:
           name: cli_windows_snapshot
           path: |
@@ -88,7 +88,7 @@ jobs:
         # Snapshot release may only be updated for commits to the main branch.
         if: github.ref == 'refs/heads/main'
 
-        uses: softprops/action-gh-release@72f2c25fcb47643c292f7107632f7a47c1df5cd8 # v2.3.2
+        uses: softprops/action-gh-release@6da8fa9354ddfdc4aeace5fc48d7f679b5214090 # v2.4.1
         with:
           name: Snapshot
           prerelease: true

.github/workflows/release.yml

@@ -24,7 +24,7 @@ jobs:
           fetch-tags: true
 
       - name: Setup Go
-        uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
+        uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
         with:
           go-version-file: go.mod
 
@@ -178,15 +178,15 @@ jobs:
           fetch-tags: true
 
       - name: Install uv
-        uses: astral-sh/setup-uv@e92bafb6253dcd438e0484186d7669ea7a8ca1cc # v6.4.3
+        uses: astral-sh/setup-uv@85856786d1ce8acfbcc2f13a5f3fbd6b938f9f41 # v7.1.2
         with:
           version: "0.6.5"
 
       - name: Build wheel
-        working-directory: experimental/python
+        working-directory: python
         run: make build
 
       - name: Publish package distributions to PyPI
-        uses: pypa/gh-action-pypi-publish@76f52bc884231f62b9a034ebfe128415bbaabdfc # v1.12.4
+        uses: pypa/gh-action-pypi-publish@ed0c53931b1dc9bd32cbe73a98c7f6766f8a527e # v1.13.0
         with:
-          packages-dir: experimental/python/dist
+          packages-dir: python/dist

.gitignore

@@ -42,3 +42,7 @@ tools/golangci-lint
 
 # Release artifacts
 dist/
+
+# Local development notes, tmp
+/pr-*
+/tmp/

.release_metadata.json

@@ -1,3 +1,3 @@
 {
-    "timestamp": "2025-10-22 10:53:54+0000"
+    "timestamp": "2025-11-05 15:14:22+0000"
 }

.wsignore

@@ -3,7 +3,7 @@
 .codegen/_openapi_sha
 .release_metadata.json
 bundle/schema/jsonschema.json
-experimental/python/docs/images/databricks-logo.svg
+python/docs/images/databricks-logo.svg
 **/*.dist-info/METADATA
 **/*.dist-info/WHEEL
 
@@ -17,29 +17,15 @@ 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
-
-# "bundle deploy" with apps has trailing whitespace:
-integration/bundle/testdata/apps/bundle_deploy.txt
-
-# Extra whitespace in test output:
-acceptance/bundle/resource_deps/bad_syntax/out.plan.terraform.txt
-acceptance/bundle/upload/internal_server_error/output.txt
-
-# Extra whitespace in command help:
-acceptance/cmd/workspace/apps/output.txt
+# bundle commands leave empty lines at the end; too many to list individually:
+acceptance/**/out*.txt
 
 # Extra whitespace in generated commands:
 cmd/workspace/**/*.go
 cmd/account/**/*.go
 
 # Extra whitespace in generated Python models
-experimental/python/databricks/bundles/*/_models/*.py
+python/databricks/bundles/*/_models/*.py
 
 # Developed elsewhere:
 internal/genkit/tagging.py