Skip to content

Commit 1f9e016

Browse files
authored
Merge branch 'main' into fix/bundle-generate-job
2 parents 58d6e0e + 457cfdc commit 1f9e016

File tree

654 files changed

+14037
-2029
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

654 files changed

+14037
-2029
lines changed

.codegen/_openapi_sha

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
a7c320a6b531263c8fa45619c1565b63849750e5
1+
d09dbd77f5a9560cbb816746773da43a8bdbde08

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@ cmd/workspace/enable-notebook-table-clipboard/enable-notebook-table-clipboard.go
9090
cmd/workspace/enable-results-downloading/enable-results-downloading.go linguist-generated=true
9191
cmd/workspace/enhanced-security-monitoring/enhanced-security-monitoring.go linguist-generated=true
9292
cmd/workspace/entity-tag-assignments/entity-tag-assignments.go linguist-generated=true
93+
cmd/workspace/environments/environments.go linguist-generated=true
9394
cmd/workspace/experiments/experiments.go linguist-generated=true
9495
cmd/workspace/external-lineage/external-lineage.go linguist-generated=true
9596
cmd/workspace/external-locations/external-locations.go linguist-generated=true

.github/ISSUE_TEMPLATE/dabs-issue.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
2-
name: Bug report for Databricks Asset Bundles
3-
about: Use this to report an issue with Databricks Asset Bundles.
2+
name: Bug report for Declarative Automation Bundles
3+
about: Use this to report an issue with Declarative Automation Bundles.
44
labels: DABs
55
title: ''
66
---

.github/ISSUE_TEMPLATE/direct-issue.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
name: Bug report for direct deployment engine for DABs
3-
about: Use this to report an issue with direct deployment engine in Databricks Asset Bundles.
3+
about: Use this to report an issue with direct deployment engine in Declarative Automation Bundles.
44
labels: ["DABs", "engine/direct", "Bug"]
55
title: ''
66
---

.github/actions/setup-build-environment/action.yml

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,38 +10,36 @@ runs:
1010
using: 'composite'
1111
steps:
1212
- name: Checkout repository and submodules
13-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
13+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
1414

1515
- name: Create cache identifier
1616
run: echo "${{ inputs.cache-key }}" > cache.txt
1717
shell: bash
1818

1919
- name: Setup Go
20-
uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
20+
uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 # v6.3.0
2121
with:
2222
go-version-file: go.mod
2323
cache-dependency-path: |
2424
go.sum
2525
cache.txt
2626
2727
- name: Setup Python
28-
uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
28+
uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
2929
with:
3030
python-version: '3.13'
3131

3232
- name: Install uv
33-
uses: astral-sh/setup-uv@85856786d1ce8acfbcc2f13a5f3fbd6b938f9f41 # v7.1.2
33+
uses: astral-sh/setup-uv@37802adc94f370d6bfd71619e3f0bf239e1f3b78 # v7.6.0
3434
with:
3535
version: "0.8.9"
3636

37+
- name: Install Python versions for tests
38+
run: make install-pythons
39+
shell: bash
40+
3741
- name: Install ruff (Python linter and formatter)
38-
uses: astral-sh/ruff-action@57714a7c8a2e59f32539362ba31877a1957dded1 # v3.5.1
42+
uses: astral-sh/ruff-action@4919ec5cf1f49eff0871dbcea0da843445b837e6 # v3.6.1
3943
with:
4044
version: "0.9.1"
4145
args: "--version"
42-
43-
- name: Pull external libraries
44-
run: |
45-
go mod download
46-
pip3 install wheel==0.45.1
47-
shell: bash

.github/dependabot.yml

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,23 @@ updates:
44
directory: "/"
55
schedule:
66
interval: "weekly"
7+
ignore:
8+
# Ignore Databricks Go SDK because its upgrade requires code generation
9+
- dependency-name: github.com/databricks/databricks-sdk-go
710
- package-ecosystem: "gomod"
811
directory: "/tools"
912
schedule:
1013
interval: "weekly"
14+
# https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file#directories
1115
- package-ecosystem: "github-actions"
12-
directory: "/"
16+
directories:
17+
- "/.github/workflows"
18+
- "/.github/actions/setup-build-environment"
1319
schedule:
1420
interval: "monthly"
21+
cooldown:
22+
default-days: 7
23+
# tagging.yml is generated and maintained externally. Ignore
24+
# actions/create-github-app-token since it is only used in tagging.yml.
25+
exclude-paths:
26+
- .github/workflows/tagging.yml

