Merge branch 'main' into python-clarify-namespacing

Author: pietern

.codegen.json

@@ -7,7 +7,8 @@
         "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/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 @@
-6701524136501ef070774942ef5d6e01cfaafb88
+c4784cea599325a13472b1455e7434d639362d8b

.cursorrules

@@ -11,7 +11,8 @@ cmd/account/enable-ip-access-lists/enable-ip-access-lists.go linguist-generated=
 cmd/account/encryption-keys/encryption-keys.go linguist-generated=true
 cmd/account/esm-enablement-account/esm-enablement-account.go linguist-generated=true
 cmd/account/federation-policy/federation-policy.go linguist-generated=true
-cmd/account/groups/groups.go linguist-generated=true
+cmd/account/groups-v2/groups-v2.go linguist-generated=true
+cmd/account/iam-v2/iam-v2.go linguist-generated=true
 cmd/account/ip-access-lists/ip-access-lists.go linguist-generated=true
 cmd/account/llm-proxy-partner-powered-account/llm-proxy-partner-powered-account.go linguist-generated=true
 cmd/account/llm-proxy-partner-powered-enforce/llm-proxy-partner-powered-enforce.go linguist-generated=true
@@ -27,13 +28,13 @@ cmd/account/private-access/private-access.go linguist-generated=true
 cmd/account/published-app-integration/published-app-integration.go linguist-generated=true
 cmd/account/service-principal-federation-policy/service-principal-federation-policy.go linguist-generated=true
 cmd/account/service-principal-secrets/service-principal-secrets.go linguist-generated=true
-cmd/account/service-principals/service-principals.go linguist-generated=true
+cmd/account/service-principals-v2/service-principals-v2.go linguist-generated=true
 cmd/account/settings-v2/settings-v2.go linguist-generated=true
 cmd/account/settings/settings.go linguist-generated=true
 cmd/account/storage-credentials/storage-credentials.go linguist-generated=true
 cmd/account/storage/storage.go linguist-generated=true
 cmd/account/usage-dashboards/usage-dashboards.go linguist-generated=true
-cmd/account/users/users.go linguist-generated=true
+cmd/account/users-v2/users-v2.go linguist-generated=true
 cmd/account/vpc-endpoints/vpc-endpoints.go linguist-generated=true
 cmd/account/workspace-assignment/workspace-assignment.go linguist-generated=true
 cmd/account/workspace-network-configuration/workspace-network-configuration.go linguist-generated=true
@@ -71,6 +72,7 @@ cmd/workspace/current-user/current-user.go linguist-generated=true
 cmd/workspace/dashboard-email-subscriptions/dashboard-email-subscriptions.go linguist-generated=true
 cmd/workspace/dashboard-widgets/dashboard-widgets.go linguist-generated=true
 cmd/workspace/dashboards/dashboards.go linguist-generated=true
+cmd/workspace/data-quality/data-quality.go linguist-generated=true
 cmd/workspace/data-sources/data-sources.go linguist-generated=true
 cmd/workspace/database/database.go linguist-generated=true
 cmd/workspace/default-namespace/default-namespace.go linguist-generated=true
@@ -86,14 +88,15 @@ cmd/workspace/experiments/experiments.go linguist-generated=true
 cmd/workspace/external-lineage/external-lineage.go linguist-generated=true
 cmd/workspace/external-locations/external-locations.go linguist-generated=true
 cmd/workspace/external-metadata/external-metadata.go linguist-generated=true
+cmd/workspace/feature-engineering/feature-engineering.go linguist-generated=true
 cmd/workspace/feature-store/feature-store.go linguist-generated=true
 cmd/workspace/forecasting/forecasting.go linguist-generated=true
 cmd/workspace/functions/functions.go linguist-generated=true
 cmd/workspace/genie/genie.go linguist-generated=true
 cmd/workspace/git-credentials/git-credentials.go linguist-generated=true
 cmd/workspace/global-init-scripts/global-init-scripts.go linguist-generated=true
 cmd/workspace/grants/grants.go linguist-generated=true
