Skip to content

fix: change precedence order between coder_workspace_tags and request_tags #16239

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.

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
merged 1 commit into from
Jan 23, 2025

Conversation

gcp-cherry-pick-bot[bot]
Copy link

Cherry-picked fix(coderd): change the order of precedence between coder_workspace_tags and request tags (#16119)

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 tfparse and let it take
those user-specified values into account. This is covered in a separate
test.

…ags and request tags (#16119)

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 `tfparse` and let it take
those user-specified values into account. This is covered in a separate
test.
@matifali matifali changed the title fix(coderd): change the order of precedence between coder_workspace_tags and request tags (cherry-pick #16119) fix(coderd): change precedence order between coder_workspace_tags and request tags (cherry-pick #16119) Jan 23, 2025
@matifali matifali changed the title fix(coderd): change precedence order between coder_workspace_tags and request tags (cherry-pick #16119) fix: change precedence order between coder_workspace_tags and request tags (cherry-pick #16119) Jan 23, 2025
@matifali matifali changed the title fix: change precedence order between coder_workspace_tags and request tags (cherry-pick #16119) fix: change precedence order between coder_workspace_tags and request_tags (cherry-pick #16119) Jan 23, 2025
@matifali matifali requested review from johnstcn and stirby January 23, 2025 11:52
@matifali matifali changed the title fix: change precedence order between coder_workspace_tags and request_tags (cherry-pick #16119) fix: change precedence order between coder_workspace_tags and request_tags Jan 23, 2025
Copy link
Member

@johnstcn johnstcn left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Before merging: I think we need to make sure the commit description includes (chery-picked from commit xxx)

@stirby
Copy link
Collaborator

stirby commented Jan 23, 2025

This format is acceptable.

@stirby stirby merged commit 803e2c7 into release/2.18 Jan 23, 2025
40 checks passed
@stirby stirby deleted the cherry-pick-f5b265-release/2.18 branch January 23, 2025 20:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants