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

fix(x/upgrade): Stop treating inline JSON as a URL (backport #19706) #19767

Merged
merged 2 commits into from
Mar 18, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 16, 2024

Description

Closes: #19686

Detect URLs with ParseRequestURI rather than Parse, since the former is limited to absolute URLs while the latter recognizes undesirable input such as {}.


Author Checklist

All items are required. Please add a note to the item if the item is not applicable and
please add links to any relevant follow up issues.

I have...

  • included the correct type prefix in the PR title
  • confirmed ! in the type prefix if API or client breaking change
  • targeted the correct branch (see PR Targeting)
  • provided a link to the relevant issue or specification
  • reviewed "Files changed" and left comments if necessary
  • included the necessary unit and integration tests
  • added a changelog entry to CHANGELOG.md
  • updated the relevant documentation or specification, including comments for documenting Go code
  • confirmed all CI checks have passed

Reviewers Checklist

All items are required. Please add a note if the item is not applicable and please add
your handle next to the items reviewed if you only reviewed selected items.

I have...

  • confirmed the correct type prefix in the PR title
  • confirmed all author checklist items have been addressed
  • reviewed state machine logic, API design and naming, documentation is accurate, tests and test coverage

Summary by CodeRabbit

  • Bug Fixes
    • Fixed an issue where inline JSON was not correctly treated as a URL during parsing.
    • Added a new test case to ensure empty JSON objects are parsed correctly without errors.

This is an automatic backport of pull request #19706 done by [Mergify](https://mergify.com).

Co-authored-by: Julien Robert <julien@rbrt.fr>
(cherry picked from commit 5a733e8)

# Conflicts:
#	x/upgrade/CHANGELOG.md
@mergify mergify bot requested a review from a team as a code owner March 16, 2024 00:40
@mergify mergify bot added the conflicts label Mar 16, 2024
Copy link
Contributor Author

mergify bot commented Mar 16, 2024

Cherry-pick of 5a733e8 has failed:

On branch mergify/bp/release/v0.50.x/pr-19706
Your branch is up to date with 'origin/release/v0.50.x'.

You are currently cherry-picking commit 5a733e81d.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   x/upgrade/plan/info.go
	modified:   x/upgrade/plan/info_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   x/upgrade/CHANGELOG.md

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@tac0turtle tac0turtle enabled auto-merge (squash) March 18, 2024 10:01
@@ -25,6 +25,10 @@ Ref: https://keepachangelog.com/en/1.0.0/

## [Unreleased]

### Bug Fixes
Copy link
Member

Choose a reason for hiding this comment

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

note to myself, next release run, test and tag v0.1.2

@tac0turtle tac0turtle merged commit 0df2902 into release/v0.50.x Mar 18, 2024
47 of 48 checks passed
@tac0turtle tac0turtle deleted the mergify/bp/release/v0.50.x/pr-19706 branch March 18, 2024 12:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants