move new features to separate MRs

Author: peakschris

cosign/private/attest.sh.tpl

@@ -17,11 +17,14 @@ fi
 
 REPOSITORY=""
 ARGS=()
+PREDICATE=""
 
 while (( $# > 0 )); do
     case "$1" in
     --repository) shift; REPOSITORY="$1"; shift ;;
     (--repository=*) REPOSITORY="${1#--repository=}"; shift ;;
+    --predicate) shift; PREDICATE="$(rlocation "$1")"; shift ;;
+    (--predicate=*) PREDICATE="$(rlocation "${1#--predicate=}")"; shift ;;
     *) ARGS+=( "$1" ); shift ;;
     esac
 done
@@ -31,5 +34,5 @@ if [[ -z "${REPOSITORY}" ]]; then
     exit 1
 fi
 
-exec "${COSIGN}" attest "${REPOSITORY}@${DIGEST}" ${ARGS[@]+"${ARGS[@]}"}
+exec "${COSIGN}" attest "${REPOSITORY}@${DIGEST}" --predicate "${PREDICATE}" ${ARGS[@]+"${ARGS[@]}"}
 

oci/private/load.bzl

@@ -118,10 +118,6 @@ attrs = {
         executable = True,
         cfg = "target",
     ),
-    "tarball_name": attr.string(
-        default = "tarball.tar",
-        doc = "Name of the tarball file to generate.",
-    ),
     "_run_template": attr.label(
         default = Label("//oci/private:load.sh.tpl"),
         doc = """ \
@@ -187,7 +183,7 @@ def _load_impl(ctx):
 
     # This action produces a large output and should rarely be used as it puts load on the cache.
     # It will only run if the "tarball" output_group is explicitly requested
-    tarball = ctx.actions.declare_file("{}/{}".format(ctx.label.name, ctx.attr.tarball_name))
+    tarball = ctx.actions.declare_file("{}/tarball.tar".format(ctx.label.name))
     tar_inputs = depset(direct = mtree_outputs, transitive = [mtree_inputs])
     tar_args = ctx.actions.args()
     tar_args.add_all(["--create", "--no-xattr", "--no-mac-metadata"])

oci/private/load.sh.tpl

@@ -15,10 +15,8 @@ elif command -v docker &> /dev/null; then
     CONTAINER_CLI="docker"
 elif command -v podman &> /dev/null; then
     CONTAINER_CLI="podman"
-elif command -v nerdctl &> /dev/null; then
-    CONTAINER_CLI="nerdctl"
 else
-    echo >&2 "Neither docker or podman or nerdctl could be found."
+    echo >&2 "Neither docker or podman could be found."
     echo >&2 "To use a different container runtime, pass an executable to the 'loader' attribute of oci_tarball."
     exit 1
 fi