socket 1.0.88 → 1.0.90

package/dist/cli.js

@@ -1538,6 +1538,106 @@ async function outputCreateNewScan(result, options) {
   }
 }
 
+async function performReachabilityAnalysis({
+  branchName,
+  cwd,
+  orgSlug,
+  packagePaths,
+  reachabilityOptions,
+  repoName,
+  uploadManifests = true
+}, options) {
+  const {
+    spinner
+  } = {
+    __proto__: null,
+    ...options
+  };
+  let tarHash;
+  if (uploadManifests && orgSlug && packagePaths) {
+    // Setup SDK for uploading manifests
+    const sockSdkCResult = await utils.setupSdk();
+    if (!sockSdkCResult.ok) {
+      return sockSdkCResult;
+    }
+    const sockSdk = sockSdkCResult.data;
+    const wasSpinning = !!spinner?.isSpinning;
+
+    // Upload manifests to get tar hash
+    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), {
+      desc: 'upload manifests',
+      spinner
+    });
+    spinner?.stop();
+    if (!uploadCResult.ok) {
+      if (wasSpinning) {
+        spinner.start();
+      }
+      return uploadCResult;
+    }
+    tarHash = uploadCResult.data?.tarHash;
+    if (!tarHash) {
+      if (wasSpinning) {
+        spinner.start();
+      }
+      return {
+        ok: false,
+        message: 'Failed to get manifest tar hash',
+        cause: 'Server did not return a tar hash for the uploaded manifests'
+      };
+    }
+    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();
+    }
+  }
+
+  // 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 environment variables
+  const env = {
+    ...process.env
+  };
+  if (repoName) {
+    env['SOCKET_REPO_NAME'] = repoName;
+  }
+  if (branchName) {
+    env['SOCKET_BRANCH_NAME'] = branchName;
+  }
+
+  // Run Coana with the manifests tar hash.
+  const coanaResult = await utils.spawnCoana(coanaArgs, {
+    cwd,
+    env,
+    spinner,
+    stdio: 'inherit'
+  });
+  const wasSpinning = !!spinner?.isSpinning;
+  if (wasSpinning) {
+    spinner.start();
+  }
+  return coanaResult.ok ? {
+    ok: true,
+    data: {
+      // Use the DOT_SOCKET_DOT_FACTS_JSON file for the scan.
+      reachabilityReport: constants.DOT_SOCKET_DOT_FACTS_JSON,
+      tier1ReachabilityScanId: utils.extractTier1ReachabilityScanId(constants.DOT_SOCKET_DOT_FACTS_JSON)
+    }
+  } : coanaResult;
+}
+
 // The point here is to attempt to detect the various supported manifest files
 // the CLI can generate. This would be environments that we can't do server side
 
