Merge branch 'che-22488' of github.com:eclipse-che/che-server into ch…

…e-22488
eclipse-che · Sep 20, 2023 · caa1272 · caa1272
2 parents 7c9dd62 + 3523728
commit caa1272
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/...org/eclipse/che/api/factory/server/bitbucket/BitbucketAuthorizingFileContentProvider.java b/...org/eclipse/che/api/factory/server/bitbucket/BitbucketAuthorizingFileContentProvider.java
@@ -61,7 +61,7 @@ public String fetchContent(String fileURL) throws IOException, DevfileException
           requestURL.substring(requestURL.indexOf(split[6]) + split[6].length() + 1),
           token.getToken());
     } catch (UnknownScmProviderException e) {
-      return fetchContentWithoutToken(requestURL, e);
+      return fetchContentWithoutToken(requestURL);
     } catch (ScmCommunicationException e) {
       return toIOException(fileURL, e);
     } catch (ScmUnauthorizedException

diff --git a/.../src/main/java/org/eclipse/che/api/factory/server/scm/AuthorizingFileContentProvider.java b/.../src/main/java/org/eclipse/che/api/factory/server/scm/AuthorizingFileContentProvider.java
@@ -92,7 +92,7 @@ private String fetchContent(
         return urlFetcher.fetch(requestURL, authorization);
       }
     } catch (UnknownScmProviderException e) {
-      return fetchContentWithoutToken(requestURL, e);
+      return fetchContentWithoutToken(requestURL);
     } catch (ScmCommunicationException e) {
       return toIOException(fileURL, e);
     } catch (ScmUnauthorizedException
@@ -102,7 +102,7 @@ private String fetchContent(
     }
   }
 
-  protected String fetchContentWithoutToken(String requestURL, UnknownScmProviderException e)
+  protected String fetchContentWithoutToken(String requestURL)
       throws DevfileException, IOException {
     // we don't have any provider matching this SCM provider
     // so try without secrets being configured
@@ -123,7 +123,7 @@ protected String fetchContentWithoutToken(String requestURL, UnknownScmProviderE
         }
       }
       throw new DevfileException(
-          String.format("%s: %s", e.getMessage(), exception.getMessage()), exception);
+          "Could not reach devfile at " + "`" + exception.getMessage() + "`", exception);
     }
   }