chore: upgrade bazel-lib

GoogleContainerTools · May 17, 2024 · 1766b8c · 1766b8c
1 parent 8c77705
commit 1766b8c
Show file tree

Hide file tree

Showing 11 changed files with 43 additions and 43 deletions.
diff --git a/MODULE.bazel b/MODULE.bazel
@@ -7,7 +7,7 @@ module(
 )
 
 bazel_dep(name = "bazel_skylib", version = "1.5.0")
-bazel_dep(name = "aspect_bazel_lib", version = "2.6.0")
+bazel_dep(name = "aspect_bazel_lib", version = "2.7.3")
 bazel_dep(name = "container_structure_test", version = "1.16.0")
 bazel_dep(name = "rules_oci", version = "1.7.4")
 

diff --git a/distroless/dependencies.bzl b/distroless/dependencies.bzl
@@ -30,7 +30,7 @@ def distroless_dependencies():
 
     http_archive(
         name = "aspect_bazel_lib",
-        sha256 = "3e0a430ada9b8f0f845767a267cf584bc94b8ec642d6093f31dca3938b18f6a1",
-        strip_prefix = "bazel-lib-2.6.0",
-        url = "https://github.com/aspect-build/bazel-lib/releases/download/v2.6.0/bazel-lib-v2.6.0.tar.gz",
+        sha256 = "87ab4ec479ebeb00d286266aca2068caeef1bb0b1765e8f71c7b6cfee6af4226",
+        strip_prefix = "bazel-lib-2.7.3",
+        url = "https://github.com/aspect-build/bazel-lib/releases/download/v2.7.3/bazel-lib-v2.7.3.tar.gz",
     )
diff --git a/distroless/tests/asserts.bzl b/distroless/tests/asserts.bzl
@@ -12,7 +12,7 @@ def assert_tar_listing(name, actual, expected):
         name = actual_listing,
         srcs = [actual],
         outs = ["_{}.listing".format(name)],
-        cmd = "cat $(execpath {}) | $(BSDTAR_BIN) -cf $@ --format=mtree --options 'sha1,!nlink' @-".format(actual),
+        cmd = "cat $(execpath {}) | $(BSDTAR_BIN) -cf $@ --format=mtree --options '!nlink' @-".format(actual),
         toolchains = ["@bsd_tar_toolchains//:resolved_toolchain"],
     )
 

