@socketsecurity/cli-with-sentry 1.0.104 → 1.0.106

package/dist/cli.js

@@ -1626,16 +1626,18 @@ async function performReachabilityAnalysis(options) {
   // 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 scanning all ecosystems.
-  ...(reachabilityOptions.reachEcosystems.length ? ['--purl-types', ...reachabilityOptions.reachEcosystems] : []), ...(reachabilityOptions.reachExcludePaths.length ? ['--exclude-dirs', ...reachabilityOptions.reachExcludePaths] : [])];
+  ...(reachabilityOptions.reachEcosystems.length ? ['--purl-types', ...reachabilityOptions.reachEcosystems] : []), ...(reachabilityOptions.reachExcludePaths.length ? ['--exclude-dirs', ...reachabilityOptions.reachExcludePaths] : []), ...(reachabilityOptions.reachSkipCache ? ['--skip-cache-usage'] : [])];
 
   // Build environment variables.
   const env = {
     ...process.env
   };
-  if (repoName) {
+  // do not pass default repo and branch name to coana to avoid mixing
+  // buckets (cached configuration) from projects that are likely very different.
+  if (repoName && repoName !== constants.SOCKET_DEFAULT_REPOSITORY) {
     env['SOCKET_REPO_NAME'] = repoName;
   }
-  if (branchName) {
+  if (branchName && branchName !== constants.SOCKET_DEFAULT_BRANCH) {
     env['SOCKET_BRANCH_NAME'] = branchName;
   }
 
@@ -2324,6 +2326,7 @@ async function handleCi(autoManifest) {
       reachDisableAnalytics: false,
       reachEcosystems: [],
       reachExcludePaths: [],
+      reachSkipCache: false,
       runReachabilityAnalysis: false
     },
     repoName,
@@ -3888,7 +3891,7 @@ async function coanaFix(fixConfig) {
         }
       };
     }
-    const fixCResult = await utils.spawnCoana(['compute-fixes-and-upgrade-purls', cwd, '--manifests-tar-hash', tarHash, '--apply-fixes-to', ...(isAll ? ['all'] : ghsas), ...fixConfig.unknownFlags], fixConfig.orgSlug, {
+    const fixCResult = await utils.spawnCoana(['compute-fixes-and-upgrade-purls', cwd, '--manifests-tar-hash', tarHash, '--apply-fixes-to', ...(isAll ? ['all'] : ghsas), ...(fixConfig.rangeStyle ? ['--range-style', fixConfig.rangeStyle] : []), ...fixConfig.unknownFlags], fixConfig.orgSlug, {
       cwd,
       spinner
     });
@@ -3902,7 +3905,7 @@ async function coanaFix(fixConfig) {
   }
   let ids;
   if (isAll) {
-    const foundCResult = await utils.spawnCoana(['compute-fixes-and-upgrade-purls', cwd, '--manifests-tar-hash', tarHash, ...fixConfig.unknownFlags], fixConfig.orgSlug, {
+    const foundCResult = await utils.spawnCoana(['compute-fixes-and-upgrade-purls', cwd, '--manifests-tar-hash', tarHash, ...(fixConfig.rangeStyle ? ['--range-style', fixConfig.rangeStyle] : []), ...fixConfig.unknownFlags], fixConfig.orgSlug, {
       cwd,
       spinner
     });
@@ -5129,6 +5132,7 @@ async function handleFix({
       ghsas,
       limit,
       orgSlug,
+      rangeStyle,
       spinner,
       unknownFlags
     }), outputKind);
@@ -11405,6 +11409,11 @@ const reachabilityFlags = {
     type: 'string',
     isMultiple: true,
     description: 'List of paths to exclude from reachability analysis, as either a comma separated value or as multiple flags.'
+  },
+  reachSkipCache: {
+    type: 'boolean',
+    default: false,
+    description: 'Skip caching-based optimizations. By default, the reachability analysis will use cached configurations from previous runs to speed up the analysis.'
   }
 };
 
@@ -11604,6 +11613,7 @@ async function run$c(argv, importMeta, {
     reachAnalysisMemoryLimit,
     reachAnalysisTimeout,
     reachDisableAnalytics,
+    reachSkipCache,
     readOnly,
     setAsAlertsPage: pendingHeadFlag,
     tmp
@@ -11729,7 +11739,7 @@ async function run$c(argv, importMeta, {
   const isUsingNonDefaultMemoryLimit = reachAnalysisMemoryLimit !== reachabilityFlags['reachAnalysisMemoryLimit']?.default;
   const isUsingNonDefaultTimeout = reachAnalysisTimeout !== reachabilityFlags['reachAnalysisTimeout']?.default;
   const isUsingNonDefaultAnalytics = reachDisableAnalytics !== reachabilityFlags['reachDisableAnalytics']?.default;
-  const isUsingAnyReachabilityFlags = isUsingNonDefaultMemoryLimit || isUsingNonDefaultTimeout || isUsingNonDefaultAnalytics || hasReachEcosystems || hasReachExcludePaths;
+  const isUsingAnyReachabilityFlags = isUsingNonDefaultMemoryLimit || isUsingNonDefaultTimeout || isUsingNonDefaultAnalytics || hasReachEcosystems || hasReachExcludePaths || reachSkipCache;
   const wasValidInput = utils.checkCommandInput(outputKind, {
     nook: true,
     test: !!orgSlug,
@@ -11791,7 +11801,8 @@ async function run$c(argv, importMeta, {
       reachAnalysisTimeout: Number(reachAnalysisTimeout),
       reachAnalysisMemoryLimit: Number(reachAnalysisMemoryLimit),
       reachEcosystems,
-      reachExcludePaths
+      reachExcludePaths,
+      reachSkipCache: Boolean(reachSkipCache)
     },
     readOnly: Boolean(readOnly),
     repoName,
@@ -12438,7 +12449,8 @@ async function scanOneRepo(repoSlug, {
       reachAnalysisTimeout: 0,
       reachAnalysisMemoryLimit: 0,
       reachEcosystems: [],
-      reachExcludePaths: []
+      reachExcludePaths: [],
+      reachSkipCache: false
     },
     readOnly: false,
     repoName: repoSlug,
@@ -13668,7 +13680,8 @@ async function run$6(argv, importMeta, {
     org: orgFlag,
     reachAnalysisMemoryLimit,
     reachAnalysisTimeout,
-    reachDisableAnalytics
+    reachDisableAnalytics,
+    reachSkipCache
   } = cli.flags;
   const dryRun = !!cli.flags['dryRun'];
 
@@ -13732,7 +13745,8 @@ async function run$6(argv, importMeta, {
       reachAnalysisMemoryLimit: Number(reachAnalysisMemoryLimit),
       reachDisableAnalytics: Boolean(reachDisableAnalytics),
       reachEcosystems,
-      reachExcludePaths
+      reachExcludePaths,
+      reachSkipCache: Boolean(reachSkipCache)
     }
   });
 }
@@ -15523,5 +15537,5 @@ void (async () => {
     await utils.captureException(e);
   }
 })();
-//# debugId=3c044a06-e0dd-4f21-8310-181cc22dc4c0
+//# debugId=c64e79fd-76d1-44bb-917b-fff778650c74
 //# sourceMappingURL=cli.js.map