Always stringify collection requirement versions #81694
Draft
+2
−0
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
Before this change, whenever a numeric version was specified in `requirements.yml`, the YAML parser would read it as `int` or `float` which would leak straight down into the dependency resolver. This patch makes an unconditional conversion of that data into `str` right before constructing `Requirement` objects. Fixes ansible#79109 Fixes ansible#78067
webknjaz
commented
Sep 13, 2023
| @@ -310,6 +310,8 @@ def from_string(cls, collection_input, artifacts_manager, supplemental_signature | |||
| def from_requirement_dict(cls, collection_req, art_mgr, validate_signature_options=True): | |||
| req_name = collection_req.get('name', None) | |||
| req_version = collection_req.get('version', '*') | |||
| if req_version is not None: | |||
| req_version = str(req_version) | |||
There was a problem hiding this comment.
@s-hertel have you considered just doing this bare minimum?
There was a problem hiding this comment.
I don't think it's applying to all the potential matches in the provider, is it? Needs some tests, have no idea if/what issues this is fixing.
There was a problem hiding this comment.
Yeah, I know about the tests. I was just pulling some things from my git stash and turning them into draft PRs so they don't rot there.
This is an attempt to address the case when requirements.yml has a version that is parsed by PyYAML as an int or a float causing TypeError tracebacks when some logic down the line assumes the ver attribute is always a string, calling str methods.
ansibot
added
bug
jborean93
removed
the
needs_triage
ansibot
added
the
stale_ci
ansibot
added
the
needs_ci
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.
Before this change, whenever a numeric version was specified in
requirements.yml, the YAML parser would read it asintorfloatwhich would leak straight down into the dependency resolver. This patch makes an unconditional conversion of that data intostrright before constructingRequirementobjects.Fixes #79109
Fixes #78067
SUMMARY
$sbj.
ISSUE TYPE
ADDITIONAL INFORMATION
N/A