From d7556ea77eb870251d4d72f8ea82517113c2ef58 Mon Sep 17 00:00:00 2001
From: Isa Farnik <isa@konghq.com>
Date: Fri, 12 Jul 2024 12:18:56 -0700
Subject: [PATCH 1/3] fix(bazel): cp luarocks-admin to bin

---
 build/BUILD.bazel                                  | 2 ++
 scripts/explain_manifest/docker_image_filelist.txt | 1 +
 scripts/explain_manifest/suites.py                 | 1 +
 3 files changed, 4 insertions(+)

diff --git a/build/BUILD.bazel b/build/BUILD.bazel
index 3af4f65ac45a..715a9e194d79 100644
--- a/build/BUILD.bazel
+++ b/build/BUILD.bazel
@@ -218,6 +218,7 @@ kong_genrule(
     ],
     outs = [
         "bin/luarocks",
+        "bin/luarocks-admin",
         "etc/kong/kong.conf.default",
         "etc/luarocks",
         "lib",
@@ -231,6 +232,7 @@ kong_genrule(
         LUAROCKS=${WORKSPACE_PATH}/$(dirname '$(location @luarocks//:luarocks_make)')/luarocks_tree
         cp -r ${LUAROCKS}/share ${LUAROCKS}/lib ${LUAROCKS}/etc ${BUILD_DESTDIR}/.
         cp ${LUAROCKS}/bin/luarocks ${BUILD_DESTDIR}/bin/.
+        cp ${LUAROCKS}/bin/luarocks-admin ${BUILD_DESTDIR}/bin/.
         chmod -R "u+rw" ${BUILD_DESTDIR}/share/lua
 
         mkdir -p ${BUILD_DESTDIR}/etc/kong/
diff --git a/scripts/explain_manifest/docker_image_filelist.txt b/scripts/explain_manifest/docker_image_filelist.txt
index 4ecad80ed007..6f4024ba008a 100644
--- a/scripts/explain_manifest/docker_image_filelist.txt
+++ b/scripts/explain_manifest/docker_image_filelist.txt
@@ -3,6 +3,7 @@
 /usr/local/kong/**
 /usr/local/bin/kong
 /usr/local/bin/luarocks
+/usr/local/bin/luarocks-admin
 /usr/local/etc/luarocks/**
 /usr/local/lib/lua/**
 /usr/local/lib/luarocks/**
diff --git a/scripts/explain_manifest/suites.py b/scripts/explain_manifest/suites.py
index 85238d565175..9b14241b83f7 100644
--- a/scripts/explain_manifest/suites.py
+++ b/scripts/explain_manifest/suites.py
@@ -143,6 +143,7 @@ def docker_suites(expect):
             .gid.equals(0)
 
     for path in ("/usr/local/bin/luarocks",
+                 "/usr/local/bin/luarocks-admin",
                  "/usr/local/etc/luarocks/**",
                  "/usr/local/lib/lua/**",
                  "/usr/local/lib/luarocks/**",

From 8e6391ce010541b9644d1267c6af7c192a197abe Mon Sep 17 00:00:00 2001
From: Isa Farnik <isa@konghq.com>
Date: Fri, 12 Jul 2024 12:32:29 -0700
Subject: [PATCH 2/3] chore: add changelog re: luarocks-admin

---
 changelog/unreleased/kong/cp-luarocks-admin-to-bin.yml | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 changelog/unreleased/kong/cp-luarocks-admin-to-bin.yml

diff --git a/changelog/unreleased/kong/cp-luarocks-admin-to-bin.yml b/changelog/unreleased/kong/cp-luarocks-admin-to-bin.yml
new file mode 100644
index 000000000000..cf67c75f1747
--- /dev/null
+++ b/changelog/unreleased/kong/cp-luarocks-admin-to-bin.yml
@@ -0,0 +1,3 @@
+message: "Ensure luarocks-admin is available in /usr/local/bin"
+type: bugfix
+scope: Core

From a165abb06a567f589cf08500851e05cb7396f9d8 Mon Sep 17 00:00:00 2001
From: Isa Farnik <isa@konghq.com>
Date: Fri, 12 Jul 2024 12:34:54 -0700
Subject: [PATCH 3/3] chore: accept gha changelog suggestion

---
 changelog/unreleased/kong/cp-luarocks-admin-to-bin.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/changelog/unreleased/kong/cp-luarocks-admin-to-bin.yml b/changelog/unreleased/kong/cp-luarocks-admin-to-bin.yml
index cf67c75f1747..4563f041b647 100644
--- a/changelog/unreleased/kong/cp-luarocks-admin-to-bin.yml
+++ b/changelog/unreleased/kong/cp-luarocks-admin-to-bin.yml
@@ -1,3 +1,3 @@
-message: "Ensure luarocks-admin is available in /usr/local/bin"
+message: "Fixed an issue where luarocks-admin was not available in /usr/local/bin."
 type: bugfix
 scope: Core