Merge pull request #162 from ruromero/npm-pkg

fix: npm package ns parsing and enhance logs
RHEcosystemAppEng · Sep 20, 2023 · 32d0073 · 32d0073
2 parents f1e6e93 + 5d3a1e9
commit 32d0073
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 9 deletions.
diff --git a/src/main/java/com/redhat/exhort/api/PackageRef.java b/src/main/java/com/redhat/exhort/api/PackageRef.java
@@ -56,10 +56,10 @@ public String name() {
       return purl.getName();
     }
     switch (purl.getType()) {
-      case Constants.GOLANG_PKG_MANAGER:
-        return new StringBuffer(purl.getNamespace()).append("/").append(purl.getName()).toString();
-      default:
+      case Constants.MAVEN_PKG_MANAGER:
         return new StringBuilder(purl.getNamespace()).append(":").append(purl.getName()).toString();
+      default:
+        return new StringBuffer(purl.getNamespace()).append("/").append(purl.getName()).toString();
     }
   }
 

diff --git a/src/main/java/com/redhat/exhort/integration/backend/BackendUtils.java b/src/main/java/com/redhat/exhort/integration/backend/BackendUtils.java
@@ -65,14 +65,16 @@ public static void processResponseError(Exchange exchange, String provider) {
     Throwable cause = exception.getCause();
 
     if (cause != null) {
-      LOGGER.warn("Unable to process request to: {}", provider, cause);
       if (cause instanceof HttpOperationFailedException) {
         HttpOperationFailedException httpException = (HttpOperationFailedException) cause;
-        status.message(prettifyHttpError(httpException)).status(httpException.getStatusCode());
+        String message = prettifyHttpError(httpException);
+        status.message(message).status(httpException.getStatusCode());
+        LOGGER.warn("Unable to process request: {}", message, cause);
       } else {
         status
             .message(cause.getMessage())
             .status(Response.Status.INTERNAL_SERVER_ERROR.getStatusCode());
+        LOGGER.warn("Unable to process request to: {}", provider, cause);
       }
     } else {
       status
@@ -113,10 +115,8 @@ private static String prettifyHttpError(HttpOperationFailedException httpExcepti
         return text + ": The provided credentials don't have the required permissions.";
       case 429:
         return text + ": The rate limit has been exceeded.";
-      case 500:
-        return text + ": " + httpException.getResponseBody();
       default:
-        return text;
+        return text + ": " + httpException.getResponseBody();
     }
   }
 }
diff --git a/src/test/java/com/redhat/exhort/api/PackageRefTest.java b/src/test/java/com/redhat/exhort/api/PackageRefTest.java
@@ -37,6 +37,9 @@ public void testNamespace() {
     ref = new PackageRef("pkg:npm/[email protected]");
     assertEquals("foobar", ref.name());
 
+    ref = new PackageRef("pkg:npm/%40babel/[email protected]");
+    assertEquals("@babel/helper-compilation-targets", ref.name());
+
     ref = new PackageRef("pkg:maven/org.apache.xmlgraphics/[email protected]?packaging=sources");
     assertEquals("org.apache.xmlgraphics:batik-anim", ref.name());
   }

diff --git a/src/test/java/com/redhat/exhort/integration/backend/sbom/SbomParserTest.java b/src/test/java/com/redhat/exhort/integration/backend/sbom/SbomParserTest.java
@@ -207,7 +207,13 @@ static Stream<Arguments> getSbomUseCases() {
                           .version("0.0.0-development")
                           .pkgManager(Constants.NPM_PKG_MANAGER)
                           .build()));
-              consumer.accept(arguments(t, Constants.PYPI_PKG_MANAGER, 2, 0, DEFAULT_MAVEN_ROOT));
+              consumer.accept(
+                  arguments(
+                      t,
+                      Constants.PYPI_PKG_MANAGER,
+                      2,
+                      0,
+                      DependencyTree.getDefaultRoot(Constants.PYPI_PKG_MANAGER)));
             });
   }