Skip to content

Do not warn on duplicate entries if force_version set #1334

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

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Do not warn on duplicate entries if force_version set #1334

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
8822606
Do not warn on duplicate entries if force_version set
Feb 24, 2025
ba68854
Addressed feedback
Mar 11, 2025
88c0fbb
Handle dict type artifact in to_external_form
Mar 13, 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
10 changes: 10 additions & 0 deletions private/lib/coordinates.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,16 @@ def to_external_form(coords):

if type(coords) == "string":
unpacked = unpack_coordinates(coords)
elif type(coords) == "struct":
unpacked = coords
elif type(coords) == "dict":
unpacked = struct(
group = coords["group"],
artifact = coords["artifact"],
version = coords["version"],
packaging = coords.get("packaging"),
classifier = coords.get("classifier"),
)
else:
unpacked = coords

Expand Down
24 changes: 18 additions & 6 deletions private/rules/coursier.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ load(
"COURSIER_CLI_GITHUB_ASSET_URL",
"COURSIER_CLI_SHA256",
)
load("//private/lib:coordinates.bzl", "to_external_form")
load("//private/lib:urls.bzl", "remove_auth_from_url")
load("//private/rules:v1_lock_file.bzl", "v1_lock_file")
load("//private/rules:v2_lock_file.bzl", "v2_lock_file")
Expand Down Expand Up @@ -732,21 +733,32 @@ def _check_artifacts_are_unique(artifacts, duplicate_version_warning):
seen_artifacts = {}
duplicate_artifacts = {}
for artifact in artifacts:
artifact_coordinate = artifact["group"] + ":" + artifact["artifact"] + (":%s" % artifact["classifier"] if artifact.get("classifier") != None else "")
artifact_coordinate = to_external_form(artifact)
if artifact_coordinate in seen_artifacts:
# Don't warn if the same version is in the list multiple times
if seen_artifacts[artifact_coordinate] != artifact["version"]:
if seen_artifacts[artifact_coordinate]["version"] != artifact["version"]:
if artifact_coordinate in duplicate_artifacts:
duplicate_artifacts[artifact_coordinate].append(artifact["version"])
duplicate_artifacts[artifact_coordinate].append(artifact)
else:
duplicate_artifacts[artifact_coordinate] = [artifact["version"]]
duplicate_artifacts[artifact_coordinate] = [seen_artifacts[artifact_coordinate], artifact]
else:
seen_artifacts[artifact_coordinate] = artifact["version"]
seen_artifacts[artifact_coordinate] = artifact

# go through the duplicate_artifacts and if the list of artifacts contains exactly one with force_version set to True
# remove it from the duplicate_artifacts entry
duplicate_artifacts_to_remove = []
for duplicate in duplicate_artifacts:
forced_versions = [artifact for artifact in duplicate_artifacts[duplicate] if artifact.get("force_version", False)]
if len(forced_versions) == 1:
duplicate_artifacts_to_remove.append(duplicate)
for duplicate in duplicate_artifacts_to_remove:
duplicate_artifacts.pop(duplicate)

if duplicate_artifacts:
msg_parts = ["Found duplicate artifact versions"]
for duplicate in duplicate_artifacts:
msg_parts.append(" {} has multiple versions {}".format(duplicate, ", ".join([seen_artifacts[duplicate]] + duplicate_artifacts[duplicate])))
versions = [artifact["version"] for artifact in duplicate_artifacts[duplicate]]
msg_parts.append(" {} has multiple versions {}".format(duplicate, ", ".join(versions)))
msg_parts.append("Please remove duplicate artifacts from the artifact list so you do not get unexpected artifact versions")
if duplicate_version_warning == "error":
fail("\n".join(msg_parts))
Expand Down