feat: use apko resolve to generate locks

chainguard-dev · Sep 29, 2023 · 6fd47e1 · 6fd47e1
1 parent c8a2d3f
commit 6fd47e1
Show file tree

Hide file tree

Showing 16 changed files with 2,487 additions and 695 deletions.
diff --git a/.prettierignore b/.prettierignore
@@ -1 +1,2 @@
 docs/*.md
+**/*.resolved.json
diff --git a/MODULE.bazel b/MODULE.bazel
@@ -6,7 +6,7 @@ module(
  compatibility_level = 1,
 )
 
-bazel_dep(name = "bazel_skylib", version = "1.4.1")
+bazel_dep(name = "bazel_skylib", version = "1.4.2")
 bazel_dep(name = "platforms", version = "0.0.5")
 bazel_dep(name = "aspect_bazel_lib", version = "1.34.5")
 
@@ -31,19 +31,19 @@ apk = use_extension(
 )
 apk.translate_lock(
  name = "examples_lock",
- lock = "//examples/lock:apko.lock.json",
+ lock = "//examples/lock:apko.resolved.json",
 )
 apk.translate_lock(
  name = "examples_wolfi_base",
- lock = "//examples/wolfi-base:apko.lock.json",
+ lock = "//examples/wolfi-base:apko.resolved.json",
 )
 apk.translate_lock(
  name = "examples_oci",
- lock = "//examples/oci:apko.lock.json",
+ lock = "//examples/oci:apko.resolved.json",
 )
 apk.translate_lock(
  name = "examples_multi_arch_and_repo",
- lock = "//examples/multi_arch_and_repo:apko.lock.json",
+ lock = "//examples/multi_arch_and_repo:apko.resolved.json",
 )
 use_repo(apk, "examples_multi_arch_and_repo")
 use_repo(apk, "examples_lock")

diff --git a/apko/private/apk.bzl b/apko/private/apk.bzl
@@ -53,8 +53,6 @@ def _apk_import_impl(rctx):
  data_output = "{}/{}.dat.tar.gz".format(output, data_sha256)
  apk_output = "{}/{}/{}-{}.apk".format(repo_escaped, rctx.attr.architecture, rctx.attr.package_name, rctx.attr.version)
 
