Skip to content

Commit c9e8d79

Browse files
Merge remote-tracking branch 'origin/main' into stack/auth_logout
2 parents 22d250f + 24f5f01 commit c9e8d79

40 files changed

Lines changed: 1292 additions & 82 deletions

File tree

.codegen/_openapi_sha

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2f10a6ab001e2fa2552f6b25f7fbb4a08014a43f
1+
4ad0f0856225e3ebc6bb11392d09d63a19e6d140

.github/workflows/tagging.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ on:
66
workflow_dispatch:
77
# No inputs are required for the manual dispatch.
88

9-
# Runs at 8:00 UTC on Tuesday, Wednesday, and Thursday. To enable automated
9+
# Runs at 8:00 UTC on Monday, Tuesday, Wednesday, and Thursday. To enable automated
1010
# tagging for a repository, simply add it to the if block of the tag job.
1111
schedule:
12-
- cron: '0 8 * * TUE,WED,THU'
12+
- cron: '0 8 * * MON,TUE,WED,THU'
1313

1414
# Ensure that only a single instance of the workflow is running at a time.
1515
concurrency:

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,3 +57,5 @@ go.work.sum
5757

5858
# Fetched based on recorded hash
5959
.codegen/openapi.json
60+
61+
.claude/settings.local.json