.github/workflows/check.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ jobs:
1919
runs-on: ubuntu-latest
2020

2121
steps:
22-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
22+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
2323

24-
- uses: actions/setup-go@7a3fe6cf4cb3a834922a1244abfce67bcef6a0c5 # v6.2.0
24+
- uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 # v6.3.0
2525
with:
2626
go-version-file: go.mod
2727
# Use different schema from regular job, to avoid overwriting the same key

.github/workflows/external-message.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
if: "${{ github.event.pull_request.head.repo.fork }}"
2626

2727
steps:
28-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
28+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
2929

3030
- name: Delete old comments
3131
env:

.github/workflows/push.yml

Lines changed: 50 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,12 @@ jobs:
3737
targets: ${{ steps.mask1.outputs.targets || steps.mask2.outputs.targets || steps.mask3.outputs.targets }}
3838
steps:
3939
- name: Checkout repository
40-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
40+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
4141
with:
4242
fetch-depth: 0
4343

4444
- name: Setup Go
45-
uses: actions/setup-go@7a3fe6cf4cb3a834922a1244abfce67bcef6a0c5 # v6.2.0
45+
uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 # v6.3.0
4646
with:
4747
go-version-file: tools/go.mod
4848

@@ -119,7 +119,7 @@ jobs:
119119

120120
steps:
121121
- name: Checkout repository and submodules
122-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
122+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
123123

124124
- name: Setup build environment
125125
uses: ./.github/actions/setup-build-environment
@@ -174,7 +174,7 @@ jobs:
174174

175175
steps:
176176
- name: Checkout repository and submodules
177-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
177+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
178178

179179
- name: Setup build environment
180180
uses: ./.github/actions/setup-build-environment
@@ -205,7 +205,7 @@ jobs:
205205

206206
steps:
207207
- name: Checkout repository and submodules
208-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
208+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
209209

210210
- name: Setup build environment
211211
uses: ./.github/actions/setup-build-environment
@@ -236,7 +236,7 @@ jobs:
236236

237237
steps:
238238
- name: Checkout repository and submodules
239-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
239+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
240240

241241
- name: Setup build environment
242242
uses: ./.github/actions/setup-build-environment
@@ -281,10 +281,10 @@ jobs:
281281

282282
steps:
283283
- name: Checkout
284-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
284+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
285285

286286
- name: Setup Go
287-
uses: actions/setup-go@7a3fe6cf4cb3a834922a1244abfce67bcef6a0c5 # v6.2.0
287+
uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 # v6.3.0
288288
with:
289289
go-version-file: go.mod
290290
# Use different schema from regular job, to avoid overwriting the same key
@@ -343,10 +343,10 @@ jobs:
343343

344344
steps:
345345
- name: Checkout
346-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
346+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
347347

348348
- name: Install uv
349-
uses: astral-sh/setup-uv@eac588ad8def6316056a12d4907a9d4d84ff7a3b # v7.3.0
349+
uses: astral-sh/setup-uv@37802adc94f370d6bfd71619e3f0bf239e1f3b78 # v7.6.0
350350
with:
351351
version: "0.6.5"
352352

@@ -362,14 +362,14 @@ jobs:
362362
fi
363363
364364
# Trigger integration tests in a separate repository.
365-
# Requires secrets from "test-trigger-is" environment (not available for fork PRs).
365+
# Requires secrets from "test-trigger-is" environment (not available for fork PRs or dependabot).
366366
# Auto-approves for merge groups to avoid running twice and queue timeouts.
367367
integration-trigger:
368368
needs:
369369
- testmask
370370

