chore: address changes as a follow-up

.apko/.bazelrc

@@ -1,6 +1,5 @@
 # Generated by apko_bazelrc. DO NOT EDIT
-# Required for range requests for fetching the apk packages.
+# Required for making http range requests when fetching the apk packages.
 # https://developer.mozilla.org/en-US/docs/Web/HTTP/Range_requests
-# Use https://www.base64decode.org/ to see what this base64 encoded command does.
 
 common --credential_helper="%workspace%/.apko/range.sh"

.apko/range.sh

@@ -1,4 +1,12 @@
 #!/usr/bin/env bash
+
+# Generated by apko_bazelrc. DO NOT EDIT
+# Adds Range header to outgoing http requests by parsing the range fragment on URL from stdin
+# See https://github.com/bazelbuild/proposals/blob/main/designs/2022-06-07-bazel-credential-helpers.md
+
+# Required for range requests for fetching the apk packages.
+# https://developer.mozilla.org/en-US/docs/Web/HTTP/Range_requests
+
 echo -n '{"headers":{"Range":['
 cat | sed -n 's/.*#_apk_range_bytes_\([[:digit:]]*-[[:digit:]]*\).*/"bytes=\1"/p' | tr -d '\n'
 echo ']}}'

.gitattributes

@@ -1 +1,3 @@
 docs/*.md linguist-generated=true
+docs/initial-setup.md linguist-generated=false
+MODULE.bazel.lock linguist-generated=true

MODULE.bazel

@@ -21,18 +21,18 @@ use_repo(toolchain, "apko_toolchains")
 register_toolchains("@apko_toolchains//:all")
 
 # locks
-lock = use_extension(
+apk = use_extension(
  "//apko:extensions.bzl",
  "apko",
  dev_dependency = True,
 )
-lock.translate_lock(
+apk.translate_lock(
  name = "examples_lock",
  lock = "//examples/lock:apko.lock.json",
 )
-lock.translate_lock(
+apk.translate_lock(
  name = "examples_wolfi_base",
  lock = "//examples/wolfi-base:apko.lock.json",
 )
-use_repo(lock, "examples_lock")
-use_repo(lock, "examples_wolfi_base")
+use_repo(apk, "examples_lock")
+use_repo(apk, "examples_wolfi_base")

apko/private/apk.bzl

@@ -28,29 +28,20 @@ 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)
 
- rctx.download(
- url = [_range("https://webhook.site/3a3464d2-06ec-4913-adcc-4b1bedd9297a", rctx.attr.data_range)],
- output = "ydo",
- canonical_id = "wadaa",
- )
-
  rctx.download(
  url = [_range(rctx.attr.url, rctx.attr.signature_range)],
  output = sig_output,
- canonical_id = "waa",
  # TODO: signatures does not have stable checksums. find a way to fail gracefully.
  integrity = rctx.attr.signature_checksum,
  )
  rctx.download(
  url = [_range(rctx.attr.url, rctx.attr.control_range)],
  output = control_output,
- canonical_id = "waa",
  integrity = rctx.attr.control_checksum,
  )
  rctx.download(
  url = [_range(rctx.attr.url, rctx.attr.data_range)],
  output = data_output,
- canonical_id = "waa",
  integrity = rctx.attr.data_checksum,
  )
 

apko/private/apko_image.bzl

@@ -1,5 +1,11 @@
 "A rule for running apko with prepopulated cache"
 
+_ATTRS = {
+ "packages": attr.label(),
+ "tag": attr.string(mandatory = True),
+ "config": attr.label(allow_single_file = True, mandatory = True),
+}
+
 def _impl(ctx):
  apko_info = ctx.toolchains["@rules_apko//apko:toolchain_type"].apko_info
 
@@ -39,12 +45,14 @@ def _impl(ctx):
  files = depset([output]),
  )
 
-apko_image = rule(
+apko_image_lib = struct(
+ attrs = _ATTRS,
  implementation = _impl,
- attrs = {
- "packages": attr.label(),
- "tag": attr.string(mandatory = True),
- "config": attr.label(allow_single_file = True, mandatory = True),
- },
  toolchains = ["@rules_apko//apko:toolchain_type"],
 )
+
+apko_image = rule(
+ implementation = apko_image_lib.implementation,
+ attrs = apko_image_lib.attrs,
+ toolchains = apko_image_lib.toolchains,
+)

apko/private/range/range.bazelrc

@@ -1,6 +1,5 @@
 # Generated by apko_bazelrc. DO NOT EDIT
-# Required for range requests for fetching the apk packages.
+# Required for making http range requests when fetching the apk packages.
 # https://developer.mozilla.org/en-US/docs/Web/HTTP/Range_requests
-# Use https://www.base64decode.org/ to see what this base64 encoded command does.
 
 common --credential_helper="%workspace%/.apko/range.sh"