pr comments fix

Author: nevingeorgesunny

src/main/java/com/cloudbees/jenkins/support/SupportAction.java

@@ -348,7 +348,7 @@ public void doGenerateAllBundles(StaplerRequest2 req, StaplerResponse2 rsp) thro
      * @throws IOException If an input or output exception occurs
      */
     @RequirePOST
-    public HttpRedirect doGenerateAllBundleAsync(StaplerRequest2 req, StaplerResponse2 rsp)
+    public HttpRedirect doGenerateBundleAsync(StaplerRequest2 req, StaplerResponse2 rsp)
             throws ServletException, IOException {
         JSONObject json = req.getSubmittedForm();
         if (!json.has("components")) {
@@ -374,7 +374,7 @@ public HttpRedirect doGenerateAllBundleAsync(StaplerRequest2 req, StaplerRespons
                 SupportPlugin.setRequesterAuthentication(Jenkins.getAuthentication2());
                 try {
                     try (ACLContext ignored = ACL.as2(ACL.SYSTEM2)) {
-                        SupportPlugin.writeBundle(fileOutputStream, components);
+                        SupportPlugin.writeBundle(fileOutputStream, syncComponent);
                     } catch (IOException e) {
                         logger.log(Level.WARNING, e.getMessage(), e);
                     }
@@ -552,8 +552,17 @@ protected void compute() throws Exception {
             }
 
             try (FileOutputStream fileOutputStream = new FileOutputStream(new File(outputDir, supportBundleName))) {
-                SupportPlugin.writeBundle(
-                        fileOutputStream, components, this::progress, Path.of(outputDir.getAbsolutePath()));
+                SupportPlugin.setRequesterAuthentication(Jenkins.getAuthentication2());
+                try {
+                    try (ACLContext ignored = ACL.as2(ACL.SYSTEM2)) {
+                        SupportPlugin.writeBundle(
+                                fileOutputStream, components, this::progress, Path.of(outputDir.getAbsolutePath()));
+                    } catch (IOException e) {
+                        logger.log(Level.FINE, e.getMessage(), e);
+                    }
+                } finally {
+                    SupportPlugin.clearRequesterAuthentication();
+                }
             } finally {
                 logger.fine("Processing support bundle async completed");
             }

src/main/java/com/cloudbees/jenkins/support/SupportPlugin.java

@@ -490,11 +490,7 @@ public static void writeBundle(
                 }
 
                 // process for async components
-                if (!components.stream()
-                                .filter(c -> !c.canBeGeneratedAsync())
-                                .toList()
-                                .isEmpty()
-                        && outputPath != null) {
+                if (outputPath != null) {
                     try {
                         File zipFile = outputPath.resolve(SYNC_SUPPORT_BUNDLE).toFile();
                         try (ZipInputStream zis = new ZipInputStream(new FileInputStream(zipFile))) {

src/main/resources/com/cloudbees/jenkins/support/SupportAction/index.jelly

@@ -50,7 +50,7 @@
           <a href="${rootURL}/configureSecurity">global security</a> under <i>Support Bundle Anonymization</i>.
         </p>
       </j:if>
-      <f:form name="bundle-contents" method="POST" action="generateAllBundleAsync">
+      <f:form name="bundle-contents" method="POST" action="generateBundleAsync">
         <j:forEach var="category" items="${it.categorizedComponents.entrySet()}">
           <section class="jenkins-section jenkins-section__bottom-padding">
             <h2 class="jenkins-section__title">${category.key.label}</h2>