- _check_initial_setup(rctx)
-
  rctx.download(
  url = [_range(rctx.attr.url, rctx.attr.signature_range)],
  output = sig_output,
@@ -109,6 +107,7 @@ filegroup(
 def _apk_repository_impl(rctx):
  repo = util.repo_url(rctx.attr.url, rctx.attr.architecture)
  repo_escaped = util.url_escape(repo)
+ _check_initial_setup(rctx)
  rctx.download(
  url = [rctx.attr.url],
  output = "{}/{}/APKINDEX/latest.tar.gz".format(repo_escaped, rctx.attr.architecture),

diff --git a/apko/private/versions.bzl b/apko/private/versions.bzl
@@ -4,10 +4,10 @@
 # ./scripts/mirror_apko.sh
 APKO_VERSIONS = {
  "v0.0.0": {
- "darwin_amd64": "sha256-z/wJ7ZAFRoEIOCNvCLd4XnKAb8R4jvG8P7d835ZvckQ=",
- "darwin_arm64": "sha256-kCZoMpop4VVPiFVJJVVheL1aWWmBO11u3LiULmcT93o=",
- "linux_386": "sha256-Uk7+nsjviVFFSLOHue8Us1mTnBvTFoEj8QVtFUriypI=",
- "linux_amd64": "sha256-5HYEVTVbWO+Mkjse9Fphkm2EmwT5lraf3BCTFku7Wvg=",
- "linux_arm64": "sha256-bjdZPrwmNOtqM/4BIMHae6qPnXXUiywftbYeVxeHWpk=",
+ "darwin_amd64": "sha256-hZ253iuIVqEOTQ4rrX1DrgOMqnxaHM6b8iUeUjd1ZBY=",
+ "darwin_arm64": "sha256-OX8S8TjiVenvc71CMWRqZM/JKOItTeKxLYk48HTY8m0=",
+ "linux_386": "sha256-sw4xdL7SN67wYz59J5XgEgtx8wdF4tS2SA1FQt/9J48=",
+ "linux_amd64": "sha256-Zc4OUCWYfuIe81S0UeCwPOA75Xb7uof9Nm5P6xLil1E=",
+ "linux_arm64": "sha256-uUiiqdb/LU3ezDlqhL6GBogLn7wOinQKnabE3vryXok=",
  },
 }
diff --git a/e2e/smoke/MODULE.bazel b/e2e/smoke/MODULE.bazel
@@ -13,6 +13,6 @@ apko = use_extension(
 )
 apko.translate_lock(
  name = "example_lock",
- lock = "//:apko.lock.json",
+ lock = "//:apko.resolved.json",
 )
 use_repo(apko, "example_lock")
diff --git a/e2e/smoke/apko.resolved.json b/e2e/smoke/apko.resolved.json
@@ -0,0 +1,51 @@
+{
+ "version": "v1",
+ "contents": {
+ "keyring": [],
+ "repositories": [
+ {
+ "name": "dl-cdn.alpinelinux.org/alpine/edge/main/x86_64",
+ "url": "https://dl-cdn.alpinelinux.org/alpine/edge/main/x86_64/APKINDEX.tar.gz",
+ "architecture": "x86_64"
+ }
+ ],
+ "packages": [
+ {
+ "name": "musl",
+ "url": "https://dl-cdn.alpinelinux.org/alpine/edge/main/x86_64/musl-1.2.4_git20230717-r2.apk",
+ "version": "1.2.4_git20230717-r2",
+ "architecture": "x86_64",
+ "signature": {
+ "range": "bytes=0-663",
+ "checksum": "sha1-ANg2OFHCs6IsHHmIoXifycdNICo="
+ },
+ "control": {
+ "range": "bytes=664-1230",
+ "checksum": "sha1-0QcZQhy2GxzaRF4Kip4NVG0pgrc="
+ },
+ "data": {
+ "range": "bytes=1231-667648",
+ "checksum": "sha256-BEDUjs8id32t4l9xhzFKSVDrEOOuxHeKIAjyg/cmIE8="
+ }
+ },
+ {
+ "name": "busybox",
+ "url": "https://dl-cdn.alpinelinux.org/alpine/edge/main/x86_64/busybox-1.36.1-r8.apk",
+ "version": "1.36.1-r8",
+ "architecture": "x86_64",
+ "signature": {
+ "range": "bytes=0-668",
+ "checksum": "sha1-pSFhEF15QuR0fTfB4gsrKiR9mGE="
+ },
+ "control": {
+ "range": "bytes=669-2302",
+ "checksum": "sha1-yUyBAl1hksZXxUYlinKcmpP25Mg="
+ },
+ "data": {
+ "range": "bytes=2303-946176",
+ "checksum": "sha256-Zs0o1FRREtYAGgLCGNlYeePF3JMce+XMufu7XMhRoyU="
+ }
+ }
+ ]
+ }
+}
diff --git a/examples/lock/apko.resolved.json b/examples/lock/apko.resolved.json
@@ -0,0 +1,51 @@
+{
+ "version": "v1",
+ "contents": {
+ "keyring": [],
+ "repositories": [
+ {
+ "name": "dl-cdn.alpinelinux.org/alpine/edge/main/x86_64",
+ "url": "https://dl-cdn.alpinelinux.org/alpine/edge/main/x86_64/APKINDEX.tar.gz",
+ "architecture": "x86_64"
+ }
+ ],
+ "packages": [
+ {
+ "name": "musl",
+ "url": "https://dl-cdn.alpinelinux.org/alpine/edge/main/x86_64/musl-1.2.4_git20230717-r2.apk",
+ "version": "1.2.4_git20230717-r2",
+ "architecture": "x86_64",
+ "signature": {
+ "range": "bytes=0-663",
+ "checksum": "sha1-ANg2OFHCs6IsHHmIoXifycdNICo="
+ },
+ "control": {
+ "range": "bytes=664-1230",
+ "checksum": "sha1-0QcZQhy2GxzaRF4Kip4NVG0pgrc="
+ },
+ "data": {
+ "range": "bytes=1231-667648",
+ "checksum": "sha256-BEDUjs8id32t4l9xhzFKSVDrEOOuxHeKIAjyg/cmIE8="
+ }
+ },
+ {
+ "name": "busybox",
+ "url": "https://dl-cdn.alpinelinux.org/alpine/edge/main/x86_64/busybox-1.36.1-r8.apk",
+ "version": "1.36.1-r8",
+ "architecture": "x86_64",
+ "signature": {
+ "range": "bytes=0-668",
+ "checksum": "sha1-pSFhEF15QuR0fTfB4gsrKiR9mGE="
+ },
+ "control": {
+ "range": "bytes=669-2302",
+ "checksum": "sha1-yUyBAl1hksZXxUYlinKcmpP25Mg="
+ },
+ "data": {
+ "range": "bytes=2303-946176",
+ "checksum": "sha256-Zs0o1FRREtYAGgLCGNlYeePF3JMce+XMufu7XMhRoyU="
+ }
+ }
+ ]
+ }
+}