Skip to content
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

Backport of configgen: escape any invalid HCL syntax in map keys into v1.9 #35847

Merged
merged 1 commit into from
Oct 15, 2024

Conversation

github-actions[bot]
Copy link

Backport

This PR is auto-generated from #35837 to be assessed for backporting due to the inclusion of the label 1.9-backport.

🚨

Warning automatic cherry-pick of commits failed. If the first commit failed,
you will see a blank no-op commit below. If at least one commit succeeded, you
will see the cherry-picked commits up to, not including, the commit where
the merge conflict occurred.

The person who merged in the original PR is:
@liamcervante
This person should manually cherry-pick the original PR into a new backport PR,
and close this one when the manual backport PR is merged in.

merge conflict error: unable to process merge commit: "e068043c59717f6f1881c5ca04126f09b1ece851", automatic backport requires rebase workflow

The below text is copied from the body of the original PR.


This PR updates the config generation so that any invalid HCL syntax in generated map keys is escaped and not just whitespace.

Fixes #35752

Target Release

1.9.x

Draft CHANGELOG entry

BUG FIXES

  • config generation: Escape all invalid syntax in generate map keys with quotes.

Overview of commits

@github-actions github-actions bot force-pushed the backport/liamcervante/35752/gently-bright-eagle branch from 39a6471 to 7454e5a Compare October 14, 2024 08:36
@liamcervante
Copy link
Member

This cherry-pick is actually fine - it only failed the merge that was needed to make unrelated tests pass. These tests were never merged to this branch.

@liamcervante liamcervante marked this pull request as ready for review October 14, 2024 08:41
@liamcervante liamcervante merged commit 80e68d6 into v1.9 Oct 15, 2024
5 of 6 checks passed
@liamcervante liamcervante deleted the backport/liamcervante/35752/gently-bright-eagle branch October 15, 2024 08:59
Copy link
Author

Reminder for the merging maintainer: if this is a user-visible change, please update the changelog on the appropriate release branch.

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.

1 participant