371371
if: >-
372-
(github.event_name == 'pull_request' && !github.event.pull_request.head.repo.fork) ||
372+
(github.event_name == 'pull_request' && !github.event.pull_request.head.repo.fork && github.actor != 'dependabot[bot]') ||
373373
(github.event_name == 'merge_group') ||
374374
(github.event_name == 'push')
375375
@@ -387,7 +387,7 @@ jobs:
387387
- name: Generate GitHub App Token
388388
if: ${{ github.event_name == 'pull_request' || github.event_name == 'push' }}
389389
id: generate-token
390-
uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
390+
uses: actions/create-github-app-token@f8d387b68d61c58ab83c6c016672934102569859 # v3.0.0
391391
with:
392392
app-id: ${{ secrets.DECO_WORKFLOW_TRIGGER_APP_ID }}
393393
private-key: ${{ secrets.DECO_WORKFLOW_TRIGGER_PRIVATE_KEY }}
@@ -399,7 +399,7 @@ jobs:
399399
(github.event_name == 'merge_group') ||
400400
(github.event_name == 'pull_request' && !contains(fromJSON(needs.testmask.outputs.targets), 'test'))
401401
id: generate-check-token
402-
uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
402+
uses: actions/create-github-app-token@f8d387b68d61c58ab83c6c016672934102569859 # v3.0.0
403403
with:
404404
app-id: ${{ secrets.DECO_TEST_APPROVAL_APP_ID }}
405405
private-key: ${{ secrets.DECO_TEST_APPROVAL_PRIVATE_KEY }}
@@ -422,7 +422,7 @@ jobs:
422422
# Use Checks API (not Statuses API) to match the required "Integration Tests" check.
423423
- name: Skip integration tests (pull request)
424424
if: ${{ github.event_name == 'pull_request' && !contains(fromJSON(needs.testmask.outputs.targets), 'test') && !contains(fromJSON(needs.testmask.outputs.targets), 'test-exp-ssh') }}
425-
uses: actions/github-script@v8
425+
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
426426
with:
427427
github-token: ${{ steps.generate-check-token.outputs.token }}
428428
script: |
@@ -443,7 +443,7 @@ jobs:
443443
# Use Checks API (not Statuses API) to match the required "Integration Tests" check.
444444
- name: Auto-approve for merge group
445445
if: ${{ github.event_name == 'merge_group' }}
446-
uses: actions/github-script@v8
446+
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
447447
with:
448448
github-token: ${{ steps.generate-check-token.outputs.token }}
449449
script: |
@@ -468,3 +468,37 @@ jobs:
468468
gh workflow run cli-isolated-nightly.yml -R ${{ secrets.ORG_NAME }}/${{ secrets.REPO_NAME }} \
469469
--ref main \
470470
-f commit_sha=${{ github.event.after }}
471+
472+
# Skip integration tests for dependabot PRs.
473+
# Dependabot has no access to the "test-trigger-is" environment secrets,
474+
# so we use the built-in GITHUB_TOKEN to mark the required "Integration
475+
# Tests" check as passed.
476+
integration-trigger-dependabot:
477+
if: >-
478+
github.event_name == 'pull_request' &&
479+
github.actor == 'dependabot[bot]'
480+
481+
runs-on:
482+
group: databricks-deco-testing-runner-group
483+
labels: ubuntu-latest-deco
484+
485+
permissions:
486+
checks: write
487+
488+
steps:
489+
- name: Skip integration tests
490+
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
491+
with:
492+
script: |-
493+
await github.rest.checks.create({
494+
owner: context.repo.owner,
495+
repo: context.repo.repo,
496+
name: 'Integration Tests',
497+
head_sha: '${{ github.event.pull_request.head.sha }}',
498+
status: 'completed',
499+
conclusion: 'success',
500+
output: {
501+
title: 'Integration Tests',
502+
summary: '⏭️ Skipped (dependabot PR)'
503+
}
504+
});

.github/workflows/python_push.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@ jobs:
3030

3131
steps:
3232
- name: Checkout repository and submodules
33-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
33+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
3434

3535
- name: Install uv
36-
uses: astral-sh/setup-uv@eac588ad8def6316056a12d4907a9d4d84ff7a3b # v7.3.0
36+
uses: astral-sh/setup-uv@37802adc94f370d6bfd71619e3f0bf239e1f3b78 # v7.6.0
3737
with:
3838
python-version: ${{ matrix.pyVersion }}
3939
version: "0.6.5"
@@ -48,10 +48,10 @@ jobs:
4848

4949
steps:
5050
- name: Checkout repository and submodules
51-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
51+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
5252

5353
- name: Install uv
54-
uses: astral-sh/setup-uv@eac588ad8def6316056a12d4907a9d4d84ff7a3b # v7.3.0
54+
uses: astral-sh/setup-uv@37802adc94f370d6bfd71619e3f0bf239e1f3b78 # v7.6.0
5555
with:
5656
version: "0.6.5"
5757

@@ -65,10 +65,10 @@ jobs:
6565

6666
steps:
6767
- name: Checkout repository and submodules
68-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
68+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
6969

7070
- name: Install uv
71-
uses: astral-sh/setup-uv@eac588ad8def6316056a12d4907a9d4d84ff7a3b # v7.3.0
71+
uses: astral-sh/setup-uv@37802adc94f370d6bfd71619e3f0bf239e1f3b78 # v7.6.0
7272
with:
7373
version: "0.6.5"
7474

0 commit comments

Comments
 (0)