Skip to content

Commit 8265d94

Browse files
authored
Merge branch 'main' into cluster-id-config-1897
2 parents 9977de1 + 7c15eb2 commit 8265d94

231 files changed

Lines changed: 3285 additions & 530 deletions

File tree

Some content is hidden

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

.codegen/service.go.tmpl

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ func new{{.PascalName}}() *cobra.Command {
128128

129129
var {{.CamelName}}Req {{.Service.Package.Name}}.{{.Request.PascalName}}
130130
{{- if .RequestBodyField }}
131-
{{.CamelName}}Req.{{.RequestBodyField.PascalName}} = {{ if .RequestBodyField.IsOptionalObject }}&{{end}}{{.Service.Package.Name}}.{{.RequestBodyField.Entity.PascalName}}{}
131+
{{.CamelName}}Req.{{.RequestBodyField.PascalName}} = {{ if .RequestBodyField.IsOptionalObjectPb }}&{{end}}{{.Service.Package.Name}}.{{.RequestBodyField.Entity.PascalName}}{}
132132
{{- end }}
133133
{{- if $canUseJson}}
134134
var {{.CamelName}}Json flags.JsonFlag
@@ -390,6 +390,9 @@ func new{{.PascalName}}() *cobra.Command {
390390
391391
{{- define "arg-type" -}}
392392
{{- if .IsString}}StringVar
393+
{{- else if .IsTimestamp}}StringVar{{/* TODO: add support for well known types */}}
394+
{{- else if .IsDuration}}StringVar{{/* TODO: add support for well known types */}}
395+
{{- else if .IsFieldMask}}StringVar{{/* TODO: add support for well known types */}}
393396
{{- else if .IsBool}}BoolVar
394397
{{- else if .IsInt64}}Int64Var
395398
{{- else if .IsFloat64}}Float64Var
@@ -409,7 +412,7 @@ func new{{.PascalName}}() *cobra.Command {
409412
{{- if $optionalIfJsonIsUsed }}
410413
if !cmd.Flags().Changed("json") {
411414
{{- end }}
412-
{{if not $field.Entity.IsString -}}
415+
{{if and (not $field.Entity.IsString) (not $field.Entity.IsFieldMask) (not $field.Entity.IsTimestamp) (not $field.Entity.IsDuration) -}} {{/* TODO: add support for well known types */}}
413416
_, err = fmt.Sscan(args[{{$arg}}], &{{- template "request-body-obj" (dict "Method" $method "Field" $field)}})
414417
if err != nil {
415418
return fmt.Errorf("invalid {{$field.ConstantName}}: %s", args[{{$arg}}])

.github/workflows/push.yml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -48,17 +48,17 @@ jobs:
4848
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
4949

5050
- name: Setup Go
51-
uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0
51+
uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
5252
with:
5353
go-version-file: go.mod
5454

5555
- name: Setup Python
56-
uses: actions/setup-python@8d9ed9ac5c53483de85588cdf95a591a75ab9f55 # v5.5.0
56+
uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
5757
with:
5858
python-version: '3.9'
5959

6060
- name: Install uv
61-
uses: astral-sh/setup-uv@6b9c6063abd6010835644d4c2e1bef4cf5cd0fca # v6.0.1
61+
uses: astral-sh/setup-uv@f0ec1fc3b38f5e7cd731bb6ce540c5af426746bb # v6.1.0
6262
with:
6363
version: "0.6.5"
6464

@@ -88,7 +88,7 @@ jobs:
8888
runs-on: ubuntu-latest
8989
steps:
9090
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
91-
- uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0
91+
- uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
9292
with:
9393
go-version-file: go.mod
9494
# Use different schema from regular job, to avoid overwriting the same key
@@ -103,24 +103,24 @@ jobs:
103103
# Exit with status code 1 if there are differences (i.e. unformatted files)
104104
git diff --exit-code
105105
- name: Run Go lint checks (does not include formatting checks)
106-
uses: golangci/golangci-lint-action@1481404843c368bc19ca9406f87d6e0fc97bdcfd # v7.0.0
106+
uses: golangci/golangci-lint-action@4afd733a84b1f43292c63897423277bb7f4313a9 # v8.0.0
107107
with:
108-
version: v2.0.2
108+
version: v2.1.6
109109
args: --timeout=15m
110110
- name: Run ruff (Python linter and formatter)
111-
uses: astral-sh/ruff-action@c6bea5606c33b5d04902374392d9233464b90660 # v3.3.0
111+
uses: astral-sh/ruff-action@eaf0ecdd668ceea36159ff9d91882c9795d89b49 # v3.4.0
112112
with:
113113
version: "0.9.1"
114114
args: "format --check"
115-
- name: Run formatting (does not include linting checks)
115+
- name: "make fmt: Python and Go formatting"
116+
# This is already done by actions, but good to check that make command is working
116117
run: |
117118
make fmt
118-
- name: Fail on formatting differences
119+
git diff --exit-code
120+
- name: "make checks: custom checks outside of fmt and lint"
119121
run: |
120-
# Exit with status code 1 if there are differences (i.e. unformatted files)
122+
make checks
121123
git diff --exit-code
122-
- name: Run whitespace check
123-
run: make ws
124124
125125
validate-bundle-schema:
126126
needs: cleanups
@@ -131,7 +131,7 @@ jobs:
131131
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
132132

133133
- name: Setup Go
134-
uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0
134+
uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
135135
with:
136136
go-version-file: go.mod
137137
# Use different schema from regular job, to avoid overwriting the same key
@@ -186,7 +186,7 @@ jobs:
186186
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
187187

188188
- name: Install uv
189-
uses: astral-sh/setup-uv@6b9c6063abd6010835644d4c2e1bef4cf5cd0fca # v6.0.1
189+
uses: astral-sh/setup-uv@f0ec1fc3b38f5e7cd731bb6ce540c5af426746bb # v6.1.0
190190
with:
191191
version: "0.6.5"
192192

.github/workflows/python_push.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
3434

3535
- name: Install uv
36-
uses: astral-sh/setup-uv@6b9c6063abd6010835644d4c2e1bef4cf5cd0fca # v6.0.1
36+
uses: astral-sh/setup-uv@f0ec1fc3b38f5e7cd731bb6ce540c5af426746bb # v6.1.0
3737
with:
3838
python-version: ${{ matrix.pyVersion }}
3939
version: "0.6.5"
@@ -51,7 +51,7 @@ jobs:
5151
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
5252

5353
- name: Install uv
54-
uses: astral-sh/setup-uv@6b9c6063abd6010835644d4c2e1bef4cf5cd0fca # v6.0.1
54+
uses: astral-sh/setup-uv@f0ec1fc3b38f5e7cd731bb6ce540c5af426746bb # v6.1.0
5555
with:
5656
version: "0.6.5"
5757

@@ -68,7 +68,7 @@ jobs:
6868
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
6969

7070
- name: Install uv
71-
uses: astral-sh/setup-uv@6b9c6063abd6010835644d4c2e1bef4cf5cd0fca # v6.0.1
71+
uses: astral-sh/setup-uv@f0ec1fc3b38f5e7cd731bb6ce540c5af426746bb # v6.1.0
7272
with:
7373
version: "0.6.5"
7474

.github/workflows/release-snapshot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
fetch-tags: true
3333

3434
- name: Setup Go
35-
uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0
35+
uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
3636
with:
3737
go-version-file: go.mod
3838

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
fetch-tags: true
2525

2626
- name: Setup Go
27-
uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0
27+
uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
2828
with:
2929
go-version-file: go.mod
3030

@@ -179,7 +179,7 @@ jobs:
179179
fetch-tags: true
180180

181181
- name: Install uv
182-
uses: astral-sh/setup-uv@6b9c6063abd6010835644d4c2e1bef4cf5cd0fca # v6.0.1
182+
uses: astral-sh/setup-uv@f0ec1fc3b38f5e7cd731bb6ce540c5af426746bb # v6.1.0
183183
with:
184184
version: "0.6.5"
185185

.release_metadata.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"timestamp": "2025-05-27 13:11:17+0000"
2+
"timestamp": "2025-06-03 13:30:49+0000"
33
}

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
# Version changelog
22

3+
## Release v0.254.0
4+
5+
### Bundles
6+
* Added `experimental.skip_artifact_cleanup` flag ([#2980](https://github.com/databricks/cli/pull/2980))
7+
* Add an experimental project template for Lakeflow Declarative Pipelines ([#2959](https://github.com/databricks/cli/pull/2959))
8+
9+
310
## Release v0.253.0
411

512
### Dependency updates

Makefile

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
default: tidy fmt lint ws
1+
default: checks fmt lint
22

33
PACKAGES=./acceptance/... ./libs/... ./internal/... ./cmd/... ./bundle/... .
44

@@ -23,6 +23,12 @@ fmt:
2323
ws:
2424
./tools/validate_whitespace.py
2525

26+
links:
27+
./tools/update_github_links.py
28+
29+
# Checks other than 'fmt' and 'lint'; these are fast, so can be run first
30+
checks: tidy ws links
31+
2632
test:
2733
${GOTESTSUM_CMD} -- ${PACKAGES}
2834

@@ -72,4 +78,4 @@ generate:
7278
[ ! -f .github/workflows/next-changelog.yml ] || rm .github/workflows/next-changelog.yml
7379
pushd experimental/python && make codegen
7480

75-
.PHONY: lint tidy lintcheck fmt test cover showcover build snapshot schema integration integration-short acc-cover acc-showcover docs ws
81+
.PHONY: lint tidy lintcheck fmt test cover showcover build snapshot schema integration integration-short acc-cover acc-showcover docs ws links checks

NEXT_CHANGELOG.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
# NEXT CHANGELOG
22

3-
## Release v0.254.0
3+
## Release v0.255.0
44

55
### Notable Changes
66

77
### Dependency updates
88

99
### CLI
10-
- Fixed an issue where running `databricks auth login` would remove the `cluster_id` field from profiles in `.databrickscfg`. The login process now preserves the `cluster_id` field. Also added a test to ensure `cluster_id` is retained after login. ([#2988](https://github.com/databricks/cli/pull/2988))
10+
* Fixed an issue where running `databricks auth login` would remove the `cluster_id` field from profiles in `.databrickscfg`. The login process now preserves the `cluster_id` field. Also added a test to ensure `cluster_id` is retained after login. ([#2988](https://github.com/databricks/cli/pull/2988))
11+
* Use OS aware runner instead of bash for run-local command ([#2996](https://github.com/databricks/cli/pull/2996))
1112

1213
### Bundles
14+
* Fix "bundle summary -o json" to render null values properly ([#2990](https://github.com/databricks/cli/pull/2990))
1315

1416
### API Changes

acceptance/acceptance_test.go

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ import (
3131
"github.com/databricks/cli/internal/testutil"
3232
"github.com/databricks/cli/libs/auth"
3333
"github.com/databricks/cli/libs/testdiff"
34-
"github.com/databricks/cli/libs/testserver"
3534
"github.com/databricks/cli/libs/utils"
3635
"github.com/stretchr/testify/require"
3736
)
@@ -472,12 +471,6 @@ func runTest(t *testing.T,
472471
// User replacements:
473472
repls.Repls = append(repls.Repls, config.Repls...)
474473

475-
// Apply these after user replacements in case user replacement capture something like "Job \d+"
476-
for offset := range 5 {
477-
repls.Set(strconv.Itoa(testserver.TestJobID+offset), fmt.Sprintf("[TEST_JOB_ID+%d]", offset))
478-
repls.Set(strconv.Itoa(testserver.TestRunID+offset), fmt.Sprintf("[TEST_RUN_ID+%d]", offset))
479-
}
480-
481474
// Save replacements to temp test directory so that it can be read by diff.py
482475
replsJson, err := json.MarshalIndent(repls.Repls, "", " ")
483476
require.NoError(t, err)
@@ -1008,7 +1001,7 @@ func getNodeTypeID(cloudEnv string) string {
10081001
case "gcp":
10091002
return "n1-standard-4"
10101003
case "":
1011-
return "local-fake-node"
1004+
return "i3.xlarge"
10121005
default:
10131006
return "nodetype-" + cloudEnv
10141007
}

0 commit comments

Comments
 (0)