Skip to content

chore: use correct method for finding missing versions of java PURLs #1156

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Aug 18, 2025
Merged

chore: use correct method for finding missing versions of java PURLs #1156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6d2a1f0
fix: use correct method for finding missing versions of java PURLs
benmss Aug 18, 2025
4ce2298
chore: update test with explanation
benmss Aug 18, 2025
6e87f23
chore: update test result
benmss Aug 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 11 additions & 15 deletions src/macaron/repo_finder/repo_finder_java.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,17 @@ def find_repo(self, purl: PackageURL) -> tuple[str, RepoFinderInfo]:
artifact = purl.name
version = purl.version or ""

outcome = RepoFinderInfo.FOUND
if not version:
logger.debug("Version missing for maven artifact: %s:%s", group, artifact)
# TODO add support for Java artifacts without a version
return "", RepoFinderInfo.NO_VERSION_PROVIDED
# TODO: consider using a Maven specific method for finding missing versions.
logger.info("Version missing for maven artifact: %s:%s", group, artifact)
latest_purl, outcome = DepsDevRepoFinder().get_latest_version(purl)
if not latest_purl or not latest_purl.version:
logger.debug("Could not find version for artifact: %s:%s", purl.namespace, purl.name)
return "", RepoFinderInfo.NO_VERSION_PROVIDED
group = latest_purl.namespace or ""
artifact = latest_purl.name
version = latest_purl.version

# Perform the following in a loop:
# - Create URLs for the current artifact POM
Expand All @@ -64,19 +71,8 @@ def find_repo(self, purl: PackageURL) -> tuple[str, RepoFinderInfo]:
# - Repeat
limit = defaults.getint("repofinder.java", "parent_limit", fallback=10)
initial_limit = limit
last_outcome = RepoFinderInfo.FOUND
last_outcome = outcome
check_parents = defaults.getboolean("repofinder.java", "find_parents")

if not version:
logger.info("Version missing for maven artifact: %s:%s", group, artifact)
latest_purl, outcome = DepsDevRepoFinder().get_latest_version(purl)
if not latest_purl or not latest_purl.version:
logger.debug("Could not find version for artifact: %s:%s", purl.namespace, purl.name)
return "", outcome
group = latest_purl.namespace or ""
artifact = latest_purl.name
version = latest_purl.version

while group and artifact and version and limit > 0:
# Create the URLs for retrieving the artifact's POM.
group = group.replace(".", "/")
Expand Down
8 changes: 6 additions & 2 deletions tests/integration/cases/repo_finder_remote_calls/repo_finder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,12 @@ def test_repo_finder() -> int:
return os.EX_UNAVAILABLE

# Test Java package that has no version.
match, outcome = find_repo(PackageURL.from_string("pkg:maven/io.vertx/vertx-auth-common"))
if not match or outcome != RepoFinderInfo.FOUND:
# Disabling the latest version check ensures that only the missing version is retrieved, preventing the fallback
# functionality of using the non-Java method to find the version and repository.
match, outcome = find_repo(
PackageURL.from_string("pkg:maven/io.vertx/vertx-auth-common"), check_latest_version=False
)
if not match or outcome != RepoFinderInfo.FOUND_FROM_PARENT:
return os.EX_UNAVAILABLE

return os.EX_OK
Expand Down
Loading