fix(coderd): change the order of precedence between coder_workspace_tags and request tags #16119
Conversation
This file contains hidden or 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
mafredri
approved these changes
Jan 14, 2025
| @@ -355,10 +355,11 @@ func TestPostTemplateVersionsByOrganization(t *testing.T) { | |||
| wantTags: map[string]string{"owner": "", "scope": "organization", "foo": "bar", "a": "1", "b": "2"}, | |||
| }, | |||
| { | |||
| name: "main.tf with workspace tags and request tags", | |||
| name: "main.tf with request tags not clobbering workspace tags", | |||
There was a problem hiding this comment.
Is clobbering actually involved here? Since there's no two entries of the same tag the result is just a union.
There was a problem hiding this comment.
There's a test below that shows the actual clobbering behaviour. I guess "not clobbering" and "union" are similar enough in result but different enough in semantics to be confusing. But the tags are not a union, there is an order of precedence here that I'm trying to codify and demonstrate.
Emyrk
approved these changes
Jan 14, 2025
|
/cherry-pick release/2.18 |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
This PR switches the order of precedence of workspace tags when posting a template version.
Previously, user-specified tags in the request could not override those detected from our parsing of the template file. Now, they can do.
This addresses a customer issue where were attempting to set a workspace tag via variable.
Note: there is a possible follow-up item here where we could pass in the workspace tag values from the request into
tfparseand let it take those user-specified values into account. This is covered in a separate test.