socket 1.0.90 → 1.0.92

package/dist/cli.js

@@ -825,7 +825,6 @@ async function run$O(argv, importMeta, {
     parentName
   });
   const {
-    interactive,
     json,
     markdown,
     org: orgFlag,
@@ -833,11 +832,12 @@ async function run$O(argv, importMeta, {
     perPage
   } = cli.flags;
   const dryRun = !!cli.flags['dryRun'];
+  const interactive = !!cli.flags['interactive'];
   const noLegacy = !cli.flags['type'];
   let [typeFilter = ''] = cli.input;
   typeFilter = String(typeFilter);
   const hasApiToken = utils.hasDefaultToken();
-  const [orgSlug] = await utils.determineOrgSlug(String(orgFlag || ''), !!interactive, dryRun);
+  const [orgSlug] = await utils.determineOrgSlug(String(orgFlag || ''), interactive, dryRun);
   const outputKind = utils.getOutputKind(json, markdown);
   const wasValidInput = utils.checkCommandInput(outputKind, {
     nook: true,
@@ -955,14 +955,14 @@ async function fetchSupportedScanFileNames(options) {
  *  - Associates the tier1 reachability scan metadata with the full scan.
  *  - Sets the tier1 reachability scan to "finalized" state.
  */
-async function finalizeTier1Scan(tier1_reachability_scan_id, report_run_id) {
+async function finalizeTier1Scan(tier1ReachabilityScanId, scanId) {
   // we do not use the SDK here because the tier1-reachability-scan/finalize is a hidden
   // endpoint that is not part of the OpenAPI specification.
   return await utils.sendApiRequest('tier1-reachability-scan/finalize', {
     method: 'POST',
     body: {
-      tier1_reachability_scan_id,
-      report_run_id
+      tier1_reachability_scan_id: tier1ReachabilityScanId,
+      report_run_id: scanId
     }
   });
 }
@@ -1538,17 +1538,16 @@ async function outputCreateNewScan(result, options) {
   }
 }
 
-async function performReachabilityAnalysis({
-  branchName,
-  cwd,
-  orgSlug,
-  packagePaths,
-  reachabilityOptions,
-  repoName,
-  uploadManifests = true
-}, options) {
+async function performReachabilityAnalysis(options) {
   const {
-    spinner
+    branchName,
+    cwd = process.cwd(),
+    orgSlug,
+    packagePaths,
+    reachabilityOptions,
+    repoName,
+    spinner,
+    uploadManifests = true
   } = {
     __proto__: null,
     ...options
@@ -1563,12 +1562,10 @@ async function performReachabilityAnalysis({
     const sockSdk = sockSdkCResult.data;
     const wasSpinning = !!spinner?.isSpinning;
 
-    // Upload manifests to get tar hash
+    // Exclude .socket.facts.json from upload.
+    const filepathsToUpload = packagePaths.filter(p => !p.endsWith(constants.DOT_SOCKET_DOT_FACTS_JSON));
     spinner?.start('Uploading manifests for reachability analysis...');
-
-    // Exclude DOT_SOCKET_DOT_FACTS_JSON if it was created in previous runs.
-    const filteredPackagePaths = packagePaths.filter(p => !p.endsWith(constants.DOT_SOCKET_DOT_FACTS_JSON));
-    const uploadCResult = await utils.handleApiCall(sockSdk.uploadManifestFiles(orgSlug, filteredPackagePaths), {
+    const uploadCResult = await utils.handleApiCall(sockSdk.uploadManifestFiles(orgSlug, filepathsToUpload), {
       desc: 'upload manifests',
       spinner
     });
@@ -1592,21 +1589,16 @@ async function performReachabilityAnalysis({
     }
     spinner?.start();
     spinner?.success(`Manifests uploaded successfully. Tar hash: ${tarHash}`);
-    spinner?.infoAndStop('Running reachability analysis with Coana...');
-  } else {
-    const wasSpinning = !!spinner?.isSpinning;
-    spinner?.start('Running reachability analysis with Coana...');
-    if (!wasSpinning) {
-      spinner?.stop();
-    }
   }
+  spinner?.start();
+  spinner?.infoAndStop('Running reachability analysis with Coana...');
 
-  // Build Coana arguments
-  const coanaArgs = ['run', cwd, '--output-dir', cwd, '--socket-mode', constants.DOT_SOCKET_DOT_FACTS_JSON, '--disable-report-submission', ...(reachabilityOptions.reachAnalysisTimeout ? ['--analysis-timeout', reachabilityOptions.reachAnalysisTimeout.toString()] : []), ...(reachabilityOptions.reachAnalysisMemoryLimit ? ['--memory-limit', reachabilityOptions.reachAnalysisMemoryLimit.toString()] : []), ...(reachabilityOptions.reachDisableAnalytics ? ['--disable-analytics-sharing'] : []),
-  // empty reachEcosystems implies scan all ecosystems
-  ...(reachabilityOptions.reachEcosystems.length ? ['--purl-types', ...reachabilityOptions.reachEcosystems] : []), ...(reachabilityOptions.reachExcludePaths.length ? ['--exclude-dirs', reachabilityOptions.reachExcludePaths.join(' ')] : []), ...(tarHash ? ['--manifests-tar-hash', tarHash, '--run-without-docker'] : [])];
+  // Build Coana arguments.
+  const coanaArgs = ['run', cwd, '--output-dir', cwd, '--socket-mode', constants.DOT_SOCKET_DOT_FACTS_JSON, '--disable-report-submission', ...(reachabilityOptions.reachAnalysisTimeout ? ['--analysis-timeout', `${reachabilityOptions.reachAnalysisTimeout}`] : []), ...(reachabilityOptions.reachAnalysisMemoryLimit ? ['--memory-limit', `${reachabilityOptions.reachAnalysisMemoryLimit}`] : []), ...(reachabilityOptions.reachDisableAnalytics ? ['--disable-analytics-sharing'] : []), ...(tarHash ? ['--run-without-docker', '--manifests-tar-hash', tarHash] : []),
+  // Empty reachEcosystems implies scan all ecosystems.
+  ...(reachabilityOptions.reachEcosystems.length ? ['--purl-types', ...reachabilityOptions.reachEcosystems] : []), ...(reachabilityOptions.reachExcludePaths.length ? ['--exclude-dirs', ...reachabilityOptions.reachExcludePaths] : [])];
 
-  // Build environment variables
+  // Build environment variables.
   const env = {
     ...process.env
   };
@@ -1618,7 +1610,7 @@ async function performReachabilityAnalysis({
   }
 
   // Run Coana with the manifests tar hash.
-  const coanaResult = await utils.spawnCoana(coanaArgs, {
+  const coanaResult = await utils.spawnCoana(coanaArgs, orgSlug, {
     cwd,
     env,
     spinner,
@@ -2197,13 +2189,12 @@ async function handleCreateNewScan({
     logger.logger.info('Starting reachability analysis...');
     spinner.start();
     const reachResult = await performReachabilityAnalysis({
-      packagePaths,
-      orgSlug,
+      branchName,
       cwd,
+      orgSlug,
+      packagePaths,
+      reachabilityOptions: reach,
       repoName,
-      branchName,
-      reachabilityOptions: reach
-    }, {
       spinner
     });
     spinner.stop();
@@ -2231,11 +2222,12 @@ async function handleCreateNewScan({
     pendingHead,
     tmp
   });
-  if (reach && tier1ReachabilityScanId && fullScanCResult.ok && fullScanCResult.data?.id) {
-    await finalizeTier1Scan(tier1ReachabilityScanId, fullScanCResult.data.id);
+  const scanId = fullScanCResult.ok ? fullScanCResult.data?.id : undefined;
+  if (reach && scanId && tier1ReachabilityScanId) {
+    await finalizeTier1Scan(tier1ReachabilityScanId, scanId);
   }
   if (report && fullScanCResult.ok) {
-    if (fullScanCResult.data?.id) {
+    if (scanId) {
       await handleScanReport({
         filePath: '-',
         fold: 'version',
@@ -2243,7 +2235,7 @@ async function handleCreateNewScan({
         orgSlug,
         outputKind,
         reportLevel: 'error',
-        scanId: fullScanCResult.data.id,
+        scanId,
         short: false
       });
     } else {
@@ -2259,7 +2251,6 @@ async function handleCreateNewScan({
     }
   } else {
     spinner.stop();
-    spinner.clear();
     await outputCreateNewScan(fullScanCResult, {
       interactive,
       outputKind
@@ -3224,12 +3215,9 @@ async function coanaFix(fixConfig) {
   }
   const isAllOrAuto = ghsas.length === 1 && (ghsas[0] === 'all' || ghsas[0] === 'auto');
   const ids = isAllOrAuto ? ['all'] : ghsas;
-  const fixCResult = ids.length ? await utils.spawnCoana(['compute-fixes-and-upgrade-purls', cwd, '--manifests-tar-hash', tarHash, '--apply-fixes-to', ...ids, ...fixConfig.unknownFlags], {
+  const fixCResult = ids.length ? await utils.spawnCoana(['compute-fixes-and-upgrade-purls', cwd, '--manifests-tar-hash', tarHash, '--apply-fixes-to', ...ids, ...fixConfig.unknownFlags], fixConfig.orgSlug, {
     cwd,
-    spinner,
-    env: {
-      SOCKET_ORG_SLUG: orgSlug
-    }
+    spinner
   }) : undefined;
   if (fixCResult) {
     lastCResult = fixCResult;
@@ -8587,14 +8575,14 @@ async function run$p(argv, importMeta, {
     parentName
   });
   const {
-    interactive,
     json,
     markdown,
     org: orgFlag
   } = cli.flags;
   const dryRun = !!cli.flags['dryRun'];
+  const interactive = !!cli.flags['interactive'];
   const hasApiToken = utils.hasDefaultToken();
-  const [orgSlug] = await utils.determineOrgSlug(String(orgFlag || ''), !!interactive, dryRun);
+  const [orgSlug] = await utils.determineOrgSlug(String(orgFlag || ''), interactive, dryRun);
   const outputKind = utils.getOutputKind(json, markdown);
   const wasValidInput = utils.checkCommandInput(outputKind, {
     nook: true,
@@ -8722,14 +8710,14 @@ async function run$o(argv, importMeta, {
     parentName
   });
   const {
-    interactive,
     json,
     markdown,
     org: orgFlag
   } = cli.flags;
   const dryRun = !!cli.flags['dryRun'];
+  const interactive = !!cli.flags['interactive'];
   const hasApiToken = utils.hasDefaultToken();
-  const [orgSlug] = await utils.determineOrgSlug(String(orgFlag || ''), !!interactive, dryRun);
+  const [orgSlug] = await utils.determineOrgSlug(String(orgFlag || ''), interactive, dryRun);
   const outputKind = utils.getOutputKind(json, markdown);
   const wasValidInput = utils.checkCommandInput(outputKind, {
     nook: true,
@@ -10028,16 +10016,16 @@ async function run$h(argv, importMeta, {
     parentName
   });
   const {
-    interactive,
     json,
     markdown,
     org: orgFlag
   } = cli.flags;
   const dryRun = !!cli.flags['dryRun'];
+  const interactive = !!cli.flags['interactive'];
   const noLegacy = !cli.flags['repoName'];
   const [repoName = ''] = cli.input;
   const hasApiToken = utils.hasDefaultToken();
-  const [orgSlug] = await utils.determineOrgSlug(String(orgFlag || ''), !!interactive, dryRun);
+  const [orgSlug] = await utils.determineOrgSlug(String(orgFlag || ''), interactive, dryRun);
   const outputKind = utils.getOutputKind(json, markdown);
   const wasValidInput = utils.checkCommandInput(outputKind, {
     nook: true,
@@ -10163,16 +10151,16 @@ async function run$g(argv, importMeta, {
     parentName
   });
   const {
-    interactive,
     json,
     markdown,
     org: orgFlag
   } = cli.flags;
   const dryRun = !!cli.flags['dryRun'];
+  const interactive = !!cli.flags['interactive'];
   const noLegacy = !cli.flags['repoName'];
   const [repoName = ''] = cli.input;
   const hasApiToken = utils.hasDefaultToken();
-  const [orgSlug] = await utils.determineOrgSlug(String(orgFlag || ''), !!interactive, dryRun);
+  const [orgSlug] = await utils.determineOrgSlug(String(orgFlag || ''), interactive, dryRun);
   const outputKind = utils.getOutputKind(json, markdown);
   const wasValidInput = utils.checkCommandInput(outputKind, {
     nook: true,
@@ -10456,14 +10444,14 @@ async function run$f(argv, importMeta, {
   const {
     all,
     direction = 'desc',
-    interactive,
     json,
     markdown,
     org: orgFlag
   } = cli.flags;
   const dryRun = !!cli.flags['dryRun'];
+  const interactive = !!cli.flags['interactive'];
   const hasApiToken = utils.hasDefaultToken();
-  const [orgSlug] = await utils.determineOrgSlug(String(orgFlag || ''), !!interactive, dryRun);
+  const [orgSlug] = await utils.determineOrgSlug(String(orgFlag || ''), interactive, dryRun);
   const outputKind = utils.getOutputKind(json, markdown);
   const wasValidInput = utils.checkCommandInput(outputKind, {
     nook: true,
@@ -10648,16 +10636,16 @@ async function run$e(argv, importMeta, {
     parentName
   });
   const {
-    interactive,
     json,
     markdown,
     org: orgFlag
   } = cli.flags;
   const dryRun = !!cli.flags['dryRun'];
+  const interactive = !!cli.flags['interactive'];
   const noLegacy = !cli.flags['repoName'];
   const [repoName = ''] = cli.input;
   const hasApiToken = utils.hasDefaultToken();
-  const [orgSlug] = await utils.determineOrgSlug(String(orgFlag || ''), !!interactive, dryRun);
+  const [orgSlug] = await utils.determineOrgSlug(String(orgFlag || ''), interactive, dryRun);
   const outputKind = utils.getOutputKind(json, markdown);
   const wasValidInput = utils.checkCommandInput(outputKind, {
     nook: true,
@@ -10809,16 +10797,16 @@ async function run$d(argv, importMeta, {
     parentName
   });
   const {
-    interactive,
     json,
     markdown,
     org: orgFlag
   } = cli.flags;
   const dryRun = !!cli.flags['dryRun'];
+  const interactive = !!cli.flags['interactive'];
   const noLegacy = !cli.flags['repoName'];
   const [repoName = ''] = cli.input;
   const hasApiToken = utils.hasDefaultToken();
-  const [orgSlug] = await utils.determineOrgSlug(String(orgFlag || ''), !!interactive, dryRun);
+  const [orgSlug] = await utils.determineOrgSlug(String(orgFlag || ''), interactive, dryRun);
   const outputKind = utils.getOutputKind(json, markdown);
   const wasValidInput = utils.checkCommandInput(outputKind, {
     nook: true,
@@ -11397,15 +11385,15 @@ async function run$b(argv, importMeta, {
     parentName
   });
   const {
-    interactive,
     json,
     markdown,
     org: orgFlag
   } = cli.flags;
   const dryRun = !!cli.flags['dryRun'];
+  const interactive = !!cli.flags['interactive'];
   const [scanId = ''] = cli.input;
   const hasApiToken = utils.hasDefaultToken();
-  const [orgSlug, defaultOrgSlug] = await utils.determineOrgSlug(String(orgFlag || ''), !!interactive, dryRun);
+  const [orgSlug, defaultOrgSlug] = await utils.determineOrgSlug(String(orgFlag || ''), interactive, dryRun);
   const outputKind = utils.getOutputKind(json, markdown);
   const wasValidInput = utils.checkCommandInput(outputKind, {
     nook: !!defaultOrgSlug,
@@ -11696,12 +11684,12 @@ async function run$a(argv, importMeta, {
   const {
     depth,
     file,
-    interactive,
     json,
     markdown,
     org: orgFlag
   } = cli.flags;
   const dryRun = !!cli.flags['dryRun'];
+  const interactive = !!cli.flags['interactive'];
   let [id1 = '', id2 = ''] = cli.input;
   // Support dropping in full socket urls to an sbom.
   if (id1.startsWith(SOCKET_SBOM_URL_PREFIX)) {
@@ -11711,7 +11699,7 @@ async function run$a(argv, importMeta, {
     id2 = id2.slice(SOCKET_SBOM_URL_PREFIX_LENGTH);
   }
   const hasApiToken = utils.hasDefaultToken();
-  const [orgSlug] = await utils.determineOrgSlug(String(orgFlag || ''), !!interactive, dryRun);
+  const [orgSlug] = await utils.determineOrgSlug(String(orgFlag || ''), interactive, dryRun);
   const outputKind = utils.getOutputKind(json, markdown);
   const wasValidInput = utils.checkCommandInput(outputKind, {
     test: !!(id1 && id2),
@@ -12814,17 +12802,17 @@ async function run$8(argv, importMeta, {
   });
   const {
     branch: branchFlag,
-    interactive,
     json,
     markdown,
     org: orgFlag
   } = cli.flags;
   const dryRun = !!cli.flags['dryRun'];
+  const interactive = !!cli.flags['interactive'];
   const noLegacy = !cli.flags['repo'];
   const [repo = '', branchArg = ''] = cli.input;
   const branch = String(branchFlag || branchArg || '');
   const hasApiToken = utils.hasDefaultToken();
-  const [orgSlug] = await utils.determineOrgSlug(String(orgFlag || ''), !!interactive, dryRun);
+  const [orgSlug] = await utils.determineOrgSlug(String(orgFlag || ''), interactive, dryRun);
   const outputKind = utils.getOutputKind(json, markdown);
   const wasValidInput = utils.checkCommandInput(outputKind, {
     nook: true,
@@ -12974,15 +12962,15 @@ async function run$7(argv, importMeta, {
     parentName
   });
   const {
-    interactive,
     json,
     markdown,
     org: orgFlag
   } = cli.flags;
   const dryRun = !!cli.flags['dryRun'];
+  const interactive = !!cli.flags['interactive'];
   const [scanId = ''] = cli.input;
   const hasApiToken = utils.hasDefaultToken();
-  const [orgSlug] = await utils.determineOrgSlug(String(orgFlag || ''), !!interactive, dryRun);
+  const [orgSlug] = await utils.determineOrgSlug(String(orgFlag || ''), interactive, dryRun);
   const outputKind = utils.getOutputKind(json, markdown);
   const wasValidInput = utils.checkCommandInput(outputKind, {
     nook: true,
@@ -13081,9 +13069,8 @@ async function handleScanReach({
     orgSlug,
     packagePaths,
     reachabilityOptions,
+    spinner,
     uploadManifests: true
-  }, {
-    spinner
   });
   spinner.stop();
   await outputScanReach(result, {
@@ -13325,7 +13312,6 @@ async function run$5(argv, importMeta, {
   });
   const {
     fold = 'none',
-    interactive,
     json,
     license,
     markdown,
@@ -13333,9 +13319,10 @@ async function run$5(argv, importMeta, {
     reportLevel = 'warn'
   } = cli.flags;
   const dryRun = !!cli.flags['dryRun'];
+  const interactive = !!cli.flags['interactive'];
   const [scanId = '', file = ''] = cli.input;
   const hasApiToken = utils.hasDefaultToken();
-  const [orgSlug] = await utils.determineOrgSlug(String(orgFlag || ''), !!interactive, dryRun);
+  const [orgSlug] = await utils.determineOrgSlug(String(orgFlag || ''), interactive, dryRun);
   const outputKind = utils.getOutputKind(json, markdown);
   const wasValidInput = utils.checkCommandInput(outputKind, {
     nook: true,
@@ -13938,16 +13925,16 @@ async function run$3(argv, importMeta, {
     parentName
   });
   const {
-    interactive,
     json,
     markdown,
     org: orgFlag,
     stream
   } = cli.flags;
   const dryRun = !!cli.flags['dryRun'];
+  const interactive = !!cli.flags['interactive'];
   const [scanId = '', file = ''] = cli.input;
   const hasApiToken = utils.hasDefaultToken();
-  const [orgSlug] = await utils.determineOrgSlug(String(orgFlag || ''), !!interactive, dryRun);
+  const [orgSlug] = await utils.determineOrgSlug(String(orgFlag || ''), interactive, dryRun);
   const outputKind = utils.getOutputKind(json, markdown);
   const wasValidInput = utils.checkCommandInput(outputKind, {
     nook: true,
@@ -14337,7 +14324,6 @@ async function run$2(argv, importMeta, {
   });
   const {
     eco,
-    interactive,
     json,
     markdown,
     org: orgFlag,
@@ -14345,6 +14331,8 @@ async function run$2(argv, importMeta, {
     type: typef,
     version
   } = cli.flags;
+  const dryRun = !!cli.flags['dryRun'];
+  const interactive = !!cli.flags['interactive'];
   let ecoFilter = String(eco || '');
   let versionFilter = String(version || '');
   let typeFilter = String(typef || '');
@@ -14382,9 +14370,8 @@ async function run$2(argv, importMeta, {
   if (argSet.size) {
     logger.logger.info(`Warning: ignoring these excessive args: ${Array.from(argSet).join(', ')}`);
   }
-  const dryRun = !!cli.flags['dryRun'];
   const hasApiToken = utils.hasDefaultToken();
-  const [orgSlug] = await utils.determineOrgSlug(String(orgFlag || ''), !!interactive, dryRun);
+  const [orgSlug] = await utils.determineOrgSlug(String(orgFlag || ''), interactive, dryRun);
   const outputKind = utils.getOutputKind(json, markdown);
   const wasValidInput = utils.checkCommandInput(outputKind, {
     nook: true,
@@ -15006,5 +14993,5 @@ void (async () => {
     await utils.captureException(e);
   }
 })();
-//# debugId=778bc24f-97c2-464a-9dbd-8adf846db84d
+//# debugId=179b5d73-a525-4e97-bef0-f189ffa26e77
 //# sourceMappingURL=cli.js.map