Merge pull request #428 from jonesbusy/feature/more-title

Handle push error
jenkins-infra · Dec 10, 2024 · c252253 · c252253
2 parents df2bb2d + cdecd60
commit c252253
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 6 deletions.
diff --git a/...odernizer-core/src/main/java/io/jenkins/tools/pluginmodernizer/core/github/GHService.java b/...odernizer-core/src/main/java/io/jenkins/tools/pluginmodernizer/core/github/GHService.java
@@ -14,12 +14,14 @@
 import java.nio.file.Files;
 import java.util.List;
 import java.util.Optional;
+import java.util.stream.StreamSupport;
 import org.eclipse.jgit.api.Git;
 import org.eclipse.jgit.api.ResetCommand;
 import org.eclipse.jgit.api.Status;
 import org.eclipse.jgit.api.errors.GitAPIException;
 import org.eclipse.jgit.api.errors.RefAlreadyExistsException;
 import org.eclipse.jgit.lib.Ref;
+import org.eclipse.jgit.transport.PushResult;
 import org.eclipse.jgit.transport.RefSpec;
 import org.eclipse.jgit.transport.URIish;
 import org.eclipse.jgit.transport.UsernamePasswordCredentialsProvider;
@@ -677,17 +679,34 @@ public void pushChanges(Plugin plugin) {
             return;
         }
         try (Git git = Git.open(plugin.getLocalRepository().toFile())) {
-            git.push()
-                    .setForce(true)
-                    .setCredentialsProvider(new UsernamePasswordCredentialsProvider(Settings.GITHUB_TOKEN, ""))
-                    .setRemote("origin")
-                    .setRefSpecs(new RefSpec(BRANCH_NAME + ":" + BRANCH_NAME))
-                    .call();
+            List<PushResult> results = StreamSupport.stream(
+                            git.push()
+                                    .setForce(true)
+                                    .setCredentialsProvider(
+                                            new UsernamePasswordCredentialsProvider(Settings.GITHUB_TOKEN, ""))
+                                    .setRemote("origin")
+                                    .setRefSpecs(new RefSpec(BRANCH_NAME + ":" + BRANCH_NAME))
+                                    .call()
+                                    .spliterator(),
+                            false)
+                    .toList();
+            results.forEach(result -> {
+                LOG.debug("Push result: {}", result.getMessages());
+                // TODO: Always use <user>@users.noreply.github.com instead of granting right to read primary email
+                if (result.getMessages().contains("GH007")) {
+                    plugin.addError("Not allow to push. Your push would publish a private email address.");
+                    plugin.raiseLastError();
+                } else if (result.getMessages().contains("error")) {
+                    plugin.addError("Unexpected push error: %s".formatted(result.getMessages()));
+                    plugin.raiseLastError();
+                }
+            });
             plugin.withoutCommits();
             plugin.withChangesPushed();
             LOG.info("Pushed changes to forked repository for plugin {}", plugin.getName());
         } catch (IOException | GitAPIException e) {
             plugin.addError("Failed to push changes", e);
+            plugin.raiseLastError();
         }
     }
 
@@ -750,6 +769,7 @@ public void openPullRequest(Plugin plugin) {
             plugin.withPullRequest();
         } catch (IOException e) {
             plugin.addError("Failed to create pull request", e);
+            plugin.raiseLastError();
         }
     }
 

diff --git a/plugin-modernizer-core/src/main/jte/pr-title-UpgradeNextMajorParentVersion.jte b/plugin-modernizer-core/src/main/jte/pr-title-UpgradeNextMajorParentVersion.jte
@@ -0,0 +1,5 @@
+@import io.jenkins.tools.pluginmodernizer.core.model.Plugin
+@import org.openrewrite.Recipe
+@param Plugin plugin
+@param Recipe recipe
+Require ${plugin.getMetadata().getJenkinsVersion()} and Java 17
diff --git a/...er-core/src/test/java/io/jenkins/tools/pluginmodernizer/core/utils/TemplateUtilsTest.java b/...er-core/src/test/java/io/jenkins/tools/pluginmodernizer/core/utils/TemplateUtilsTest.java
@@ -112,4 +112,25 @@ public void testFriendlyPrTitleUpgradeToLatestJava11CoreVersion() {
         // Assert
         assertEquals("Require 2.462.3", result);
     }
+
+    @Test
+    public void testFriendlyPrTitleUpgradeNextMajorParentVersion() {
+
+        // Mocks
+        Plugin plugin = mock(Plugin.class);
+        PluginMetadata metadata = mock(PluginMetadata.class);
+        Recipe recipe = mock(Recipe.class);
+
+        doReturn(metadata).when(plugin).getMetadata();
+        doReturn("2.479.1").when(metadata).getJenkinsVersion();
+        doReturn("io.jenkins.tools.pluginmodernizer.UpgradeNextMajorParentVersion")
+                .when(recipe)
+                .getName();
+
+        // Test
+        String result = TemplateUtils.renderPullRequestTitle(plugin, recipe);
+
+        // Assert
+        assertEquals("Require 2.479.1 and Java 17", result);
+    }
 }