diff --git a/examples/cacerts/BUILD.bazel b/examples/cacerts/BUILD.bazel
@@ -14,11 +14,11 @@ assert_tar_listing(
 ./etc time=0.0 mode=755 gid=0 uid=0 type=dir
 ./etc/ssl time=0.0 mode=755 gid=0 uid=0 type=dir
 ./etc/ssl/certs time=0.0 mode=755 gid=0 uid=0 type=dir
-./etc/ssl/certs/ca-certificates.crt time=0.0 mode=555 gid=0 uid=0 type=file size=200313 sha1digest=01b4ff230afaeeda5cddaf9a002cec9bc9a6d1b4
+./etc/ssl/certs/ca-certificates.crt time=0.0 mode=555 gid=0 uid=0 type=file size=200313
 ./usr time=0.0 mode=755 gid=0 uid=0 type=dir
 ./usr/share time=0.0 mode=755 gid=0 uid=0 type=dir
 ./usr/share/doc time=0.0 mode=755 gid=0 uid=0 type=dir
 ./usr/share/doc/ca-certificates time=0.0 mode=755 gid=0 uid=0 type=dir
-./usr/share/doc/ca-certificates/copyright time=0.0 mode=555 gid=0 uid=0 type=file size=18940 sha1digest=4c49e10ddbcfc0f36816df7f9cb503d665621017
+./usr/share/doc/ca-certificates/copyright time=0.0 mode=555 gid=0 uid=0 type=file size=18940
 """,
 )
diff --git a/examples/flatten/BUILD.bazel b/examples/flatten/BUILD.bazel
@@ -53,13 +53,13 @@ assert_tar_listing(
     expected = """\
 #mtree
 ./etc time=0.0 mode=755 gid=0 uid=0 type=dir
-./etc/passwd time=0.0 mode=644 gid=0 uid=0 type=file size=34 sha1digest=240bc4b96dc5e13ffcc715bda7aaa9665fc1069c
+./etc/passwd time=0.0 mode=644 gid=0 uid=0 type=file size=34
 ./examples time=1672560000.0 mode=755 gid=0 uid=0 type=dir
 ./examples/flatten time=1672560000.0 mode=755 gid=0 uid=0 type=dir
 ./examples/flatten/dir time=1672560000.0 mode=755 gid=0 uid=0 type=dir
-./examples/flatten/dir/changelog time=1672560000.0 mode=755 gid=0 uid=0 type=file size=0 sha1digest=da39a3ee5e6b4b0d3255bfef95601890afd80709
+./examples/flatten/dir/changelog time=1672560000.0 mode=755 gid=0 uid=0 type=file size=0
 ./examples/flatten/dir/sub time=1672560000.0 mode=755 gid=0 uid=0 type=dir
-./examples/flatten/dir/sub/content.txt time=1672560000.0 mode=755 gid=0 uid=0 type=file size=0 sha1digest=da39a3ee5e6b4b0d3255bfef95601890afd80709
+./examples/flatten/dir/sub/content.txt time=1672560000.0 mode=755 gid=0 uid=0 type=file size=0
 ./home/nonroot time=0.0 mode=700 gid=666 uid=666 type=dir
 ./root time=0.0 mode=700 gid=0 uid=0 type=dir
 """,

diff --git a/examples/group/BUILD.bazel b/examples/group/BUILD.bazel
@@ -38,6 +38,6 @@ assert_tar_listing(
     expected = """\
 #mtree
 ./etc time=0.0 mode=755 gid=0 uid=0 type=dir
-./etc/group time=0.0 mode=644 gid=0 uid=0 type=file size=46 sha1digest=73eab1fb5cf810c5811e9594a9180bee97011ed1
+./etc/group time=0.0 mode=644 gid=0 uid=0 type=file size=46
 """,
 )
diff --git a/examples/java_keystore/BUILD.bazel b/examples/java_keystore/BUILD.bazel
@@ -32,6 +32,6 @@ assert_tar_listing(
 ./etc/ssl time=0.0 mode=755 gid=0 uid=0 type=dir
 ./etc/ssl/certs time=0.0 mode=755 gid=0 uid=0 type=dir
 ./etc/ssl/certs/java time=0.0 mode=755 gid=0 uid=0 type=dir
-./etc/ssl/certs/java/cacerts time=0.0 mode=555 gid=0 uid=0 type=file size=5349 sha1digest=d9babb136f393b02054d04194c5a33d1ff82524e
+./etc/ssl/certs/java/cacerts time=0.0 mode=555 gid=0 uid=0 type=file size=5349
 """,
 )
