Skip to content

support $${...} escape for literal ${...} in bundle configs #6484

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

Merged
denik merged 11 commits into from
Sep 2, 2026
Merged

support $${...} escape for literal ${...} in bundle configs #6484

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
b92af44
Add acceptance test for $${...} escape in bundle variable references
denik Sep 2, 2026
bdcd857
Support $${...} escape for literal ${...} in bundle configs
denik Sep 2, 2026
afb9e3b
Add job_escaped_refs invariant config; include issue's exact reproducer
denik Sep 2, 2026
c66a43f
Use verbatim config from the issue in both test fixtures
denik Sep 2, 2026
f89697f
Drop redundant variables/escape validate test
denik Sep 2, 2026
cf01033
Regen invariant out.test.toml with job_escaped_refs
denik Sep 2, 2026
9f6901f
acc: document $${resources.X} escape limitation in resource_deps
denik Sep 2, 2026
2a78b25
Show depends_on from JSON plan in escaped_ref test
denik Sep 2, 2026
760199a
Unescape $${...} at payload construction instead of during resolution
denik Sep 2, 2026
4659350
Restore resource_deps/escaped_ref as a regression guard
denik Sep 2, 2026
c22ba90
Add READPLAN variant to both escape deploy tests
denik Sep 2, 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
Prev Previous commit
Next Next commit
Add job_escaped_refs invariant config; include issue's exact reproducer 
Add acceptance/bundle/invariant/configs/job_escaped_refs.yml.tmpl to
exercise $${...} escaping through the full plan+deploy path (the
invariant no_drift test). Also include the verbatim reproducer from
the issue (option_a: $${test_var}) in the variables/escape validate test.

Co-authored-by: Isaac
  • Loading branch information
@denik
denik committed Sep 2, 2026
commit afb9e3bedc978e85836dae9178498bae1312da3a
20 changes: 20 additions & 0 deletions acceptance/bundle/invariant/configs/job_escaped_refs.yml.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
bundle:
name: test-bundle-$UNIQUE_NAME

variables:
catalog:
default: main

resources:
jobs:
foo:
name: test-job-$UNIQUE_NAME
tasks:
- task_key: only_task
notebook_task:
notebook_path: /Shared/notebook
base_parameters:
option_a: $${test_var}
catalog: ${var.catalog}
source_file: $${source_file}
date_range: $${business_date[0..9]}
1 change: 1 addition & 0 deletions acceptance/bundle/invariant/no_drift/out.test.toml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions acceptance/bundle/invariant/test.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ EnvMatrix.INPUT_CONFIG = [
"job_pydabs_10_tasks.yml.tmpl",
"job_pydabs_1000_tasks.yml.tmpl",
"job_cross_resource_ref.yml.tmpl",
"job_escaped_refs.yml.tmpl",
"job_permission_ref.yml.tmpl",
"job_run.yml.tmpl",
"job_run_job_ref.yml.tmpl",
Expand Down
8 changes: 4 additions & 4 deletions acceptance/bundle/variables/escape/databricks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ resources:
notebook_task:
notebook_path: /notebooks/ingest
base_parameters:
# $${...} is the escape for a literal ${...} that the Databricks
# runtime should interpret, not the bundle variable system.
# Mixed: ${var.catalog} is a real bundle variable; $${source_file}
# is a literal that should reach the API as "${source_file}".
# Verbatim from the issue: pure escaped reference
option_a: $${test_var}
# Mixed: real bundle variable alongside escaped runtime placeholders
catalog: ${var.catalog}
source_file: $${source_file}
# Escaped reference with brackets (common in date-range patterns)
date_range: $${business_date[0..9]}
1 change: 1 addition & 0 deletions acceptance/bundle/variables/escape/output.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@
{
"catalog": "main",
"date_range": "${business_date[0..9]}",
"option_a": "${test_var}",
"source_file": "${source_file}"
}
2 changes: 1 addition & 1 deletion libs/dyn/dynvar/ref.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ func NewRef(v dyn.Value) (Ref, bool) {
match := make([]string, len(idx)/2)
for i := range len(idx) / 2 {
if idx[2*i] >= 0 {
match[i] = s[idx[2*i] : idx[2*i+1]]
match[i] = s[idx[2*i]:idx[2*i+1]]
}
}
m = append(m, match)
Expand Down
Loading