Skip to content

Match keyed slices by value via a type registry #6757

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
denik wants to merge 8 commits into
base: main
Choose a base branch
from
Draft

Match keyed slices by value via a type registry #6757

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c320a9e
Match keyed slices by value in structdiff, ignoring the key field
denik Sep 17, 2026
81b990d
Match keyed slices by value via a type registry
denik Sep 18, 2026
a7fafd3
Add changelog fragment
denik Sep 18, 2026
6e06655
Regenerate golden after rebase (grants remove_principal_manage)
denik Sep 21, 2026
61618cf
Resolve keyed-slice key fields by type in configsync and structaccess
denik Sep 21, 2026
2b2a144
Harden registry: normalize pointer types and require string dominant …
denik Sep 21, 2026
0caed16
Make registry a pure key-name store; read key values via structaccess
denik Sep 21, 2026
ee2d517
Address empty key values so [='value'] stays resolvable
denik Sep 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .nextchanges/bundles/6757.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* direct: Fix a spurious `permissions` update reported on every plan and deploy when a service principal is declared under `user_name` and the Permissions API returns it as `service_principal_name`. Keyed-slice elements in `bundle plan --output json` are now addressed by value as `[='value']` instead of `[field='value']`. ([#6757](https://github.com/databricks/cli/pull/6757))
18 changes: 9 additions & 9 deletions acceptance/bundle/artifacts/whl_dynamic/out.plan_update.direct.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,50 +159,50 @@
"reason": "empty",
"remote": {}
},
"environments[environment_key='test_env'].spec.dependencies[0]": {
"environments[='test_env'].spec.dependencies[0]": {
"action": "update",
"old": "/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/artifacts/.internal/my_test_code-0.0.1+[UNIX_TIME_NANOS][2]-py3-none-any.whl",
"new": "/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/artifacts/.internal/my_test_code-0.0.1+[UNIX_TIME_NANOS][0]-py3-none-any.whl",
"remote": "/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/artifacts/.internal/my_test_code-0.0.1+[UNIX_TIME_NANOS][2]-py3-none-any.whl"
},
"tasks[task_key='ServerlessTestTask'].email_notifications": {
"tasks[='ServerlessTestTask'].email_notifications": {
"action": "skip",
"reason": "empty",
"remote": {}
},
"tasks[task_key='ServerlessTestTask'].run_if": {
"tasks[='ServerlessTestTask'].run_if": {
"action": "skip",
"reason": "backend_default",
"remote": "ALL_SUCCESS"
},
"tasks[task_key='ServerlessTestTask'].timeout_seconds": {
"tasks[='ServerlessTestTask'].timeout_seconds": {
"action": "skip",
"reason": "empty",
"remote": 0
},
"tasks[task_key='TestTask'].email_notifications": {
"tasks[='TestTask'].email_notifications": {
"action": "skip",
"reason": "empty",
"remote": {}
},
"tasks[task_key='TestTask'].for_each_task.task.libraries[0].whl": {
"tasks[='TestTask'].for_each_task.task.libraries[0].whl": {
"action": "update",
"old": "/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/artifacts/.internal/my_test_code-0.0.1+[UNIX_TIME_NANOS][2]-py3-none-any.whl",
"new": "/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/artifacts/.internal/my_test_code-0.0.1+[UNIX_TIME_NANOS][0]-py3-none-any.whl",
"remote": "/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/artifacts/.internal/my_test_code-0.0.1+[UNIX_TIME_NANOS][2]-py3-none-any.whl"
},
"tasks[task_key='TestTask'].libraries[0].whl": {
"tasks[='TestTask'].libraries[0].whl": {
"action": "update",
"old": "/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/artifacts/.internal/my_test_code-0.0.1+[UNIX_TIME_NANOS][2]-py3-none-any.whl",
"new": "/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/artifacts/.internal/my_test_code-0.0.1+[UNIX_TIME_NANOS][0]-py3-none-any.whl",
"remote": "/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/artifacts/.internal/my_test_code-0.0.1+[UNIX_TIME_NANOS][2]-py3-none-any.whl"
},
"tasks[task_key='TestTask'].run_if": {
"tasks[='TestTask'].run_if": {
"action": "skip",
"reason": "backend_default",
"remote": "ALL_SUCCESS"
},
"tasks[task_key='TestTask'].timeout_seconds": {
"tasks[='TestTask'].timeout_seconds": {
"action": "skip",
"reason": "empty",
"remote": 0
Expand Down
2 changes: 1 addition & 1 deletion acceptance/bundle/config-remote-sync/cluster_policy_remote_addition/output.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
Detected changes in 1 resource(s):

Resource: resources.jobs.test_job
tasks[task_key='test'].new_cluster.spark_conf: add
tasks[='test'].new_cluster.spark_conf: add



Expand Down
10 changes: 5 additions & 5 deletions acceptance/bundle/config-remote-sync/job_fields/output.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ Detected changes in 1 resource(s):
Resource: resources.jobs.my_job
email_notifications.no_alert_for_skipped_runs: add
email_notifications.on_failure: add
job_clusters[job_cluster_key='test_cluster']: remove
job_clusters[job_cluster_key='test_cluster_renamed']: add
job_clusters[='test_cluster']: remove
job_clusters[='test_cluster_renamed']: add
name: replace
parameters[name='region']: add
parameters[='region']: add
tags['team']: add
tasks[task_key='inline_cluster_task'].new_cluster.num_workers: replace
tasks[task_key='main'].job_cluster_key: replace
tasks[='inline_cluster_task'].new_cluster.num_workers: replace
tasks[='main'].job_cluster_key: replace
trigger.pause_status: add
trigger.periodic: remove
trigger.table_update: add
Expand Down
28 changes: 14 additions & 14 deletions acceptance/bundle/config-remote-sync/job_multiple_tasks/output.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ Resources: 3 created, 0 changed, 0 deleted, 0 unchanged
Detected changes in 2 resource(s):

Resource: resources.jobs.my_job
tasks[task_key='c_task'].depends_on[task_key='b_task']: add
tasks[task_key='c_task'].depends_on[task_key='d_task']: remove
tasks[task_key='c_task'].new_cluster.num_workers: replace
tasks[task_key='c_task'].timeout_seconds: add
tasks[task_key='d_task']: remove
tasks[task_key='e_task']: add
tasks[='c_task'].depends_on[='b_task']: add
tasks[='c_task'].depends_on[='d_task']: remove
tasks[='c_task'].new_cluster.num_workers: replace
tasks[='c_task'].timeout_seconds: add
tasks[='d_task']: remove
tasks[='e_task']: add

Resource: resources.jobs.no_tasks_job
tasks: add
Expand Down Expand Up @@ -81,14 +81,14 @@ Resource: resources.jobs.no_tasks_job
Detected changes in 1 resource(s):

Resource: resources.jobs.rename_task_job
tasks[task_key='a_task'].notebook_task.notebook_path: replace
tasks[task_key='b_task']: remove
tasks[task_key='b_task_renamed']: add
tasks[task_key='c_task'].depends_on[task_key='b_task']: remove
tasks[task_key='c_task'].depends_on[task_key='b_task_renamed']: add
tasks[task_key='d_task'].depends_on[task_key='b_task']: remove
tasks[task_key='d_task'].depends_on[task_key='b_task_renamed']: add
tasks[task_key='synced_task']: add
tasks[='a_task'].notebook_task.notebook_path: replace
tasks[='b_task']: remove
tasks[='b_task_renamed']: add
tasks[='c_task'].depends_on[='b_task']: remove
tasks[='c_task'].depends_on[='b_task_renamed']: add
tasks[='d_task'].depends_on[='b_task']: remove
tasks[='d_task'].depends_on[='b_task_renamed']: add
tasks[='synced_task']: add



Expand Down
2 changes: 1 addition & 1 deletion acceptance/bundle/config-remote-sync/job_params_variables/output.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
Detected changes in 1 resource(s):

Resource: resources.jobs.my_job
parameters[name='region']: add
parameters[='region']: add



Expand Down
2 changes: 1 addition & 1 deletion acceptance/bundle/config-remote-sync/job_pipeline_task/output.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
Detected changes in 2 resource(s):

Resource: resources.jobs.my_job
tasks[task_key='run_pipeline'].pipeline_task.full_refresh: replace
tasks[='run_pipeline'].pipeline_task.full_refresh: replace

Resource: resources.pipelines.my_pipeline
continuous: add
Expand Down
18 changes: 9 additions & 9 deletions acceptance/bundle/config-remote-sync/multiple_files/output.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,18 @@ Detected changes in 2 resource(s):

Resource: resources.jobs.job_one
max_concurrent_runs: replace
tasks[task_key='a_task'].depends_on[task_key='c_task']: remove
tasks[task_key='a_task'].depends_on[task_key='c_task_renamed']: add
tasks[task_key='c_task']: remove
tasks[task_key='c_task_renamed']: add
tasks[task_key='synced_task']: add
tasks[='a_task'].depends_on[='c_task']: remove
tasks[='a_task'].depends_on[='c_task_renamed']: add
tasks[='c_task']: remove
tasks[='c_task_renamed']: add
tasks[='synced_task']: add

Resource: resources.jobs.job_two
max_concurrent_runs: replace
tasks[task_key='extra_task']: replace
tasks[task_key='extra_task'].new_cluster: add
tasks[task_key='run_pipeline']: remove
tasks[task_key='run_pipeline_renamed']: add
tasks[='extra_task']: replace
tasks[='extra_task'].new_cluster: add
tasks[='run_pipeline']: remove
tasks[='run_pipeline_renamed']: add



Expand Down
28 changes: 14 additions & 14 deletions acceptance/bundle/config-remote-sync/resolve_variables/output.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,22 +10,22 @@ Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
Detected changes in 2 resource(s):

Resource: resources.jobs.my_job
environments[environment_key='default'].spec.dependencies: replace
environments[environment_key='secondary']: add
parameters[name='catalog'].default: replace
parameters[name='data_catalog']: add
parameters[name='deploy_env']: add
parameters[name='deploy_target']: add
parameters[name='env'].default: replace
parameters[name='file_sourced']: add
parameters[name='region']: add
parameters[name='some_schema']: add
environments[='default'].spec.dependencies: replace
environments[='secondary']: add
parameters[='catalog'].default: replace
parameters[='data_catalog']: add
parameters[='deploy_env']: add
parameters[='deploy_target']: add
parameters[='env'].default: replace
parameters[='file_sourced']: add
parameters[='region']: add
parameters[='some_schema']: add
tags['deployment']: add
tags['dev']: remove
tasks[task_key='main'].notebook_task.base_parameters['source_path']: replace
tasks[task_key='run_pipeline'].pipeline_task.full_refresh: replace
tasks[task_key='run_pipeline_again']: add
tasks[task_key='secondary']: add
tasks[='main'].notebook_task.base_parameters['source_path']: replace
tasks[='run_pipeline'].pipeline_task.full_refresh: replace
tasks[='run_pipeline_again']: add
tasks[='secondary']: add

Resource: resources.pipelines.my_pipeline
environment.dependencies: replace
Expand Down
2 changes: 1 addition & 1 deletion acceptance/bundle/config-remote-sync/split/cli_default_split_element/output.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
Detected changes in 1 resource(s):

Resource: resources.jobs.cli_default_job
tasks[task_key='shared'].existing_cluster_id: add
tasks[='shared'].existing_cluster_id: add



Expand Down
2 changes: 1 addition & 1 deletion acceptance/bundle/config-remote-sync/split/dotted_target/output.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
Detected changes in 1 resource(s):

Resource: resources.jobs.dotted_job
tasks[task_key='main'].timeout_seconds: replace
tasks[='main'].timeout_seconds: replace



Expand Down
4 changes: 2 additions & 2 deletions acceptance/bundle/config-remote-sync/split/isolation/output.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
Detected changes in 2 resource(s):

Resource: resources.jobs.job_a
tasks[task_key='shared']: remove
tasks[task_key='shared_renamed']: add
tasks[='shared']: remove
tasks[='shared_renamed']: add

Resource: resources.jobs.job_b
max_concurrent_runs: replace
Expand Down
4 changes: 2 additions & 2 deletions acceptance/bundle/config-remote-sync/split/keyed_edit/output.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
Detected changes in 1 resource(s):

Resource: resources.jobs.split_job
tasks[task_key='alpha'].timeout_seconds: add
tasks[='alpha'].timeout_seconds: add



Expand All @@ -27,7 +27,7 @@ Resource: resources.jobs.split_job
Detected changes in 1 resource(s):

Resource: resources.jobs.split_job
tasks[task_key='mu'].timeout_seconds: add
tasks[='mu'].timeout_seconds: add



Expand Down
6 changes: 3 additions & 3 deletions acceptance/bundle/config-remote-sync/split/keyed_remove/output.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
Detected changes in 1 resource(s):

Resource: resources.jobs.remove_job
tasks[task_key='alpha']: remove
tasks[task_key='gamma']: remove
tasks[='alpha']: remove
tasks[='gamma']: remove



Expand Down Expand Up @@ -43,7 +43,7 @@ Resource: resources.jobs.remove_job
Detected changes in 1 resource(s):

Resource: resources.jobs.twoblock_remove_job
tasks[task_key='both']: remove
tasks[='both']: remove



Expand Down
20 changes: 10 additions & 10 deletions acceptance/bundle/config-remote-sync/split/keyed_rename/output.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
Detected changes in 1 resource(s):

Resource: resources.jobs.rename_job
tasks[task_key='a_shared']: add
tasks[task_key='shared']: remove
tasks[task_key='solo']: remove
tasks[task_key='z_solo']: add
tasks[='a_shared']: add
tasks[='shared']: remove
tasks[='solo']: remove
tasks[='z_solo']: add



Expand Down Expand Up @@ -50,9 +50,9 @@ Resource: resources.jobs.rename_job
Detected changes in 1 resource(s):

Resource: resources.jobs.shift_job
tasks[task_key='aaa']: remove
tasks[task_key='mmm']: remove
tasks[task_key='mmm2']: add
tasks[='aaa']: remove
tasks[='mmm']: remove
tasks[='mmm2']: add



Expand All @@ -79,9 +79,9 @@ Resource: resources.jobs.shift_job
Detected changes in 1 resource(s):

Resource: resources.jobs.rename_job
tasks[task_key='a_shared']: remove
tasks[task_key='b_shared']: add
tasks[task_key='z_solo']: replace
tasks[='a_shared']: remove
tasks[='b_shared']: add
tasks[='z_solo']: replace



Expand Down
8 changes: 4 additions & 4 deletions acceptance/bundle/config-remote-sync/split/keyed_twoblock/output.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
Detected changes in 1 resource(s):

Resource: resources.jobs.twoblock_job
tasks[task_key='omega'].timeout_seconds: add
tasks[='omega'].timeout_seconds: add



Expand All @@ -27,9 +27,9 @@ Resource: resources.jobs.twoblock_job
Detected changes in 1 resource(s):

Resource: resources.jobs.twoblock_job
tasks[task_key='shared'].max_retries: replace
tasks[task_key='shared'].min_retry_interval_millis: add
tasks[task_key='shared'].timeout_seconds: replace
tasks[='shared'].max_retries: replace
tasks[='shared'].min_retry_interval_millis: add
tasks[='shared'].timeout_seconds: replace



Expand Down
8 changes: 4 additions & 4 deletions acceptance/bundle/config-remote-sync/split/multifile/output.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
Detected changes in 1 resource(s):

Resource: resources.jobs.multifile_job
tasks[task_key='from_second_file'].timeout_seconds: add
tasks[='from_second_file'].timeout_seconds: add



Expand Down Expand Up @@ -37,8 +37,8 @@ Resource: resources.jobs.multifile_job
Detected changes in 1 resource(s):

Resource: resources.jobs.multifile_job
tasks[task_key='in_both_files'].max_retries: replace
tasks[task_key='in_both_files'].timeout_seconds: replace
tasks[='in_both_files'].max_retries: replace
tasks[='in_both_files'].timeout_seconds: replace



Expand Down Expand Up @@ -71,7 +71,7 @@ Resource: resources.jobs.multifile_job
Detected changes in 1 resource(s):

Resource: resources.jobs.multifile_job
tasks[task_key='same_field_both_files'].max_retries: replace
tasks[='same_field_both_files'].max_retries: replace



Expand Down
4 changes: 2 additions & 2 deletions acceptance/bundle/config-remote-sync/split/nested_add_split_parent/output.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
Detected changes in 1 resource(s):

Resource: resources.jobs.nested_add_job
tasks[task_key='mid_new']: add
tasks[task_key='zzz_shared'].depends_on[task_key='mid_new']: add
tasks[='mid_new']: add
tasks[='zzz_shared'].depends_on[='mid_new']: add



Expand Down
2 changes: 1 addition & 1 deletion acceptance/bundle/config-remote-sync/split/nested_sequence/output.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
Detected changes in 1 resource(s):

Resource: resources.jobs.nested_job
tasks[task_key='second'].libraries: replace
tasks[='second'].libraries: replace



Expand Down
Loading
Loading