NEXT_CHANGELOG.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,4 @@
88
* Modify grants to use SDK types ([#4666](https://github.com/databricks/cli/pull/4666))
99

1010
### Dependency updates
11-
12-
### API Changes
11+
- Bump databricks-sdk-go from v0.112.0 to v0.117.0.

acceptance/bundle/config-remote-sync/job_fields/databricks.yml.tmpl

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,18 @@ resources:
2222
environment_version: "3"
2323
dependencies:
2424
- ./*.whl
25+
job_clusters:
26+
- job_cluster_key: test_cluster
27+
new_cluster:
28+
spark_version: $DEFAULT_SPARK_VERSION
29+
node_type_id: $NODE_TYPE_ID
30+
num_workers: 1
2531
tasks:
2632
- task_key: main
33+
notebook_task:
34+
notebook_path: /Users/{{workspace_user_name}}/notebook
35+
job_cluster_key: test_cluster
36+
- task_key: inline_cluster_task
2737
notebook_task:
2838
notebook_path: /Users/{{workspace_user_name}}/notebook
2939
new_cluster:

acceptance/bundle/config-remote-sync/job_fields/output.txt

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,11 @@ Detected changes in 1 resource(s):
1212
Resource: resources.jobs.my_job
1313
email_notifications.no_alert_for_skipped_runs: add
1414
email_notifications.on_failure: add
15+
job_clusters[0].job_cluster_key: replace
1516
parameters: replace
1617
tags['team']: add
18+
tasks[task_key='inline_cluster_task'].new_cluster.num_workers: replace
19+
tasks[task_key='main'].job_cluster_key: replace
1720
trigger.pause_status: add
1821
trigger.periodic: remove
1922
trigger.table_update: add
@@ -52,9 +55,25 @@ Resource: resources.jobs.my_job
5255
+ - samples.nyctaxi.trips
5356
environments:
5457
- environment_key: default
55-
@@ -31,4 +37,6 @@
58+
@@ -24,5 +30,5 @@
59+
- ./*.whl
60+
job_clusters:
61+
- - job_cluster_key: test_cluster
62+
+ - job_cluster_key: test_cluster_renamed
63+
new_cluster:
64+
spark_version: [[DEFAULT_SPARK_VERSION]]
65+
@@ -33,5 +39,5 @@
66+
notebook_task:
67+
notebook_path: /Users/{{workspace_user_name}}/notebook
68+
- job_cluster_key: test_cluster
69+
+ job_cluster_key: test_cluster_renamed
70+
- task_key: inline_cluster_task
71+
notebook_task:
72+
@@ -40,5 +46,7 @@
73+
spark_version: [[DEFAULT_SPARK_VERSION]]
5674
node_type_id: [NODE_TYPE_ID]
57-
num_workers: 1
75+
- num_workers: 1
76+
+ num_workers: 2
5877
+ tags:
5978
+ team: data
6079

acceptance/bundle/config-remote-sync/job_fields/script

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
#!/bin/bash
22

33
envsubst < databricks.yml.tmpl > databricks.yml
4+
add_repl.py "$DEFAULT_SPARK_VERSION" "[DEFAULT_SPARK_VERSION]"
5+
add_repl.py "$NODE_TYPE_ID" "[NODE_TYPE_ID]"
46

57
cleanup() {
68
trace $CLI bundle destroy --auto-approve
@@ -20,6 +22,16 @@ r["email_notifications"]["no_alert_for_skipped_runs"] = True
2022
r["parameters"].append({"name": "region", "default": "us-east-1"})
2123
r["trigger"] = {"pause_status": "UNPAUSED", "table_update": {"table_names": ["samples.nyctaxi.trips"]}}
2224
25+
for cluster in r.get("job_clusters", []):
26+
if cluster.get("job_cluster_key") == "test_cluster":
27+
cluster["job_cluster_key"] = "test_cluster_renamed"
28+
for task in r.get("tasks", []):
29+
if task.get("task_key") == "inline_cluster_task" and "new_cluster" in task:
30+
task["new_cluster"]["num_workers"] = 2
31+
for task in r.get("tasks", []):
32+
if task.get("job_cluster_key") == "test_cluster":
33+
task["job_cluster_key"] = "test_cluster_renamed"
34+
2335
if "tags" not in r:
2436
r["tags"] = {}
2537
r["tags"]["team"] = "data"

acceptance/bundle/refschema/out.fields.txt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,10 @@ resources.apps.*.resources[*].job *apps.AppResourceJob ALL
188188
resources.apps.*.resources[*].job.id string ALL
189189
resources.apps.*.resources[*].job.permission apps.AppResourceJobJobPermission ALL
190190
resources.apps.*.resources[*].name string ALL
191+
resources.apps.*.resources[*].postgres *apps.AppResourcePostgres ALL
192+
resources.apps.*.resources[*].postgres.branch string ALL
193+
resources.apps.*.resources[*].postgres.database string ALL
194+
resources.apps.*.resources[*].postgres.permission apps.AppResourcePostgresPostgresPermission ALL
191195
resources.apps.*.resources[*].secret *apps.AppResourceSecret ALL
192196
resources.apps.*.resources[*].secret.key string ALL
193197
resources.apps.*.resources[*].secret.permission apps.AppResourceSecretSecretPermission ALL
@@ -2267,9 +2271,11 @@ resources.pipelines.*.development bool ALL
22672271
resources.pipelines.*.dry_run bool ALL
22682272
resources.pipelines.*.edition string ALL
22692273
resources.pipelines.*.effective_budget_policy_id string REMOTE
2274+
resources.pipelines.*.effective_publishing_mode pipelines.PublishingMode REMOTE
22702275
resources.pipelines.*.environment *pipelines.PipelinesEnvironment ALL
22712276
resources.pipelines.*.environment.dependencies []string ALL
22722277
resources.pipelines.*.environment.dependencies[*] string ALL
2278+
resources.pipelines.*.environment.environment_version string ALL
22732279
resources.pipelines.*.event_log *pipelines.EventLogSpec ALL
22742280
resources.pipelines.*.event_log.catalog string ALL
22752281
resources.pipelines.*.event_log.name string ALL
@@ -2616,6 +2622,7 @@ resources.postgres_projects.*.default_endpoint_settings.pg_settings map[string]s
26162622
resources.postgres_projects.*.default_endpoint_settings.pg_settings.* string INPUT STATE
26172623
resources.postgres_projects.*.default_endpoint_settings.suspend_timeout_duration *duration.Duration INPUT STATE
26182624
resources.postgres_projects.*.display_name string INPUT STATE
2625+
resources.postgres_projects.*.enable_pg_native_login bool INPUT STATE
26192626
resources.postgres_projects.*.history_retention_duration *duration.Duration INPUT STATE
26202627
resources.postgres_projects.*.id string INPUT
26212628
resources.postgres_projects.*.initial_endpoint_spec *postgres.InitialEndpointSpec REMOTE
@@ -2649,6 +2656,7 @@ resources.postgres_projects.*.spec.default_endpoint_settings.pg_settings map[str
26492656
resources.postgres_projects.*.spec.default_endpoint_settings.pg_settings.* string REMOTE
26502657
resources.postgres_projects.*.spec.default_endpoint_settings.suspend_timeout_duration *duration.Duration REMOTE
26512658
resources.postgres_projects.*.spec.display_name string REMOTE
2659+
resources.postgres_projects.*.spec.enable_pg_native_login bool REMOTE
26522660
resources.postgres_projects.*.spec.history_retention_duration *duration.Duration REMOTE
26532661
resources.postgres_projects.*.spec.pg_version int REMOTE
26542662
resources.postgres_projects.*.status *postgres.ProjectStatus REMOTE
@@ -2666,6 +2674,7 @@ resources.postgres_projects.*.status.default_endpoint_settings.pg_settings map[s
26662674
resources.postgres_projects.*.status.default_endpoint_settings.pg_settings.* string REMOTE
26672675
resources.postgres_projects.*.status.default_endpoint_settings.suspend_timeout_duration *duration.Duration REMOTE
26682676
resources.postgres_projects.*.status.display_name string REMOTE
2677+
resources.postgres_projects.*.status.enable_pg_native_login bool REMOTE
26692678
resources.postgres_projects.*.status.history_retention_duration *duration.Duration REMOTE
26702679
resources.postgres_projects.*.status.owner string REMOTE
26712680
resources.postgres_projects.*.status.pg_version int REMOTE

bundle/direct/dresources/pipeline.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ type PipelineRemote struct {
2020
ClusterId string `json:"cluster_id,omitempty"`
2121
CreatorUserName string `json:"creator_user_name,omitempty"`
2222
EffectiveBudgetPolicyId string `json:"effective_budget_policy_id,omitempty"`
23+
EffectivePublishingMode pipelines.PublishingMode `json:"effective_publishing_mode,omitempty"`
2324
Health pipelines.GetPipelineResponseHealth `json:"health,omitempty"`
2425
LastModified int64 `json:"last_modified,omitempty"`
2526
LatestUpdates []pipelines.UpdateStateInfo `json:"latest_updates,omitempty"`
@@ -111,6 +112,7 @@ func makePipelineRemote(p *pipelines.GetPipelineResponse) *PipelineRemote {
111112
ClusterId: p.ClusterId,
112113
CreatorUserName: p.CreatorUserName,
113114
EffectiveBudgetPolicyId: p.EffectiveBudgetPolicyId,
115+
EffectivePublishingMode: p.EffectivePublishingMode,
114116
Health: p.Health,
115117
LastModified: p.LastModified,
116118
LatestUpdates: p.LatestUpdates,

bundle/direct/dresources/postgres_project.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ func (*ResourcePostgresProject) RemapState(remote *postgres.Project) *PostgresPr
4242
CustomTags: nil,
4343
DefaultEndpointSettings: nil,
4444
DisplayName: "",
45+
EnablePgNativeLogin: false,
4546
HistoryRetentionDuration: nil,
4647
PgVersion: 0,
4748
ForceSendFields: nil,

0 commit comments

Comments
 (0)