-
Notifications
You must be signed in to change notification settings - Fork 5.5k
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
[3006.x] Fix find_json to not rely on newline after valid JSON #67023
Open
m-czernek
wants to merge
2
commits into
saltstack:3006.x
Choose a base branch
from
m-czernek:find-json-enhancement
base: 3006.x
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
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
salt-project-bot-prod-environment
bot
changed the title
Fix find_json to not rely on newline after valid JSON
[3006.x] Fix find_json to not rely on newline after valid JSON
Oct 31, 2024
3 tasks
twangboy
requested changes
Nov 6, 2024
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please add a changelog for this
m-czernek
force-pushed
the
find-json-enhancement
branch
from
November 7, 2024 08:28
5c71ea5
to
793314c
Compare
Thank you for taking a look @twangboy , chlog added. |
Once the testing pipeline is fixed you'll need to rebase this so the tests can run. Until then there's a pre-commit error. Looksl like you need to add |
m-czernek
force-pushed
the
find-json-enhancement
branch
from
November 12, 2024 08:27
793314c
to
c32b33e
Compare
bdrx312
reviewed
Nov 14, 2024
m-czernek
force-pushed
the
find-json-enhancement
branch
from
November 15, 2024 15:02
c32b33e
to
41024a3
Compare
bdrx312
reviewed
Nov 16, 2024
bdrx312
reviewed
Nov 16, 2024
bdrx312
reviewed
Nov 16, 2024
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.
What does this PR do?
In this PR, we enhance the
find_json
function to work with valid JSONs that contain garbage right after the JSON end. This is a problem when the text contains JSON and, for example, deprecation messages, such as:Previous Behavior
Previously, if the JSON contains text right after the closing parenthesis, we either get a ValueError, or we get a wrong return (in the example above, the return value is
"The x509 modules are deprecated. Please migrate to the replacement "
New Behavior
The
find_json
method is able to filter the text right after the closing parenthesis, and returns the valid JSON.Merge requirements satisfied?
[NOTICE] Bug fixes or features added to Salt require tests.
Commits signed with GPG?
Yes/No
Please review Salt's Contributing Guide for best practices, including the
PR Guidelines.
See GitHub's page on GPG signing for more information about signing commits with GPG.