-cmd/workspace/groups/groups.go linguist-generated=true
+cmd/workspace/groups-v2/groups-v2.go linguist-generated=true
 cmd/workspace/instance-pools/instance-pools.go linguist-generated=true
 cmd/workspace/instance-profiles/instance-profiles.go linguist-generated=true
 cmd/workspace/ip-access-lists/ip-access-lists.go linguist-generated=true
@@ -142,7 +145,7 @@ cmd/workspace/rfa/rfa.go linguist-generated=true
 cmd/workspace/schemas/schemas.go linguist-generated=true
 cmd/workspace/secrets/secrets.go linguist-generated=true
 cmd/workspace/service-principal-secrets-proxy/service-principal-secrets-proxy.go linguist-generated=true
-cmd/workspace/service-principals/service-principals.go linguist-generated=true
+cmd/workspace/service-principals-v2/service-principals-v2.go linguist-generated=true
 cmd/workspace/serving-endpoints/serving-endpoints.go linguist-generated=true
 cmd/workspace/settings/settings.go linguist-generated=true
 cmd/workspace/shares/shares.go linguist-generated=true
@@ -156,12 +159,13 @@ cmd/workspace/temporary-path-credentials/temporary-path-credentials.go linguist-
 cmd/workspace/temporary-table-credentials/temporary-table-credentials.go linguist-generated=true
 cmd/workspace/token-management/token-management.go linguist-generated=true
 cmd/workspace/tokens/tokens.go linguist-generated=true
-cmd/workspace/users/users.go linguist-generated=true
+cmd/workspace/users-v2/users-v2.go linguist-generated=true
 cmd/workspace/vector-search-endpoints/vector-search-endpoints.go linguist-generated=true
 cmd/workspace/vector-search-indexes/vector-search-indexes.go linguist-generated=true
 cmd/workspace/volumes/volumes.go linguist-generated=true
 cmd/workspace/warehouses/warehouses.go linguist-generated=true
 cmd/workspace/workspace-bindings/workspace-bindings.go linguist-generated=true
 cmd/workspace/workspace-conf/workspace-conf.go linguist-generated=true
+cmd/workspace/workspace-iam-v2/workspace-iam-v2.go linguist-generated=true
 cmd/workspace/workspace-settings-v2/workspace-settings-v2.go linguist-generated=true
 cmd/workspace/workspace/workspace.go linguist-generated=true

.gitattributes

@@ -0,0 +1,5 @@
+[merge "ours"]
+    # define merge driver "ours" that will do nothing which will make git
+    # accept the file from the branch the we rebase onto as final version, ignoring local changes.
+    # https://git-scm.com/docs/gitattributes#_defining_a_custom_merge_driver
+    driver = true

.gitconfig

@@ -0,0 +1,3 @@
+#!/bin/bash
+set -ex
+git config --local include.path "$(git rev-parse --show-toplevel)/.gitconfig"

.gitconfig.install

@@ -1,4 +1,6 @@
-* @pietern @andrewnester @shreyas-goenka @denik @anton-107
-cmd/labs @alexott @nfx
-cmd/pipelines @kanterov @lennartkats-db @jefferycheng1
-acceptance/pipelines @kanterov @lennartkats-db @jefferycheng1
+*                         @andrewnester @anton-107 @denik @pietern @shreyas-goenka
+/cmd/bundle/bundle.go     @andrewnester @anton-107 @denik @pietern @shreyas-goenka @lennartkats-db
+/libs/template/           @andrewnester @anton-107 @denik @pietern @shreyas-goenka @lennartkats-db
+/acceptance/pipelines/    @jefferycheng1 @kanterov @lennartkats-db
+/cmd/pipelines/           @jefferycheng1 @kanterov @lennartkats-db
+/cmd/labs/                @alexott @nfx

.github/CODEOWNERS

