revert changes to oci_load

peakschris · peakschris · commit ddf90f176749 · 2025-08-22T06:42:53.000-04:00
diff --git a/examples/assertion/BUILD.bazel b/examples/assertion/BUILD.bazel
@@ -1,12 +1,17 @@
 load("@tar.bzl//tar:tar.bzl", "tar")
-load("@aspect_bazel_lib//lib:paths.bzl", "BASH_RLOCATION_FUNCTION", "to_rlocation_path")
+load("@aspect_bazel_lib//lib:paths.bzl", "BASH_RLOCATION_FUNCTION")
 load("@aspect_bazel_lib//lib:testing.bzl", "assert_json_matches")
 load("@aspect_bazel_lib//lib:transitions.bzl", "platform_transition_filegroup")
 load("@bazel_skylib//rules:build_test.bzl", "build_test")
 load("@bazel_skylib//rules:write_file.bzl", "write_file")
 load("@rules_oci//oci:defs.bzl", "oci_image", "oci_load")
 load("//examples:assert.bzl", "assert_oci_config")
 
+NOT_WINDOWS = select({
+    "@platforms//os:windows": ["@platforms//:incompatible"],
+    "//conditions:default": [],
+})
+
 # Case 1: image name containing a capital case.
 oci_image(
     name = "imagE",
@@ -68,10 +73,7 @@ oci_load(
     name = "case4_load",
     image = ":case4_transition",
     repo_tags = ["case4:example"],
-    target_compatible_with = select({
-        "@aspect_bazel_lib//lib:enable_runfiles": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
+    target_compatible_with = NOT_WINDOWS,
 )
 
 filegroup(
@@ -272,10 +274,7 @@ oci_load(
     name = "case9_tarball",
     image = ":case9_image",
     repo_tags = repo_tags,
-    target_compatible_with = select({
-        "@aspect_bazel_lib//lib:enable_runfiles": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
+    target_compatible_with = NOT_WINDOWS,
 )
 
 # Not typically recommended: ask the tarball rule to write the .tar file
@@ -318,10 +317,7 @@ oci_load(
     name = "case10_tarball",
     image = ":case10",
     repo_tags = ["case10:example"],
-    target_compatible_with = select({
-        "@aspect_bazel_lib//lib:enable_runfiles": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
+    target_compatible_with = NOT_WINDOWS,
 )
 
 genrule(
@@ -344,10 +340,7 @@ oci_load(
     name = "case11_tarball",
     image = ":case11",
     repo_tags = ["case11:example"],
-    target_compatible_with = select({
-        "@aspect_bazel_lib//lib:enable_runfiles": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
+    target_compatible_with = NOT_WINDOWS,
 )
 
 write_file(
@@ -647,4 +640,18 @@ build_test(
         ":case5_tar",
         ":case10_run",
     ],
+    target_compatible_with = NOT_WINDOWS,
+)
+
+# build them as test.
+build_test(
+    name = "test_windows",
+    targets = [
+        ":imagE",
+        ":case2",
+        ":case3",
+    ],
+    target_compatible_with = [
+        "@platforms//os:windows",
+    ],
 )
diff --git a/oci/private/image.sh b/oci/private/image.sh
@@ -34,7 +34,6 @@ function base_from_scratch() {
 function base_from() {
   local path="$1"
   # shellcheck disable=SC2045
-  echo $(coreutils ls -1 -d "$path/blobs/"*/*)
   for blob in $(coreutils ls -1 -d "$path/blobs/"*/*); do
     local relative_to_blobs="${blob#"$path/blobs"}"
     coreutils mkdir -p "$OUTPUT/blobs/$(coreutils dirname "$relative_to_blobs")"
diff --git a/oci/private/load.bat.tpl b/oci/private/load.bat.tpl
@@ -7,10 +7,10 @@ set RUNFILES_MANIFEST_ONLY=1
 {{BATCH_RLOCATION_FUNCTION}}
 
 REM Equivalent of bash errexit - exit on any error
-rem if not defined RUNFILES_DIR (
-rem     echo Error: RUNFILES_DIR not set >&2
-rem     exit /b 1
-rem )
+if not defined RUNFILES_DIR (
+    echo Error: RUNFILES_DIR not set >&2
+    exit /b 1
+)
 
 REM Set paths using runfiles resolution
 call :rlocation "{{tar}}" TAR
diff --git a/oci/private/load.bzl b/oci/private/load.bzl
@@ -20,7 +20,6 @@ docker run --rm my-repository:latest
 """
 
 load("@aspect_bazel_lib//lib:paths.bzl", "BASH_RLOCATION_FUNCTION", "to_rlocation_path")
-load("@aspect_bazel_lib//lib:windows_utils.bzl", "BATCH_RLOCATION_FUNCTION")
 load("//oci/private:util.bzl", "util")
 
 doc = """Loads an OCI layout into a container daemon without needing to publish the image first.
@@ -114,7 +113,7 @@ attrs = {
 
             See the _run_template attribute for the script that calls this loader tool.
             """,
-        allow_files = True,
+        allow_single_file = True,
         mandatory = False,
         executable = True,
         cfg = "target",
@@ -129,33 +128,15 @@ attrs = {
         """,
         allow_single_file = True,
     ),
-    "_run_template_windows": attr.label(
-        default = Label("//oci/private:load.bat.tpl"),
-        doc = """ \
-              The template used to load the container when using `bazel run` on this target.
-
-              See the `loader` attribute to replace the tool which is called.
-              Please reference the default template to see available substitutions.
-        """,
-        allow_single_file = True,
-    ),
     "_tarball_sh": attr.label(allow_single_file = True, default = "//oci/private:tarball.sh.tpl"),
     "_runfiles": attr.label(default = "@bazel_tools//tools/bash/runfiles"),
     "_windows_constraint": attr.label(default = "@platforms//os:windows"),
 }
 
-def _windows_host(ctx):
-    """Returns true if the host platform is windows.
-    
-    The typical approach using ctx.target_platform_has_constraint does not work for transitioned
-    build targets. We need to know the host platform, not the target platform.
-    """
-    return ctx.configuration.host_path_separator == ";"
-
 def _load_impl(ctx):
     jq = ctx.toolchains["@aspect_bazel_lib//lib:jq_toolchain_type"]
     coreutils = ctx.toolchains["@aspect_bazel_lib//lib:coreutils_toolchain_type"]
-    bsdtar = ctx.toolchains["@tar.bzl//tar/toolchain:type"]
+    bsdtar = ctx.toolchains["@aspect_bazel_lib//lib:tar_toolchain_type"]
 
     image = ctx.file.image
     repo_tags = ctx.file.repo_tags
@@ -219,47 +200,29 @@ def _load_impl(ctx):
 
     # Create an executable runner script that will create the tarball at runtime,
     # as opposed to at build to avoid uploading large artifacts to remote cache.
-    if not _windows_host(ctx):
-        runnable_loader = ctx.actions.declare_file(ctx.label.name + ".sh")
-        ctx.actions.expand_template(
-            template = ctx.file._run_template,
-            output = runnable_loader,
-            substitutions = {
-                "{{BASH_RLOCATION_FUNCTION}}": BASH_RLOCATION_FUNCTION,
-                "{{tar}}": to_rlocation_path(ctx, bsdtar.tarinfo.binary),
-                "{{mtree_path}}": to_rlocation_path(ctx, mtree_spec),
-                "{{loader}}": to_rlocation_path(ctx, ctx.executable.loader) if ctx.executable.loader else "",
-                "{{manifest_root}}": manifest_json.root.path,
-                "{{image_root}}": image.root.path,
-                "{{workspace_name}}": ctx.workspace_name,
-            },
-            is_executable = True,
-        )
-    else:
-        runnable_loader = ctx.actions.declare_file(ctx.label.name + ".bat")
-        ctx.actions.expand_template(
-            template = ctx.file._run_template_windows,
-            output = runnable_loader,
-            substitutions = {
-                "{{BATCH_RLOCATION_FUNCTION}}": BATCH_RLOCATION_FUNCTION,
-                "{{tar}}": to_rlocation_path(ctx, bsdtar.tarinfo.binary),
-                "{{mtree_path}}": to_rlocation_path(ctx, mtree_spec),
-                "{{loader}}": to_rlocation_path(ctx, ctx.executable.loader) if ctx.executable.loader else "",
-                "{{manifest_root}}": manifest_json.root.path,
-                "{{image_root}}": image.root.path,
-                "{{workspace_name}}": ctx.workspace_name,
-            },
-            is_executable = True,
-        )
+    runnable_loader = ctx.actions.declare_file(ctx.label.name + ".sh")
 
     runtime_deps = []
-    if ctx.executable.loader:
-        runtime_deps.append(ctx.executable.loader)
+    if ctx.file.loader:
+        runtime_deps.append(ctx.file.loader)
     runfiles = ctx.runfiles(runtime_deps, transitive_files = tar_inputs)
     runfiles = runfiles.merge(ctx.attr.image[DefaultInfo].default_runfiles)
     runfiles = runfiles.merge(ctx.attr._runfiles.default_runfiles)
-    if ctx.executable.loader:
-        runfiles = runfiles.merge(ctx.attr.loader.default_runfiles)
+
+    ctx.actions.expand_template(
+        template = ctx.file._run_template,
+        output = runnable_loader,
+        substitutions = {
+            "{{BASH_RLOCATION_FUNCTION}}": BASH_RLOCATION_FUNCTION,
+            "{{tar}}": to_rlocation_path(ctx, bsdtar.tarinfo.binary),
+            "{{mtree_path}}": to_rlocation_path(ctx, mtree_spec),
+            "{{loader}}": to_rlocation_path(ctx, ctx.file.loader) if ctx.file.loader else "",
+            "{{manifest_root}}": manifest_json.root.path,
+            "{{image_root}}": image.root.path,
+            "{{workspace_name}}": ctx.workspace_name,
+        },
+        is_executable = True,
+    )
 
     return [
         DefaultInfo(
@@ -277,7 +240,7 @@ oci_load = rule(
         "@bazel_tools//tools/sh:toolchain_type",
         "@aspect_bazel_lib//lib:coreutils_toolchain_type",
         "@aspect_bazel_lib//lib:jq_toolchain_type",
-        "@tar.bzl//tar/toolchain:type",
+        "@aspect_bazel_lib//lib:tar_toolchain_type",
     ],
     executable = True,
 )
diff --git a/oci/private/load.sh.tpl b/oci/private/load.sh.tpl
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-set -o pipefail -o errexit -o nounset
+set -o pipefail -o errexit -o nounserun
 
 {{BASH_RLOCATION_FUNCTION}}
 
@@ -24,13 +24,12 @@ else
 fi
 
 # Strip manifest root and image root from mtree to make it compatible with runfiles layout.
-image_root="$(rlocation {{image_root}})/"
-manifest_root="$(rlocation {{manifest_root}})/"
+image_root="{{image_root}}/"
+manifest_root="{{manifest_root}}/"
 mtree_contents="$(cat $MTREE)"
 mtree_contents="${mtree_contents//"$image_root"/}"
 mtree_contents="${mtree_contents//"$manifest_root"/}"
 
-echo "$TAR" --cd "$RUNFILES_DIR/{{workspace_name}}" --create --no-xattr --no-mac-metadata @-
 "$CONTAINER_CLI" load --input <(
     "$TAR" --cd "$RUNFILES_DIR/{{workspace_name}}" --create --no-xattr --no-mac-metadata @- <<< "$mtree_contents"
 )
diff --git a/oci/private/tarball.sh.tpl b/oci/private/tarball.sh.tpl
@@ -4,13 +4,11 @@
 
 set -o pipefail -o errexit -o nounset
 
-{{BASH_RLOCATION_FUNCTION}}
-
 readonly FORMAT="{{format}}"
-readonly JQ="$(rlocation "{{jq_path}}")"
-readonly COREUTILS="$(rlocation "{{coreutils_path}}")"
-readonly TAR="$(rlocation "{{tar}}")"
-readonly IMAGE_DIR="$(rlocation "{{image_dir}}")"
+readonly JQ="{{jq_path}}"
+readonly COREUTILS="{{coreutils_path}}"
+readonly TAR="{{tar}}"
+readonly IMAGE_DIR="{{image_dir}}"
 readonly REPOTAGS=($("${COREUTILS}" cat "{{tags}}"))
 readonly INDEX_FILE="${IMAGE_DIR}/index.json"
 
