snyk 1.1029.0 → 1.1031.0

package/dist/cli/263.index.js

@@ -160683,15 +160683,23 @@ async function getAllDepsOneProject(root, targetFile, options, snykHttpClient, s
     return getTargetProject(subProject, allProjectDeps, allSubProjectNames);
 }
 function getTargetProject(subProject, allProjectDeps, allSubProjectNames) {
-    const { projects, defaultProject, versionBuildInfo } = allProjectDeps;
-    const targetProject = subProject || defaultProject;
+    const { projects, defaultProject, defaultProjectKey, versionBuildInfo } = allProjectDeps;
     let gradleProjectName = defaultProject;
     if (subProject) {
+        // TODO: we don't want to break the existing implementation of --sub-project using name
+        // we would like a relative path instead to have a unique identifier
+        if (subProject != '.') {
+            subProject =
+                allSubProjectNames.find((it) => it === subProject) ||
+                    allSubProjectNames.find((it) => it.match(`/${subProject}`)) ||
+                    subProject;
+        }
         if (!allProjectDeps.projects || !allProjectDeps.projects[subProject]) {
             throw new errors_1.MissingSubProjectError(subProject, allSubProjectNames);
         }
         gradleProjectName = `${allProjectDeps.defaultProject}/${subProject}`;
     }
+    const targetProject = subProject || defaultProjectKey;
     const { depGraph } = projects[targetProject];
     return {
         depGraph,
@@ -160939,14 +160947,14 @@ ${chalk.red.bold(mainErrorMessage)}`;
 }
 async function processProjectsInExtractedJSON(root, extractedJSON, coordinateMap) {
     for (const projectId in extractedJSON.projects) {
-        const { defaultProject } = extractedJSON;
+        const { defaultProject, defaultProjectKey } = extractedJSON;
         const { snykGraph, projectVersion } = extractedJSON.projects[projectId];
         if (!snykGraph) {
             continue;
         }
         const invalidValues = [null, undefined, ''];
         const isValidRootDir = invalidValues.indexOf(root) === -1;
-        const isSubProject = projectId !== defaultProject;
+        const isSubProject = projectId !== defaultProjectKey;
         let projectName = isValidRootDir ? path.basename(root) : defaultProject;
         if (isSubProject) {
             projectName = isValidRootDir
@@ -161075,7 +161083,8 @@ async function getMavenPackageInfo(sha1, depCoords, snykHttpClient) {
     var _a;
     const { res, body } = await snykHttpClient({
         method: 'get',
-        path: `/rest/packages`,
+        // base URL defaults to SNYK_API_REST_URL="https://api.snyk.io/rest"
+        path: `/packages`,
         qs: {
             version: PACKAGE_SEARCH_VERSION,
             /* eslint-disable @typescript-eslint/camelcase */