Override complex variables with target overrides instead of merging #1567
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
pietern
reviewed
Jul 4, 2024
pietern
reviewed
Jul 4, 2024
| vDefault := variable.Get("default") | ||
| if vDefault.Kind() != dyn.KindInvalid { | ||
| defaultPath := varPath.Append(dyn.Key("default")) | ||
| root, err = dyn.SetByPath(root, defaultPath, vDefault) |
There was a problem hiding this comment.
If you define a variable in a target that is not defined at the root level, this will fail with a poor error message.
How can we best deal with this?
There was a problem hiding this comment.
We have a call to validateVariableOverrides prior to this which does this validation and returns variable X is not defined but is assigned a value
andrewnester
added a commit
that referenced
this pull request
Jul 10, 2024
Bundles: * Override complex variables with target overrides instead of merging ([#1567](#1567)). * Rewrite local path for libraries in foreach tasks ([#1569](#1569)). * Change SetVariables mutator to mutate dynamic configuration instead ([#1573](#1573)). * Return early in bundle destroy if no deployment exists ([#1581](#1581)). * Let notebook detection code use underlying metadata if available ([#1574](#1574)). * Remove schema override for variable default value ([#1536](#1536)). * Print diagnostics in 'bundle deploy' ([#1579](#1579)). Internal: * Update actions/upload-artifact to v4 ([#1559](#1559)). * Use Go 1.22 to build and test ([#1562](#1562)). * Move bespoke status call to main workspace files filer ([#1570](#1570)). * Add new template ([#1578](#1578)). * Add regression tests for CLI error output ([#1566](#1566)). Dependency updates: * Bump golang.org/x/mod from 0.18.0 to 0.19.0 ([#1576](#1576)). * Bump golang.org/x/term from 0.21.0 to 0.22.0 ([#1577](#1577)).
Merged
github-merge-queue bot
pushed a commit
that referenced
this pull request
Jul 10, 2024
Bundles: * Override complex variables with target overrides instead of merging ([#1567](#1567)). * Rewrite local path for libraries in foreach tasks ([#1569](#1569)). * Change SetVariables mutator to mutate dynamic configuration instead ([#1573](#1573)). * Return early in bundle destroy if no deployment exists ([#1581](#1581)). * Let notebook detection code use underlying metadata if available ([#1574](#1574)). * Remove schema override for variable default value ([#1536](#1536)). * Print diagnostics in 'bundle deploy' ([#1579](#1579)). Internal: * Update actions/upload-artifact to v4 ([#1559](#1559)). * Use Go 1.22 to build and test ([#1562](#1562)). * Move bespoke status call to main workspace files filer ([#1570](#1570)). * Add new template ([#1578](#1578)). * Add regression tests for CLI error output ([#1566](#1566)). Dependency updates: * Bump golang.org/x/mod from 0.18.0 to 0.19.0 ([#1576](#1576)). * Bump golang.org/x/term from 0.21.0 to 0.22.0 ([#1577](#1577)).
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Changes
At the moment we merge values of complex variables while more expected behaviour is overriding the value with the target one.
Tests
Added unit test