Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions private/rules/v3_lock_file.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -239,6 +239,11 @@ def _get_artifacts(lock_file_contents):
root_unpacked["packaging"] = "jar"

for (classifier, shasum) in data.get("shasums", {}).items():
# Skip artifacts with null shasum that can't be downloaded
# e.g., AAR-only dependencies with no sources
if shasum == None:
continue

root_unpacked["classifier"] = classifier
coordinates = to_external_form(root_unpacked)
key = to_key(root_unpacked)
Expand Down
3 changes: 3 additions & 0 deletions tests/unit/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ load(":java_utilities_test.bzl", "java_utilities_test_suite")
load(":maven_version_test.bzl", "maven_version_test_suite")
load(":proxy_test.bzl", "proxy_test_suite")
load(":specs_test.bzl", "artifact_specs_test_suite")
load(":v3_lock_file_test.bzl", "v3_lock_file_test_suite")
load(":version_catalogs_test.bzl", "version_catalogs_test_suite")

artifact_specs_test_suite()
Expand All @@ -24,4 +25,6 @@ maven_version_test_suite()

proxy_test_suite()

v3_lock_file_test_suite()

version_catalogs_test_suite()
91 changes: 91 additions & 0 deletions tests/unit/v3_lock_file_test.bzl
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
load("@bazel_skylib//lib:unittest.bzl", "asserts", "unittest")
load("//private/rules:v3_lock_file.bzl", "v3_lock_file")

def _v3_filters_null_shasums_impl(ctx):
env = unittest.begin(ctx)

lock_file_contents = {
"artifacts": {
"com.android.support:appcompat-v7:aar": {
"version": "28.0.0",
"shasums": {
"aar": "abc123",
"sources": None, # Sources that don't exist for AAR-only dependency
},
},
"com.android.support:design:aar": {
"version": "28.0.0",
"shasums": {
"aar": "def456",
"sources": "ghi789",
},
},
"com.google.guava:guava": {
"version": "30.0-jre",
"shasums": {
"jar": "jkl012",
"sources": "mno345",
},
},
},
}

artifacts = v3_lock_file.get_artifacts(lock_file_contents)

asserts.equals(env, 5, len(artifacts))

# Verify the phantom artifact is not present
coordinates_list = [a["coordinates"] for a in artifacts]
asserts.true(env, "com.android.support:appcompat-v7:28.0.0:aar@aar" in coordinates_list)
asserts.false(env, "com.android.support:appcompat-v7:28.0.0:sources@aar" in coordinates_list, "Phantom sources should be filtered")

return unittest.end(env)

v3_filters_null_shasums_test = unittest.make(_v3_filters_null_shasums_impl)

def _v3_keeps_valid_artifacts_impl(ctx):
env = unittest.begin(ctx)

# Verify normal artifacts with valid shasums are not affected
lock_file_contents = {
"artifacts": {
"com.google.guava:guava": {
"version": "30.0-jre",
"shasums": {
"jar": "abc123",
"sources": "def456",
},
},
"com.android.support:design:aar": {
"version": "28.0.0",
"shasums": {
"aar": "ghi789",
"sources": "jkl012",
},
},
},
}

artifacts = v3_lock_file.get_artifacts(lock_file_contents)

# Should get 4 artifacts (JAR + JAR sources + AAR + AAR sources)
asserts.equals(env, 4, len(artifacts))

# Verify all artifacts are present with correct shasums
coordinates_to_sha = {a["coordinates"]: a["sha256"] for a in artifacts}

asserts.equals(env, "abc123", coordinates_to_sha.get("com.google.guava:guava:30.0-jre"))
asserts.equals(env, "def456", coordinates_to_sha.get("com.google.guava:guava:30.0-jre:sources"))
asserts.equals(env, "ghi789", coordinates_to_sha.get("com.android.support:design:28.0.0:aar@aar"))
asserts.equals(env, "jkl012", coordinates_to_sha.get("com.android.support:design:28.0.0:sources@aar"))

return unittest.end(env)

v3_keeps_valid_artifacts_test = unittest.make(_v3_keeps_valid_artifacts_impl)

def v3_lock_file_test_suite():
unittest.suite(
"v3_lock_file_tests",
v3_filters_null_shasums_test,
v3_keeps_valid_artifacts_test,
)