fixup! Intercept ScmComunicationException on workspace start

eclipse-che · Sep 11, 2024 · deda774 · deda774
1 parent 1b4b316
commit deda774
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git a/...s/src/main/java/org/eclipse/che/api/factory/server/azure/devops/AzureDevOpsApiClient.java b/...s/src/main/java/org/eclipse/che/api/factory/server/azure/devops/AzureDevOpsApiClient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2023 Red Hat, Inc.
+ * Copyright (c) 2012-2024 Red Hat, Inc.
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0
  * which is available at https://www.eclipse.org/legal/epl-2.0/

diff --git a/...ithub-common/src/main/java/org/eclipse/che/api/factory/server/github/GithubApiClient.java b/...ithub-common/src/main/java/org/eclipse/che/api/factory/server/github/GithubApiClient.java
@@ -277,6 +277,7 @@ private <T> T executeRequest(
       Function<HttpResponse<InputStream>, T> responseConverter)
       throws ScmBadRequestException, ScmItemNotFoundException, ScmCommunicationException,
           ScmUnauthorizedException {
+    String provider = GITHUB_SAAS_ENDPOINT.equals(getServerUrl()) ? "github" : "github-server";
     try {
       HttpResponse<InputStream> response =
           httpClient.send(request, HttpResponse.BodyHandlers.ofInputStream());
@@ -300,11 +301,11 @@ private <T> T executeRequest(
             throw new ScmUnauthorizedException(body, "github", "v2", "");
           default:
             throw new ScmCommunicationException(
-                "Unexpected status code " + statusCode + " " + body, statusCode, "github");
+                "Unexpected status code " + statusCode + " " + body, statusCode, provider);
         }
       }
     } catch (IOException | InterruptedException | UncheckedIOException e) {
-      throw new ScmCommunicationException(e.getMessage(), e, "github");
+      throw new ScmCommunicationException(e.getMessage(), e, provider);
     }
   }
 

diff --git a/...ctory-gitlab/src/main/java/org/eclipse/che/api/factory/server/gitlab/GitlabApiClient.java b/...ctory-gitlab/src/main/java/org/eclipse/che/api/factory/server/gitlab/GitlabApiClient.java
@@ -148,6 +148,7 @@ private <T> T executeRequest(
       HttpClient httpClient, HttpRequest request, Function<InputStream, T> bodyConverter)
       throws ScmBadRequestException, ScmItemNotFoundException, ScmCommunicationException,
           ScmUnauthorizedException {
+    String provider = "http://gitlab.com".equals(serverUrl.toString()) ? "gitlab" : "gitlab-server";
     try {
       HttpResponse<InputStream> response =
           httpClient.send(request, HttpResponse.BodyHandlers.ofInputStream());
@@ -169,11 +170,11 @@ private <T> T executeRequest(
             throw new ScmCommunicationException(
                 "Unexpected status code " + response.statusCode() + " " + response,
                 response.statusCode(),
-                "gitlab");
+                provider);
         }
       }
     } catch (IOException | InterruptedException | UncheckedIOException e) {
-      throw new ScmCommunicationException(e.getMessage(), e, "gitlab");
+      throw new ScmCommunicationException(e.getMessage(), e, provider);
     }
   }
 

diff --git a/...main/java/org/eclipse/che/api/factory/server/scm/exception/ScmCommunicationException.java b/...main/java/org/eclipse/che/api/factory/server/scm/exception/ScmCommunicationException.java
@@ -26,6 +26,11 @@ public ScmCommunicationException(String message, int statusCode, String provider
     this.provider = provider;
   }
 
+  public ScmCommunicationException(String message, int statusCode) {
+    super(message);
+    this.statusCode = statusCode;
+  }
+
   public ScmCommunicationException(String message, Throwable cause) {
     super(message, cause);
   }