Merge pull request #594 from gsmet/handle-service-down-exceptions

Handle ServiceDownException by providing a proper error message

Author: gsmet

runtime/src/main/java/io/quarkiverse/githubapp/runtime/error/DefaultErrorHandler.java

@@ -7,9 +7,11 @@
 
 import org.jboss.logging.Logger;
 import org.kohsuke.github.GHEventPayload;
+import org.kohsuke.github.ServiceDownException;
 
 import io.quarkiverse.githubapp.GitHubEvent;
 import io.quarkiverse.githubapp.error.ErrorHandler;
+import io.quarkiverse.githubapp.runtime.github.GitHubServiceDownException;
 import io.quarkiverse.githubapp.runtime.github.PayloadHelper;
 import io.quarkus.arc.DefaultBean;
 import io.quarkus.runtime.LaunchMode;
@@ -29,6 +31,10 @@ public class DefaultErrorHandler implements ErrorHandler {
     public void handleError(GitHubEvent gitHubEvent, GHEventPayload payload, Throwable t) {
         StringBuilder errorMessage = new StringBuilder();
         errorMessage.append("Error handling delivery " + gitHubEvent.getDeliveryId() + "\n");
+        if (t instanceof ServiceDownException || t instanceof GitHubServiceDownException) {
+            errorMessage
+                    .append("››› GitHub APIs are not available at the moment. Have a look at https://www.githubstatus.com.\n");
+        }
         if (gitHubEvent.getRepository().isPresent()) {
             errorMessage.append("› Repository: " + gitHubEvent.getRepository().get() + "\n");
         }

runtime/src/main/java/io/quarkiverse/githubapp/runtime/github/GitHubFileDownloader.java

@@ -10,6 +10,7 @@
 import org.kohsuke.github.GHContent;
 import org.kohsuke.github.GHFileNotFoundException;
 import org.kohsuke.github.GHRepository;
+import org.kohsuke.github.ServiceDownException;
 
 import io.quarkus.runtime.LaunchMode;
 
@@ -35,6 +36,9 @@ public Optional<String> getFileContent(GHRepository ghRepository, String ref, St
                         + ". Either the file does not exist or the 'Contents' permission has not been set for the application.");
             }
             return Optional.empty();
+        } catch (ServiceDownException e) {
+            throw new GitHubServiceDownException(
+                    "Error downloading file " + fullPath + " for repository " + ghRepository.getFullName());
         } catch (IOException e) {
             throw new IllegalStateException(
                     "Error downloading file " + fullPath + " for repository " + ghRepository.getFullName(), e);

runtime/src/main/java/io/quarkiverse/githubapp/runtime/github/GitHubServiceDownException.java

@@ -0,0 +1,8 @@
+package io.quarkiverse.githubapp.runtime.github;
+
+public class GitHubServiceDownException extends RuntimeException {
+
+    public GitHubServiceDownException(String message) {
+        super(message);
+    }
+}