Fix Maven version parsing for non-numeric versions#339
Open
Vadim-Zenin wants to merge 1 commit into
Open
Conversation
fixes pulp#338 Signed-off-by: Vadim Zenin <3098552+Vadim-Zenin@users.noreply.github.com>
This file contains hidden or 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
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.
Problem
MavenContentMixin.group_artifact_version_filename()decides whether a pathcontains a version directory by matching the candidate segment against a
numeric-anchored regex (
re.match(r"\d+...")). Maven versions are free-form,so any version not starting with a digit —
RELEASE,master-SNAPSHOT,JIRA-tagged
INT-7144.1.0.2, etc. — is misclassified: the version segment istaken as the
artifactId,versionbecomesNone, and the upload fails witha NOT NULL violation → HTTP 500 on
PUT /pulp/maven/<distribution>/<path>.Fixes #
Fix
The content type is already known upstream
(
MavenRemote.get_remote_artifact_content_type()routes.xml*toMavenMetadata, everything else toMavenArtifact). A binary artifact instandard Maven layout always has a version directory, so the regex guess is
unnecessary and wrong there. This PR adds a
version_presentargument:MavenArtifactpassesversion_present=True— version directory is alwayspresent, no guessing.
MavenMetadataand any other caller keep the existing best-effort detection(default
version_present=None), so artifact-levelmaven-metadata.xml(which has no version directory) is unchanged.
No behavior change for numeric versions or for metadata; non-numeric artifact
versions now parse correctly.
Tests
Added
pulp_maven/tests/unit/test_path_parsing.pycovering numeric andnon-numeric versions plus the artifact-level-metadata (no-version) case.
Changelog
CHANGES/.bugfixadded.