@@ -4,6 +4,10 @@ updates:
     directory: "/"
     schedule:
       interval: "weekly"
+  - package-ecosystem: "gomod"
+    directory: "/tools"
+    schedule:
+      interval: "weekly"
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:

.github/dependabot.yml

@@ -62,15 +62,21 @@ jobs:
             deployment-type.txt
 
       - name: Setup Python
-        uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
+        uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
         with:
-          python-version: '3.9'
+          python-version: '3.13'
 
       - name: Install uv
         uses: astral-sh/setup-uv@e92bafb6253dcd438e0484186d7669ea7a8ca1cc # v6.4.3
         with:
           version: "0.8.9"
 
+      - name: Install ruff (Python linter and formatter)
+        uses: astral-sh/ruff-action@57714a7c8a2e59f32539362ba31877a1957dded1 # v3.5.1
+        with:
+          version: "0.9.1"
+          args: "--version"
+
       - name: Pull external libraries
         run: |
           go mod download
@@ -82,14 +88,14 @@ jobs:
         # populates the cache and cache may include test results.
         if: ${{ github.event_name == 'pull_request' || github.event_name == 'schedule' }}
         env:
-          ENVFILTER: DATABRICKS_CLI_DEPLOYMENT=${{ matrix.deployment }}
+          ENVFILTER: DATABRICKS_BUNDLE_ENGINE=${{ matrix.deployment }}
         run: make test
 
       - name: Run tests with coverage
         # Still run 'make cover' on push to main and merge checks to make sure it does not get broken.
         if: ${{ github.event_name != 'pull_request' && github.event_name != 'schedule' }}
         env:
-          ENVFILTER: DATABRICKS_CLI_DEPLOYMENT=${{ matrix.deployment }}
+          ENVFILTER: DATABRICKS_BUNDLE_ENGINE=${{ matrix.deployment }}
         run: make cover
 
       - name: Analyze slow tests
@@ -116,12 +122,9 @@ jobs:
           # Exit with status code 1 if there are differences (i.e. unformatted files)
           git diff --exit-code
       - name: Run Go lint checks (does not include formatting checks)
-        uses: golangci/golangci-lint-action@4afd733a84b1f43292c63897423277bb7f4313a9 # v8.0.0
-        with:
-          version: v2.1.6
-          args: --timeout=15m
+        run: go tool -modfile=tools/go.mod golangci-lint run --timeout=15m
       - name: Run ruff (Python linter and formatter)
-        uses: astral-sh/ruff-action@0c50076f12c38c3d0115b7b519b54a91cb9cf0ad # v3.5.0
+        uses: astral-sh/ruff-action@57714a7c8a2e59f32539362ba31877a1957dded1 # v3.5.1
         with:
           version: "0.9.1"
           args: "format --check"
@@ -135,7 +138,7 @@ jobs:
           make checks
           git diff --exit-code
 
-  validate-bundle-schema:
+  validate-generated-is-up-to-date:
     needs: cleanups
     runs-on: ubuntu-latest
 
@@ -159,6 +162,13 @@ jobs:
             exit 1
           fi
 
+      - name: Verify that the generated enum and required fields are up to date
+        run: |
+          if ! ( make generate-validation && git diff --exit-code ); then
+            echo "The generated enum and required fields are not up to date. Please run 'make generate-validation' and commit the changes."
+            exit 1
+          fi
+
       # Github repo: https://github.com/ajv-validator/ajv-cli
       - name: Install ajv-cli
         run: npm install -g [email protected]

.github/workflows/push.yml

@@ -48,7 +48,7 @@ jobs:
 
       - name: Run GoReleaser
         id: releaser
-        uses: goreleaser/goreleaser-action@9c156ee8a17a598857849441385a2041ef570552 # v6.3.0
+        uses: goreleaser/goreleaser-action@e435ccd777264be153ace6237001ef4d979d3a7a # v6.4.0
         with:
           version: ~> v2
           args: release --snapshot --skip docker