@@ -2096,7 +2196,7 @@ async function handleCreateNewScan({
     logger.logger.error('');
     logger.logger.info('Starting reachability analysis...');
     spinner.start();
-    const reachResult = await performReachabilityAnalysis$1({
+    const reachResult = await performReachabilityAnalysis({
       packagePaths,
       orgSlug,
       cwd,
@@ -2115,7 +2215,7 @@ async function handleCreateNewScan({
       return;
     }
     logger.logger.success('Reachability analysis completed successfully');
-    scanPaths = reachResult.data?.scanPaths || [];
+    scanPaths = reachResult.data?.reachabilityReport ? [reachResult.data.reachabilityReport] : [];
     tier1ReachabilityScanId = reachResult.data?.tier1ReachabilityScanId;
   }
   const fullScanCResult = await fetchCreateOrgFullScan(scanPaths, orgSlug, {
@@ -2166,85 +2266,6 @@ async function handleCreateNewScan({
     });
   }
 }
-async function performReachabilityAnalysis$1({
-  branchName,
-  cwd,
-  orgSlug,
-  packagePaths,
-  reachabilityOptions,
-  repoName
-}, options) {
-  const {
-    spinner
-  } = {
-    __proto__: null,
-    ...options
-  };
-
-  // Setup SDK for uploading manifests
-  const sockSdkCResult = await utils.setupSdk();
-  if (!sockSdkCResult.ok) {
-    return sockSdkCResult;
-  }
-  const sockSdk = sockSdkCResult.data;
-  const wasSpinning = !!spinner?.isSpinning;
-
-  // Upload manifests to get tar hash
-  spinner?.start('Uploading manifests for reachability analysis...');
-
-  // Exclude DOT_SOCKET_DOT_FACTS_JSON from previous runs.
-  const filteredPackagePaths = packagePaths.filter(p => !p.endsWith(constants.DOT_SOCKET_DOT_FACTS_JSON));
-  const uploadCResult = await utils.handleApiCall(sockSdk.uploadManifestFiles(orgSlug, filteredPackagePaths), {
-    desc: 'upload manifests',
-    spinner
-  });
-  spinner?.stop();
-  if (!uploadCResult.ok) {
-    if (wasSpinning) {
-      spinner.start();
-    }
-    return uploadCResult;
-  }
-  const tarHash = uploadCResult.data?.tarHash;
-  if (!tarHash) {
-    if (wasSpinning) {
-      spinner.start();
-    }
-    return {
-      ok: false,
-      message: 'Failed to get manifest tar hash',
-      cause: 'Server did not return a tar hash for the uploaded manifests'
-    };
-  }
-  spinner?.start();
-  spinner?.success(`Manifests uploaded successfully. Tar hash: ${tarHash}`);
-  spinner?.infoAndStop('Running reachability analysis with Coana...');
-
-  // Run Coana with the manifests tar hash.
-  const coanaResult = await utils.spawnCoana(['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'] : []), ...(reachabilityOptions.reachContinueOnFailingProjects ? ['--ignore-failing-workspaces'] : []),
-  // empty reachEcosystems implies scan all ecosystems
-  ...(reachabilityOptions.reachEcosystems.length ? ['--ecosystems', utils.convertToCoanaEcosystems(reachabilityOptions.reachEcosystems).join(' ')] : []), ...(reachabilityOptions.reachExcludePaths.length ? ['--exclude-dirs', reachabilityOptions.reachExcludePaths.join(' ')] : []), '--manifests-tar-hash', tarHash], {
-    cwd,
-    env: {
-      ...process.env,
-      SOCKET_REPO_NAME: repoName,
-      SOCKET_BRANCH_NAME: branchName
-    },
-    spinner,
-    stdio: 'inherit'
-  });
-  if (wasSpinning) {
-    spinner.start();
-  }
-  return coanaResult.ok ? {
-    ok: true,
-    data: {
-      // Use the DOT_SOCKET_DOT_FACTS_JSON file for the scan.
-      scanPaths: [constants.DOT_SOCKET_DOT_FACTS_JSON],
-      tier1ReachabilityScanId: utils.extractTier1ReachabilityScanId(constants.DOT_SOCKET_DOT_FACTS_JSON)
-    }
-  } : coanaResult;
-}
 
 async function handleCi(autoManifest) {
   const orgSlugCResult = await utils.getDefaultOrgSlug();
@@ -2276,7 +2297,6 @@ async function handleCi(autoManifest) {
     pullRequest: 0,
     reach: {
       runReachabilityAnalysis: false,
-      reachContinueOnFailingProjects: false,
       reachDisableAnalytics: false,
       reachAnalysisTimeout: 0,
       reachAnalysisMemoryLimit: 0,
@@ -10867,10 +10887,6 @@ const reachabilityFlags = {
     default: 0,
     description: 'Set timeout for the reachability analysis. Split analysis runs may cause the total scan time to exceed this timeout significantly.'
   },
-  reachContinueOnFailingProjects: {
-    type: 'boolean',
-    description: 'Continue reachability analysis even when some projects/workspaces fail. Default is to crash the CLI at the first failing project/workspace.'
-  },
   reachDisableAnalytics: {
     type: 'boolean',
     default: false,
@@ -11083,7 +11099,6 @@ async function run$c(argv, importMeta, {
     reach,
     reachAnalysisMemoryLimit,
     reachAnalysisTimeout,
-    reachContinueOnFailingProjects,
     reachDisableAnalytics,
     readOnly,
     setAsAlertsPage: pendingHeadFlag,
@@ -11252,11 +11267,6 @@ async function run$c(argv, importMeta, {
     test: reach || !reachEcosystems.length,
     message: 'The --reachEcosystems flag requires --reach to be set',
     fail: 'missing --reach flag'
-  }, {
-    nook: true,
-    test: reach || !reachContinueOnFailingProjects,
-    message: 'The --reachContinueOnFailingProjects flag requires --reach to be set',
-    fail: 'missing --reach flag'
   }, {
     nook: true,
     test: reach || !reachExcludePaths.length,
@@ -11285,7 +11295,6 @@ async function run$c(argv, importMeta, {
     pullRequest: Number(pullRequest),
     reach: {
       runReachabilityAnalysis: Boolean(reach),
-      reachContinueOnFailingProjects: Boolean(reachContinueOnFailingProjects),
       reachDisableAnalytics: Boolean(reachDisableAnalytics),
       reachAnalysisTimeout: Number(reachAnalysisTimeout),
       reachAnalysisMemoryLimit: Number(reachAnalysisMemoryLimit),
@@ -11927,7 +11936,6 @@ async function scanOneRepo(repoSlug, {
     pullRequest: 0,
     reach: {
       runReachabilityAnalysis: false,
-      reachContinueOnFailingProjects: false,
       reachDisableAnalytics: false,
       reachAnalysisTimeout: 0,
       reachAnalysisMemoryLimit: 0,
@@ -13029,106 +13037,6 @@ async function outputScanReach(result, {
   logger.logger.info(`Reachability report has been written to: ${path.join(cwd, DOT_SOCKET_DOT_FACTS_JSON)}`);
 }
 
-async function performReachabilityAnalysis({
-  branchName,
-  cwd,
-  orgSlug,
-  packagePaths,
-  reachabilityOptions,
-  repoName,
-  uploadManifests = true
-}, options) {
-  const {
-    spinner
-  } = {
-    __proto__: null,
-    ...options
-  };
-  let tarHash;
-  if (uploadManifests && orgSlug && packagePaths) {
-    // Setup SDK for uploading manifests
-    const sockSdkCResult = await utils.setupSdk();
-    if (!sockSdkCResult.ok) {
-      return sockSdkCResult;
-    }
-    const sockSdk = sockSdkCResult.data;
-    const wasSpinning = !!spinner?.isSpinning;
-
-    // Upload manifests to get tar hash
-    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), {
-      desc: 'upload manifests',
-      spinner
-    });
-    spinner?.stop();
-    if (!uploadCResult.ok) {
-      if (wasSpinning) {
-        spinner.start();
-      }
-      return uploadCResult;
-    }
-    tarHash = uploadCResult.data?.tarHash;
-    if (!tarHash) {
-      if (wasSpinning) {
-        spinner.start();
-      }
-      return {
-        ok: false,
-        message: 'Failed to get manifest tar hash',
-        cause: 'Server did not return a tar hash for the uploaded manifests'
-      };
-    }
-    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();
-    }
-  }
-
-  // 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'] : []), ...(reachabilityOptions.reachContinueOnFailingProjects ? ['--ignore-failing-workspaces'] : []),
-  // empty reachEcosystems implies scan all ecosystems
-  ...(reachabilityOptions.reachEcosystems.length ? ['--ecosystems', ...utils.convertToCoanaEcosystems(reachabilityOptions.reachEcosystems)] : []), ...(reachabilityOptions.reachExcludePaths.length ? ['--exclude-dirs', reachabilityOptions.reachExcludePaths.join(' ')] : []), ...(tarHash ? ['--manifests-tar-hash', tarHash, '--run-without-docker'] : [])];
-
-  // Build environment variables
-  const env = {
-    ...process.env
-  };
-  if (repoName) {
-    env['SOCKET_REPO_NAME'] = repoName;
-  }
-  if (branchName) {
-    env['SOCKET_BRANCH_NAME'] = branchName;
-  }
-
-  // Run Coana with the manifests tar hash.
-  const coanaResult = await utils.spawnCoana(coanaArgs, {
-    cwd,
-    env,
-    spinner,
-    stdio: 'inherit'
-  });
-  const wasSpinning = !!spinner?.isSpinning;
-  if (wasSpinning) {
-    spinner.start();
-  }
-  return coanaResult.ok ? {
-    ok: true,
-    data: {
-      // Use the DOT_SOCKET_DOT_FACTS_JSON file for the scan.
-      scanPaths: [constants.DOT_SOCKET_DOT_FACTS_JSON],
-      tier1ReachabilityScanId: utils.extractTier1ReachabilityScanId(constants.DOT_SOCKET_DOT_FACTS_JSON)
-    }
-  } : coanaResult;
-}
-
 async function handleScanReach({
   cwd,
   interactive: _interactive,
@@ -13211,6 +13119,10 @@ const config$6 = {
     Usage
       $ ${command} [options] [CWD=.]
 
+    API Token Requirements
+      - Quota: 1 unit
+      - Permissions: full-scans:create
+
     Options
       ${utils.getFlagListOutput(generalFlags)}
 
@@ -13252,7 +13164,6 @@ async function run$6(argv, importMeta, {
     org: orgFlag,
     reachAnalysisMemoryLimit,
     reachAnalysisTimeout,
-    reachContinueOnFailingProjects,
     reachDisableAnalytics
   } = cli.flags;
   const dryRun = !!cli.flags['dryRun'];
@@ -13308,7 +13219,6 @@ async function run$6(argv, importMeta, {
     targets,
     interactive,
     reachabilityOptions: {
-      reachContinueOnFailingProjects: Boolean(reachContinueOnFailingProjects),
       reachDisableAnalytics: Boolean(reachDisableAnalytics),
       reachAnalysisTimeout: Number(reachAnalysisTimeout),
       reachAnalysisMemoryLimit: Number(reachAnalysisMemoryLimit),
@@ -15096,5 +15006,5 @@ void (async () => {
     await utils.captureException(e);
   }
 })();
-//# debugId=aed06780-1ffd-47d9-9ca4-b54afdc8b762
+//# debugId=778bc24f-97c2-464a-9dbd-8adf846db84d
 //# sourceMappingURL=cli.js.map