Refactor prune-pull-requests-image-tags to use clean-images action

Co-authored-by: neilime <314088+neilime@users.noreply.github.com>

Author: Copilot

actions/docker/prune-pull-requests-image-tags/action.yml

@@ -14,7 +14,7 @@ outputs:
       ```json
       ["1.0.0", "1.0.1"]
       ```
-    value: ${{ steps.delete-image-tags.outputs.deleted-image-tags }}
+    value: ${{ steps.clean-images.outputs.deleted-package-versions }}
 
 inputs:
   image:
@@ -41,15 +41,10 @@ runs:
       with:
         image: ${{ inputs.image }}
 
-    - shell: bash
-      # FIXME: workaround until will be merged: https://github.com/actions/runner/pull/1684
-      run: |
-        rm -fr ./self-actions
-
     - id: is-organization-or-user
       uses: hoverkraft-tech/ci-github-common/actions/repository-owner-is-organization@b7dd413209df265bef8d7eb0efb117eaabc684c4 # 0.27.0
 
-    - id: delete-image-tags
+    - id: get-tags-to-delete
       uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
       with:
         github-token: ${{ inputs.github-token }}
@@ -80,7 +75,7 @@ runs:
           const isOrganization = `${{ steps.is-organization-or-user.outputs.is-organization }}` === 'true';
 
           const script = require(`${{ github.action_path }}/index.js`)
-          const deletedTags = await script({
+          const tagsToDelete = await script({
             github,
             context,
             core,
@@ -89,4 +84,20 @@ runs:
             isOrganization,
           });
 
-          core.setOutput('deleted-image-tags', JSON.stringify(deletedTags));
+          // Convert tags to comma-separated string for delete-tags input
+          const tagsString = tagsToDelete.join(',');
+          core.setOutput('tags-to-delete', tagsString);
+          core.info(`Tags to delete: ${tagsString}`);
+
+    - id: clean-images
+      uses: ./self-actions/docker/clean-images
+      if: steps.get-tags-to-delete.outputs.tags-to-delete != ''
+      with:
+        token: ${{ inputs.github-token }}
+        package: ${{ steps.image-name.outputs.image-name }}
+        delete-tags: ${{ steps.get-tags-to-delete.outputs.tags-to-delete }}
+
+    - shell: bash
+      # FIXME: workaround until will be merged: https://github.com/actions/runner/pull/1684
+      run: |
+        rm -fr ./self-actions

actions/docker/prune-pull-requests-image-tags/index.js

@@ -10,7 +10,7 @@ module.exports = async ({
   const packageName = imageName.replace(`${repositoryOwner}/`, "");
 
   let currentPage = 1;
-  const allDeletedTags = [];
+  const allTagsToDelete = [];
   for (;;) {
     const data = await getAllPackageVersions({
       github,
@@ -26,23 +26,21 @@ module.exports = async ({
       break;
     }
 
-    const deletedTags = await Promise.all(
+    const tagsToDelete = await Promise.all(
       data.map((packageVersion) =>
-        processPackageVersion({
+        getTagsToDeleteFromPackageVersion({
           github,
           context,
           core,
-          isOrganization,
-          packageName,
           pullRequestTagFilter,
           packageVersion,
         }),
       ),
     );
-    allDeletedTags.push(...deletedTags.flat());
+    allTagsToDelete.push(...tagsToDelete.flat());
   }
 
-  return [...new Set(allDeletedTags)];
+  return [...new Set(allTagsToDelete)];
 };
 
 async function getAllPackageVersions({
@@ -81,12 +79,10 @@ async function getAllPackageVersions({
   return data;
 }
 
-async function processPackageVersion({
+async function getTagsToDeleteFromPackageVersion({
   github,
   context,
   core,
-  packageName,
-  isOrganization,
   pullRequestTagFilter,
   packageVersion,
 }) {
@@ -127,15 +123,6 @@ async function processPackageVersion({
     return [];
   }
 
-  await deletePackageVersion({
-    github,
-    core,
-    context,
-    packageName,
-    isOrganization,
-    packageVersion,
-  });
-
   return tags;
 }
 
@@ -171,47 +158,6 @@ async function isPullRequestClosed({ github, context, pullRequestNumber }) {
   return closedPullRequests.get(pullRequestNumber);
 }
 
-async function deletePackageVersion({
-  github,
-  core,
-  context,
-  packageName,
-  isOrganization,
-  packageVersion,
-}) {
-  try {
-    if (isOrganization) {
-      return await rateLimitRetryCall(
-        github.rest.packages.deletePackageVersionForOrg,
-        {
-          package_type: "container",
-          package_name: packageName,
-          org: context.repo.owner,
-          package_version_id: packageVersion.id,
-        },
-      );
-    }
-
-    return await rateLimitRetryCall(
-      github.rest.packages.deletePackageVersionForUser,
-      {
-        package_type: "container",
-        package_name: packageName,
-        username: context.repo.owner,
-        package_version_id: packageVersion.id,
-      },
-    );
-  } catch (error) {
-    if (error.status === 404) {
-      core.warning(
-        `Package version ${packageVersion.name} (${packageVersion.id}) cannot be deleted as it is not found`,
-      );
-    } else {
-      throw error;
-    }
-  }
-}
-
 async function rateLimitRetryCall(fn, ...args) {
   try {
     return await fn(...args);