From 27846684ba8fbe67a4db087ae2040e94ace89877 Mon Sep 17 00:00:00 2001
From: Sophie Phoon <sophiephoon@canva.com>
Date: Thu, 6 Jun 2024 09:38:11 +0800
Subject: [PATCH] Set allow_empty = True in apk src globbing

---
 apko/BUILD.bazel         | 12 ++++++------
 apko/private/BUILD.bazel | 12 ++++++------
 apko/private/apk.bzl     |  5 ++++-
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/apko/BUILD.bazel b/apko/BUILD.bazel
index 8e36bbe..3c3debb 100644
--- a/apko/BUILD.bazel
+++ b/apko/BUILD.bazel
@@ -63,12 +63,6 @@ bzl_library(
     ],
 )
 
-bzl_library(
-    name = "toolchain",
-    srcs = ["toolchain.bzl"],
-    visibility = ["//visibility:public"],
-)
-
 # Enables calling apko tool directly by bazel.
 # To resolve given `./apko.yaml` file into `./apko.lock.json`, once can call:
 #   e.g. (cd ./examples/oci; bazel run @rules_apko//apko lock ./apko.yaml)
@@ -76,3 +70,9 @@ apko_run(
     name = "apko",
     visibility = ["//visibility:public"],
 )
+
+bzl_library(
+    name = "toolchain",
+    srcs = ["toolchain.bzl"],
+    visibility = ["//visibility:public"],
+)
diff --git a/apko/private/BUILD.bazel b/apko/private/BUILD.bazel
index df424ab..360c0b5 100644
--- a/apko/private/BUILD.bazel
+++ b/apko/private/BUILD.bazel
@@ -2,12 +2,6 @@ load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
 
 exports_files(srcs = ["apko_config.tmpl.sh"])
 
-bzl_library(
-    name = "apko_config",
-    srcs = ["apko_config.bzl"],
-    visibility = ["//apko:__subpackages__"],
-)
-
 bzl_library(
     name = "apk",
     srcs = ["apk.bzl"],
@@ -44,6 +38,12 @@ bzl_library(
     deps = [":apko_run"],
 )
 
+bzl_library(
+    name = "apko_config",
+    srcs = ["apko_config.bzl"],
+    visibility = ["//apko:__subpackages__"],
+)
+
 bzl_library(
     name = "resolved_toolchain",
     srcs = ["resolved_toolchain.bzl"],
diff --git a/apko/private/apk.bzl b/apko/private/apk.bzl
index ebd9780..de5cb58 100644
--- a/apko/private/apk.bzl
+++ b/apko/private/apk.bzl
@@ -6,7 +6,10 @@ APK_IMPORT_TMPL = """\
 # Generated by apk_import. DO NOT EDIT
 filegroup(
     name = "all", 
-    srcs = glob(["**/*.tar.gz", "**/*.apk"]),
+    srcs = glob(
+        ["**/*.tar.gz", "**/*.apk"],
+        allow_empty = True,
+    ),
     visibility = ["//visibility:public"]
 )
 """