Enhance container cleanup action with better error handling and logging

Co-authored-by: csharpfritz <[email protected]>

Author: Copilot

.github/workflows/cleanup-container-images.yml

@@ -43,10 +43,23 @@ jobs:
           rg_name="rg-${{ env.AZURE_ENV_NAME }}"
           echo "Resource group: $rg_name"
           
+          # Verify the resource group exists
+          if ! az group show --name "$rg_name" >/dev/null 2>&1; then
+            echo "Resource group '$rg_name' not found. Skipping cleanup."
+            echo "acr_name=" >> $GITHUB_OUTPUT
+            exit 0
+          fi
+          
           # Get the ACR name from the resource group
-          acr_name=$(az acr list --resource-group "$rg_name" --query "[0].name" --output tsv)
-          echo "ACR Name: $acr_name"
-          echo "acr_name=$acr_name" >> $GITHUB_OUTPUT
+          acr_name=$(az acr list --resource-group "$rg_name" --query "[0].name" --output tsv 2>/dev/null)
+          
+          if [ -z "$acr_name" ] || [ "$acr_name" = "null" ]; then
+            echo "No Azure Container Registry found in resource group '$rg_name'."
+            echo "acr_name=" >> $GITHUB_OUTPUT
+          else
+            echo "Found ACR: $acr_name"
+            echo "acr_name=$acr_name" >> $GITHUB_OUTPUT
+          fi
       
       - name: Cleanup Old Container Images
         run: |
@@ -57,23 +70,30 @@ jobs:
             exit 0
           fi
           
-          echo "Cleaning up old images in ACR: $acr_name"
+          echo "Starting container image cleanup for ACR: $acr_name"
+          echo "Retention policy: Keep 5 most recent images per repository"
           
           # Get all repositories in the ACR
-          repositories=$(az acr repository list --name "$acr_name" --output tsv)
+          repositories=$(az acr repository list --name "$acr_name" --output tsv 2>/dev/null)
           
           if [ -z "$repositories" ]; then
             echo "No repositories found in ACR. Nothing to clean up."
             exit 0
           fi
           
+          total_deleted=0
+          total_kept=0
+          
           # Process each repository
+          echo "Found repositories: $(echo "$repositories" | wc -l)"
           for repo in $repositories; do
+            echo ""
             echo "Processing repository: $repo"
             
             # Get all tags for this repository, sorted by creation time (newest first)
+            # Include detailed information to help with debugging
             tags=$(az acr repository show-tags --name "$acr_name" --repository "$repo" \
-              --orderby time_desc --output tsv)
+              --orderby time_desc --output tsv 2>/dev/null)
             
             if [ -z "$tags" ]; then
               echo "  No tags found for repository $repo"
@@ -87,20 +107,38 @@ jobs:
             # If we have more than 5 tags, delete the older ones
             if [ "$tag_count" -gt 5 ]; then
               # Skip the first 5 tags (most recent) and delete the rest
+              tags_to_keep=$(echo "$tags" | head -5)
               tags_to_delete=$(echo "$tags" | tail -n +6)
               delete_count=$(echo "$tags_to_delete" | wc -l)
               
-              echo "  Deleting $delete_count old tags from repository $repo"
+              echo "  Keeping 5 most recent tags:"
+              for tag in $tags_to_keep; do
+                echo "    Keeping: $repo:$tag"
+              done
+              
+              echo "  Deleting $delete_count old tags:"
               
               for tag in $tags_to_delete; do
-                echo "    Deleting tag: $repo:$tag"
-                az acr repository delete --name "$acr_name" --image "$repo:$tag" --yes
+                echo "    Deleting: $repo:$tag"
+                
+                # Add error handling for individual deletions
+                if az acr repository delete --name "$acr_name" --image "$repo:$tag" --yes 2>/dev/null; then
+                  echo "      ✓ Successfully deleted $repo:$tag"
+                  ((total_deleted++))
+                else
+                  echo "      ✗ Failed to delete $repo:$tag (may no longer exist)"
+                fi
               done
               
-              echo "  Successfully deleted $delete_count old tags from repository $repo"
+              ((total_kept += 5))
             else
               echo "  Repository $repo has $tag_count tags (≤5), no cleanup needed"
+              ((total_kept += tag_count))
             fi
           done
           
-          echo "Container image cleanup completed!"
+          echo ""
+          echo "=== Cleanup Summary ==="
+          echo "Total images kept: $total_kept"
+          echo "Total images deleted: $total_deleted"
+          echo "Container image cleanup completed successfully!"