diff --git a/examples/locale/BUILD.bazel b/examples/locale/BUILD.bazel
@@ -16,23 +16,23 @@ assert_tar_listing(
 ./usr/lib time=0.0 mode=755 gid=0 uid=0 type=dir
 ./usr/lib/locale time=0.0 mode=755 gid=0 uid=0 type=dir
 ./usr/lib/locale/C.UTF-8 time=0.0 mode=755 gid=0 uid=0 type=dir
-./usr/lib/locale/C.UTF-8/LC_ADDRESS time=0.0 mode=644 gid=0 uid=0 type=file size=131 sha1digest=e17f64601d95342e6977b3fe6779532c8a67a765
-./usr/lib/locale/C.UTF-8/LC_COLLATE time=0.0 mode=644 gid=0 uid=0 type=file size=1519554 sha1digest=5e4c048c98c444ac74ee722fc98a5a83b12c53e2
-./usr/lib/locale/C.UTF-8/LC_CTYPE time=0.0 mode=644 gid=0 uid=0 type=file size=346132 sha1digest=6a1ad80ed9b5b267137260eceb61ba2377a9d402
-./usr/lib/locale/C.UTF-8/LC_IDENTIFICATION time=0.0 mode=644 gid=0 uid=0 type=file size=252 sha1digest=7e5c3b48f452c3bd65d3185db6d568f83bdaa976
-./usr/lib/locale/C.UTF-8/LC_MEASUREMENT time=0.0 mode=644 gid=0 uid=0 type=file size=23 sha1digest=0a7d0d264f9ded94057020e807bfaa13a7573821
-./usr/lib/locale/C.UTF-8/LC_MONETARY time=0.0 mode=644 gid=0 uid=0 type=file size=270 sha1digest=e15e804a83f37be7902e75fe50b4791a32d8d1c0
-./usr/lib/locale/C.UTF-8/LC_NAME time=0.0 mode=644 gid=0 uid=0 type=file size=62 sha1digest=b5d16f1042c3c1c4bef85766aa2c20c1b0d8cff6
-./usr/lib/locale/C.UTF-8/LC_NUMERIC time=0.0 mode=644 gid=0 uid=0 type=file size=50 sha1digest=1bd2f3db04022b8cfe5cd7a7f90176f191e19425
-./usr/lib/locale/C.UTF-8/LC_PAPER time=0.0 mode=644 gid=0 uid=0 type=file size=34 sha1digest=567aaf639393135b76e22e72aaee1df95764e990
-./usr/lib/locale/C.UTF-8/LC_TELEPHONE time=0.0 mode=644 gid=0 uid=0 type=file size=47 sha1digest=3316c99e183186c5cad97a71674ef7431c3da845
-./usr/lib/locale/C.UTF-8/LC_TIME time=0.0 mode=644 gid=0 uid=0 type=file size=3360 sha1digest=e619a4db877e0b54fa14b8a3992da2b561b3239b
+./usr/lib/locale/C.UTF-8/LC_ADDRESS time=0.0 mode=644 gid=0 uid=0 type=file size=131
+./usr/lib/locale/C.UTF-8/LC_COLLATE time=0.0 mode=644 gid=0 uid=0 type=file size=1519554
+./usr/lib/locale/C.UTF-8/LC_CTYPE time=0.0 mode=644 gid=0 uid=0 type=file size=346132
+./usr/lib/locale/C.UTF-8/LC_IDENTIFICATION time=0.0 mode=644 gid=0 uid=0 type=file size=252
+./usr/lib/locale/C.UTF-8/LC_MEASUREMENT time=0.0 mode=644 gid=0 uid=0 type=file size=23
+./usr/lib/locale/C.UTF-8/LC_MONETARY time=0.0 mode=644 gid=0 uid=0 type=file size=270
+./usr/lib/locale/C.UTF-8/LC_NAME time=0.0 mode=644 gid=0 uid=0 type=file size=62
+./usr/lib/locale/C.UTF-8/LC_NUMERIC time=0.0 mode=644 gid=0 uid=0 type=file size=50
+./usr/lib/locale/C.UTF-8/LC_PAPER time=0.0 mode=644 gid=0 uid=0 type=file size=34
+./usr/lib/locale/C.UTF-8/LC_TELEPHONE time=0.0 mode=644 gid=0 uid=0 type=file size=47
+./usr/lib/locale/C.UTF-8/LC_TIME time=0.0 mode=644 gid=0 uid=0 type=file size=3360
 ./usr/lib/locale/C.UTF-8/LC_MESSAGES time=0.0 mode=755 gid=0 uid=0 type=dir
-./usr/lib/locale/C.UTF-8/LC_MESSAGES/SYS_LC_MESSAGES time=0.0 mode=644 gid=0 uid=0 type=file size=48 sha1digest=574d7e92bedf1373ec9506859b0d55ee7babbf20
+./usr/lib/locale/C.UTF-8/LC_MESSAGES/SYS_LC_MESSAGES time=0.0 mode=644 gid=0 uid=0 type=file size=48
 ./usr/share time=0.0 mode=755 gid=0 uid=0 type=dir
 ./usr/share/doc time=0.0 mode=755 gid=0 uid=0 type=dir
 ./usr/share/doc/libc-bin time=0.0 mode=755 gid=0 uid=0 type=dir
-./usr/share/doc/libc-bin/copyright time=0.0 mode=644 gid=0 uid=0 type=file size=25467 sha1digest=5c4df62d190848821200ce4041d2753bd431a7eb
+./usr/share/doc/libc-bin/copyright time=0.0 mode=644 gid=0 uid=0 type=file size=25467
 """,
 )
 
@@ -50,22 +50,22 @@ assert_tar_listing(
 ./usr/lib time=0.0 mode=755 gid=0 uid=0 type=dir
 ./usr/lib/locale time=0.0 mode=755 gid=0 uid=0 type=dir
 ./usr/lib/locale/C.utf8 time=0.0 mode=755 gid=0 uid=0 type=dir
-./usr/lib/locale/C.utf8/LC_ADDRESS time=0.0 mode=644 gid=0 uid=0 type=file size=127 sha1digest=12d0e0600557e0dcb3c64e56894b81230e2eaa72
-./usr/lib/locale/C.utf8/LC_COLLATE time=0.0 mode=644 gid=0 uid=0 type=file size=1406 sha1digest=f245e3207984879d0b736c9aa42f4268e27221b9
-./usr/lib/locale/C.utf8/LC_CTYPE time=0.0 mode=644 gid=0 uid=0 type=file size=353616 sha1digest=86e9c921184546cc60c20c150de13f3da4266304
-./usr/lib/locale/C.utf8/LC_IDENTIFICATION time=0.0 mode=644 gid=0 uid=0 type=file size=258 sha1digest=1eeec3b2cb259530d76ef717e24af0fd34d94624
-./usr/lib/locale/C.utf8/LC_MEASUREMENT time=0.0 mode=644 gid=0 uid=0 type=file size=23 sha1digest=0a7d0d264f9ded94057020e807bfaa13a7573821
-./usr/lib/locale/C.utf8/LC_MONETARY time=0.0 mode=644 gid=0 uid=0 type=file size=270 sha1digest=110ed47e32d65c61ab8240202faa2114d025a009
-./usr/lib/locale/C.utf8/LC_NAME time=0.0 mode=644 gid=0 uid=0 type=file size=62 sha1digest=b5d16f1042c3c1c4bef85766aa2c20c1b0d8cff6
-./usr/lib/locale/C.utf8/LC_NUMERIC time=0.0 mode=644 gid=0 uid=0 type=file size=50 sha1digest=1bd2f3db04022b8cfe5cd7a7f90176f191e19425
-./usr/lib/locale/C.utf8/LC_PAPER time=0.0 mode=644 gid=0 uid=0 type=file size=34 sha1digest=567aaf639393135b76e22e72aaee1df95764e990
-./usr/lib/locale/C.utf8/LC_TELEPHONE time=0.0 mode=644 gid=0 uid=0 type=file size=47 sha1digest=3316c99e183186c5cad97a71674ef7431c3da845
-./usr/lib/locale/C.utf8/LC_TIME time=0.0 mode=644 gid=0 uid=0 type=file size=3360 sha1digest=e619a4db877e0b54fa14b8a3992da2b561b3239b
+./usr/lib/locale/C.utf8/LC_ADDRESS time=0.0 mode=644 gid=0 uid=0 type=file size=127
+./usr/lib/locale/C.utf8/LC_COLLATE time=0.0 mode=644 gid=0 uid=0 type=file size=1406
+./usr/lib/locale/C.utf8/LC_CTYPE time=0.0 mode=644 gid=0 uid=0 type=file size=353616
+./usr/lib/locale/C.utf8/LC_IDENTIFICATION time=0.0 mode=644 gid=0 uid=0 type=file size=258
+./usr/lib/locale/C.utf8/LC_MEASUREMENT time=0.0 mode=644 gid=0 uid=0 type=file size=23
+./usr/lib/locale/C.utf8/LC_MONETARY time=0.0 mode=644 gid=0 uid=0 type=file size=270
+./usr/lib/locale/C.utf8/LC_NAME time=0.0 mode=644 gid=0 uid=0 type=file size=62
+./usr/lib/locale/C.utf8/LC_NUMERIC time=0.0 mode=644 gid=0 uid=0 type=file size=50
+./usr/lib/locale/C.utf8/LC_PAPER time=0.0 mode=644 gid=0 uid=0 type=file size=34
+./usr/lib/locale/C.utf8/LC_TELEPHONE time=0.0 mode=644 gid=0 uid=0 type=file size=47
+./usr/lib/locale/C.utf8/LC_TIME time=0.0 mode=644 gid=0 uid=0 type=file size=3360
 ./usr/lib/locale/C.utf8/LC_MESSAGES time=0.0 mode=755 gid=0 uid=0 type=dir
-./usr/lib/locale/C.utf8/LC_MESSAGES/SYS_LC_MESSAGES time=0.0 mode=644 gid=0 uid=0 type=file size=48 sha1digest=574d7e92bedf1373ec9506859b0d55ee7babbf20
+./usr/lib/locale/C.utf8/LC_MESSAGES/SYS_LC_MESSAGES time=0.0 mode=644 gid=0 uid=0 type=file size=48
 ./usr/share time=0.0 mode=755 gid=0 uid=0 type=dir
 ./usr/share/doc time=0.0 mode=755 gid=0 uid=0 type=dir
 ./usr/share/doc/libc-bin time=0.0 mode=755 gid=0 uid=0 type=dir
-./usr/share/doc/libc-bin/copyright time=0.0 mode=644 gid=0 uid=0 type=file size=25467 sha1digest=5c4df62d190848821200ce4041d2753bd431a7eb
+./usr/share/doc/libc-bin/copyright time=0.0 mode=644 gid=0 uid=0 type=file size=25467
 """,
 )
