Remove artifacts from S3 for deleted pipelines

src/main/java/hudson/plugins/s3/S3BucketPublisher.java

@@ -13,10 +13,13 @@
 import hudson.model.AbstractProject;
 import hudson.model.Action;
 import hudson.model.Fingerprint;
+import hudson.model.Job;
 import hudson.model.Item;
+import hudson.model.ItemGroup;
 import hudson.model.Result;
 import hudson.model.Run;
 import hudson.model.TaskListener;
+import hudson.model.listeners.ItemListener;
 import hudson.model.listeners.RunListener;
 import hudson.tasks.BuildStepDescriptor;
 import hudson.tasks.BuildStepMonitor;
@@ -436,6 +439,49 @@
         return fileName;
     }
 
+    @Extension
+    public static final class S3DeletedItemListener extends ItemListener {
+        @Override
+        public void onDeleted(Item item) {
+            if (item instanceof Job<?, ?> job) {
+                handleJobDeletion(job);
+            } else if (item instanceof ItemGroup<?> itemGroup) {
+                handleItemGroupDeletion(itemGroup);
+            }
+        }
+
+        private void handleJobDeletion(Job<?, ?> job) {
+            for (Run<?, ?> run : job.getBuilds()) {
+                S3ArtifactsAction artifacts = run.getAction(S3ArtifactsAction.class);
+                if (artifacts != null) {
+                    S3Profile profile = S3BucketPublisher.getProfile(artifacts.getProfile());
+                    if (profile.isDeleteArtifactsRecursively()) {
+                        for (FingerprintRecord record : artifacts.getArtifacts()) {
+                            if (!record.isKeepForever()) {
+                                try {
+                                    profile.delete(run, record);
+                                } catch (Exception e) {
+                                    Logger.getLogger(S3DeletedItemListener.class.getName())
+                                            .log(Level.WARNING, "Failed to delete S3 artifact: " + record.getName(), e);
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        private void handleItemGroupDeletion(ItemGroup<?> itemGroup) {
+            for (Item item : itemGroup.getItems()) {
+                if (item instanceof Job<?, ?> job) {
+                    handleJobDeletion(job);
+                } else if (item instanceof ItemGroup<?> childItemGroup) {
+                    handleItemGroupDeletion(childItemGroup);
+                }
+            }
+        }
+    }
+
     @Extension
     public static final class S3DeletedJobListener extends RunListener<Run> {
         @Override

src/main/java/hudson/plugins/s3/S3Profile.java

@@ -43,6 +43,7 @@
     private final boolean useRole;
     private final int signedUrlExpirySeconds;
     private boolean usePathStyle = false;
+    private boolean deleteArtifactsRecursively = false;
 
     @DataBoundConstructor
     public S3Profile(String name, String accessKey, String secretKey, boolean useRole, int signedUrlExpirySeconds, String maxUploadRetries, String uploadRetryTime, String maxDownloadRetries, String downloadRetryTime, boolean keepStructure) {
@@ -69,6 +70,11 @@
         this.usePathStyle = usePathStyle;
     }
 
+    @DataBoundSetter
+    public void setDeleteArtifactsRecursively(boolean deleteArtifactsRecursively) {
+        this.deleteArtifactsRecursively = deleteArtifactsRecursively;
+    }
+
     public boolean isKeepStructure() {
         return keepStructure;
     }
@@ -123,6 +129,8 @@
 
     public boolean isUsePathStyle() { return usePathStyle; }
 
+    public boolean isDeleteArtifactsRecursively() { return deleteArtifactsRecursively; }
+
     public S3Client getClient(String region) {
         return ClientHelper.createClient(accessKey, Secret.toString(secretKey), useRole, region, getProxy(), usePathStyle);
     }

src/main/resources/hudson/plugins/s3/S3BucketPublisher/global.jelly

@@ -43,6 +43,9 @@
             <f:entry title="Use Path Style URL" help="/plugin/s3/help-pathStyle.html">
               <f:checkbox name="usePathStyle" checked="${profile.usePathStyle}"/>
             </f:entry>
+            <f:entry title="Delete Artifacts Recursively" help="/plugin/s3/help-deleteArtifactsRecursively.html">
+              <f:checkbox name="deleteArtifactsRecursively" checked="${profile.deleteArtifactsRecursively}"/>
+            </f:entry>
           </f:advanced>
 
           <f:entry title="">

src/main/webapp/help-deleteArtifactsRecursively.html

@@ -0,0 +1 @@
+<div>If ticked deletes artifacts recursively in case of pipeline or folder deletion</div>