diff --git a/examples/os_release/BUILD.bazel b/examples/os_release/BUILD.bazel
@@ -23,7 +23,7 @@ assert_tar_listing(
 #mtree
 ./usr time=0.0 mode=755 gid=0 uid=0 type=dir
 ./usr/lib time=0.0 mode=755 gid=0 uid=0 type=dir
-./usr/lib/os-release time=0.0 mode=555 gid=0 uid=0 type=file size=48 sha1digest=956eb93b9476f9fc8f93cb450adc4f716d158500
+./usr/lib/os-release time=0.0 mode=555 gid=0 uid=0 type=file size=48
 """,
 )
 
@@ -43,6 +43,6 @@ assert_tar_listing(
     expected = """\
 #mtree
 ./etc time=0.0 mode=755 gid=0 uid=0 type=dir
-./etc/os-release time=0.0 mode=555 gid=0 uid=0 type=file size=67 sha1digest=ebdde6fdd9cf9876b4b592772d85817b4b482327
+./etc/os-release time=0.0 mode=555 gid=0 uid=0 type=file size=67
 """,
 )
diff --git a/examples/passwd/BUILD.bazel b/examples/passwd/BUILD.bazel
@@ -28,6 +28,6 @@ assert_tar_listing(
     expected = """\
 #mtree
 ./etc time=0.0 mode=755 gid=0 uid=0 type=dir
-./etc/passwd time=0.0 mode=644 gid=0 uid=0 type=file size=36 sha1digest=a158dcecfd75d6502cdb1086eb5b0756d08fc423
+./etc/passwd time=0.0 mode=644 gid=0 uid=0 type=file size=36
 """,
 )
diff --git a/examples/statusd/BUILD.bazel b/examples/statusd/BUILD.bazel
@@ -13,7 +13,7 @@ assert_tar_listing(
     actual = "statusd",
     expected = """\
 #mtree
-./var/lib/dpkg/status.d/ca-certificates time=1611051064.0 mode=644 gid=0 uid=0 type=file size=793 sha1digest=214a8bc9b7e7ce33fbd2e08b0b01aa5e2b717495
-./var/lib/dpkg/status.d/ca-certificates.md5sums time=1611051064.0 mode=644 gid=0 uid=0 type=file size=14644 sha1digest=80ae4d6a7dbfeefd6e16ccab344671c6f7426422
+./var/lib/dpkg/status.d/ca-certificates time=1611051064.0 mode=644 gid=0 uid=0 type=file size=793
+./var/lib/dpkg/status.d/ca-certificates.md5sums time=1611051064.0 mode=644 gid=0 uid=0 type=file size=14644
 """,
 )