@socketsecurity/cli-with-sentry 1.1.25 → 1.1.27

package/CHANGELOG.md

@@ -4,6 +4,16 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
 
+## [1.1.27](https://github.com/SocketDev/socket-cli/releases/tag/v1.1.27) - 2025-11-12
+
+### Added
+- Backported `--exclude` and `--include` flags for `socket fix` command from v2
+
+## [1.1.26](https://github.com/SocketDev/socket-cli/releases/tag/v1.1.26) - 2025-11-08
+
+### Added
+  - Debug logging of API requests/responses
+
 ## [1.1.23](https://github.com/SocketDev/socket-cli/releases/tag/v1.1.23) - 2025-09-22
 
 ### Changed

package/dist/cli.js

@@ -12,9 +12,9 @@ var constants = require('./constants.js');
 var flags = require('./flags.js');
 var path = require('node:path');
 var words = require('../external/@socketsecurity/registry/lib/words');
+var fs$1 = require('node:fs');
 var arrays = require('../external/@socketsecurity/registry/lib/arrays');
 var prompts = require('../external/@socketsecurity/registry/lib/prompts');
-var fs$1 = require('node:fs');
 var spawn = require('../external/@socketsecurity/registry/lib/spawn');
 var fs$2 = require('../external/@socketsecurity/registry/lib/fs');
 var strings = require('../external/@socketsecurity/registry/lib/strings');
@@ -907,6 +907,17 @@ async function fetchCreateOrgFullScan(packagePaths, orgSlug, config, options) {
     return sockSdkCResult;
   }
   const sockSdk = sockSdkCResult.data;
+  if (constants.default.ENV.SOCKET_CLI_DEBUG) {
+    const fileInfo = await Promise.all(packagePaths.map(async p => {
+      const absPath = path.resolve(process.cwd(), p);
+      const stat = await fs$1.promises.stat(absPath);
+      return {
+        path: absPath,
+        size: stat.size
+      };
+    }));
+    logger.logger.info(`[DEBUG] ${new Date().toISOString()} Uploading full scan manifests: ${JSON.stringify(fileInfo)}`);
+  }
   return await utils.handleApiCall(sockSdk.createOrgFullScan(orgSlug, packagePaths, cwd, {
     ...(branchName ? {
       branch: branchName
@@ -3548,8 +3559,9 @@ async function coanaFix(fixConfig) {
     autopilot,
     cwd,
     disableMajorUpdates,
+    exclude,
     ghsas,
-    glob,
+    include,
     limit,
     minimumReleaseAge,
     orgSlug,
@@ -3619,7 +3631,7 @@ async function coanaFix(fixConfig) {
         }
       };
     }
-    const fixCResult = await utils.spawnCoanaDlx(['compute-fixes-and-upgrade-purls', cwd, '--manifests-tar-hash', tarHash, '--apply-fixes-to', ...(isAll ? ['all'] : ghsas), ...(fixConfig.rangeStyle ? ['--range-style', fixConfig.rangeStyle] : []), ...(minimumReleaseAge ? ['--minimum-release-age', minimumReleaseAge] : []), ...(glob ? ['--glob', glob] : []), ...(!applyFixes ? [constants.FLAG_DRY_RUN] : []), ...(outputFile ? ['--output-file', outputFile] : []), ...(disableMajorUpdates ? ['--disable-major-updates'] : []), ...(showAffectedDirectDependencies ? ['--show-affected-direct-dependencies'] : []), ...fixConfig.unknownFlags], fixConfig.orgSlug, {
+    const fixCResult = await utils.spawnCoanaDlx(['compute-fixes-and-upgrade-purls', cwd, '--manifests-tar-hash', tarHash, '--apply-fixes-to', ...(isAll ? ['all'] : ghsas), ...(fixConfig.rangeStyle ? ['--range-style', fixConfig.rangeStyle] : []), ...(minimumReleaseAge ? ['--minimum-release-age', minimumReleaseAge] : []), ...(include.length ? ['--include', ...include] : []), ...(exclude.length ? ['--exclude', ...exclude] : []), ...(!applyFixes ? [constants.FLAG_DRY_RUN] : []), ...(outputFile ? ['--output-file', outputFile] : []), ...(disableMajorUpdates ? ['--disable-major-updates'] : []), ...(showAffectedDirectDependencies ? ['--show-affected-direct-dependencies'] : []), ...fixConfig.unknownFlags], fixConfig.orgSlug, {
       cwd,
       spinner,
       stdio: 'inherit'
@@ -3654,7 +3666,7 @@ async function coanaFix(fixConfig) {
   const shouldSpawnCoana = adjustedLimit > 0;
   let ids;
   if (shouldSpawnCoana && isAll) {
-    const foundCResult = await utils.spawnCoanaDlx(['compute-fixes-and-upgrade-purls', cwd, '--manifests-tar-hash', tarHash, ...(fixConfig.rangeStyle ? ['--range-style', fixConfig.rangeStyle] : []), ...(minimumReleaseAge ? ['--minimum-release-age', minimumReleaseAge] : []), ...(glob ? ['--glob', glob] : []), ...(disableMajorUpdates ? ['--disable-major-updates'] : []), ...(showAffectedDirectDependencies ? ['--show-affected-direct-dependencies'] : []), ...fixConfig.unknownFlags], fixConfig.orgSlug, {
+    const foundCResult = await utils.spawnCoanaDlx(['compute-fixes-and-upgrade-purls', cwd, '--manifests-tar-hash', tarHash, ...(fixConfig.rangeStyle ? ['--range-style', fixConfig.rangeStyle] : []), ...(minimumReleaseAge ? ['--minimum-release-age', minimumReleaseAge] : []), ...(include.length ? ['--include', ...include] : []), ...(exclude.length ? ['--exclude', ...exclude] : []), ...(disableMajorUpdates ? ['--disable-major-updates'] : []), ...(showAffectedDirectDependencies ? ['--show-affected-direct-dependencies'] : []), ...fixConfig.unknownFlags], fixConfig.orgSlug, {
       cwd,
       spinner
     });
@@ -3696,7 +3708,7 @@ async function coanaFix(fixConfig) {
 
     // Apply fix for single GHSA ID.
     // eslint-disable-next-line no-await-in-loop
-    const fixCResult = await utils.spawnCoanaDlx(['compute-fixes-and-upgrade-purls', cwd, '--manifests-tar-hash', tarHash, '--apply-fixes-to', ghsaId, ...(fixConfig.rangeStyle ? ['--range-style', fixConfig.rangeStyle] : []), ...(minimumReleaseAge ? ['--minimum-release-age', minimumReleaseAge] : []), ...(glob ? ['--glob', glob] : []), ...(disableMajorUpdates ? ['--disable-major-updates'] : []), ...(showAffectedDirectDependencies ? ['--show-affected-direct-dependencies'] : []), ...fixConfig.unknownFlags], fixConfig.orgSlug, {
+    const fixCResult = await utils.spawnCoanaDlx(['compute-fixes-and-upgrade-purls', cwd, '--manifests-tar-hash', tarHash, '--apply-fixes-to', ghsaId, ...(fixConfig.rangeStyle ? ['--range-style', fixConfig.rangeStyle] : []), ...(minimumReleaseAge ? ['--minimum-release-age', minimumReleaseAge] : []), ...(include.length ? ['--include', ...include] : []), ...(exclude.length ? ['--exclude', ...exclude] : []), ...(disableMajorUpdates ? ['--disable-major-updates'] : []), ...(showAffectedDirectDependencies ? ['--show-affected-direct-dependencies'] : []), ...fixConfig.unknownFlags], fixConfig.orgSlug, {
       cwd,
       spinner,
       stdio: 'inherit'
@@ -3910,8 +3922,9 @@ async function handleFix({
   autopilot,
   cwd,
   disableMajorUpdates,
+  exclude,
   ghsas,
-  glob,
+  include,
   limit,
   minSatisfying,
   minimumReleaseAge,
@@ -3926,14 +3939,16 @@ async function handleFix({
 }) {
   require$$9.debugFn('notice', `Starting fix command for ${orgSlug}`);
   require$$9.debugDir('inspect', {
+    applyFixes,
     autopilot,
     cwd,
     disableMajorUpdates,
+    exclude,
     ghsas,
-    glob,
+    include,
     limit,
     minSatisfying,
-    applyFixes,
+    minimumReleaseAge,
     outputFile,
     outputKind,
     prCheck,
@@ -3942,21 +3957,22 @@ async function handleFix({
     unknownFlags
   });
   await outputFixResult(await coanaFix({
-    autopilot,
     applyFixes,
+    autopilot,
     cwd,
     disableMajorUpdates,
-    // Convert mixed CVE/GHSA/PURL inputs to GHSA IDs only
+    exclude,
+    // Convert mixed CVE/GHSA/PURL inputs to GHSA IDs only.
     ghsas: await convertIdsToGhsas(ghsas),
-    glob,
+    include,
     limit,
     minimumReleaseAge,
     orgSlug,
+    outputFile,
     rangeStyle,
     showAffectedDirectDependencies,
     spinner,
-    unknownFlags,
-    outputFile
+    unknownFlags
   }), outputKind);
 }
 
@@ -3983,6 +3999,20 @@ const generalFlags$2 = {
     // Hidden to allow custom documenting of the negated `--no-apply-fixes` variant.
     hidden: true
   },
+  exclude: {
+    type: 'string',
+    default: [],
+    description: 'Exclude workspaces matching these glob patterns. Can be provided as comma separated values or as multiple flags',
+    isMultiple: true,
+    hidden: false
+  },
+  include: {
+    type: 'string',
+    default: [],
+    description: 'Include workspaces matching these glob patterns. Can be provided as comma separated values or as multiple flags',
+    isMultiple: true,
+    hidden: false
+  },
   majorUpdates: {
     type: 'boolean',
     default: true,
@@ -4040,12 +4070,6 @@ const hiddenFlags = {
     ...generalFlags$2['id'],
     hidden: true
   },
-  glob: {
-    type: 'string',
-    default: '',
-    description: 'Glob pattern to filter workspaces by',
-    hidden: true
-  },
   maxSatisfying: {
     type: 'boolean',
     default: true,
@@ -4144,7 +4168,8 @@ async function run$K(argv, importMeta, {
   const {
     applyFixes,
     autopilot,
-    glob,
+    exclude,
+    include,
     json,
     limit,
     majorUpdates,
@@ -4195,24 +4220,27 @@ async function run$K(argv, importMeta, {
     spinner
   } = constants.default;
   const ghsas = arrays.arrayUnique([...utils.cmdFlagValueToArray(cli.flags['id']), ...utils.cmdFlagValueToArray(cli.flags['ghsa']), ...utils.cmdFlagValueToArray(cli.flags['purl'])]);
+  const includePatterns = utils.cmdFlagValueToArray(include);
+  const excludePatterns = utils.cmdFlagValueToArray(exclude);
   await handleFix({
-    autopilot,
     applyFixes,
+    autopilot,
     cwd,
     disableMajorUpdates,
+    exclude: excludePatterns,
     ghsas,
-    glob,
+    include: includePatterns,
     limit,
     minimumReleaseAge,
     minSatisfying,
-    prCheck,
     orgSlug,
+    outputFile,
     outputKind,
+    prCheck,
     rangeStyle,
     showAffectedDirectDependencies,
     spinner,
-    unknownFlags,
-    outputFile
+    unknownFlags
   });
 }
 
@@ -11969,12 +11997,20 @@ async function downloadManifestFile({
   require$$9.debugDir('inspect', {
     fileUrl
   });
-  const downloadUrlResponse = await fetch(fileUrl, {
-    method: 'GET',
-    headers: {
-      Authorization: `Bearer ${githubToken}`
-    }
-  });
+  utils.debugApiRequest('GET', fileUrl);
+  let downloadUrlResponse;
+  try {
+    downloadUrlResponse = await fetch(fileUrl, {
+      method: 'GET',
+      headers: {
+        Authorization: `Bearer ${githubToken}`
+      }
+    });
+    utils.debugApiResponse('GET', fileUrl, downloadUrlResponse.status);
+  } catch (e) {
+    utils.debugApiResponse('GET', fileUrl, undefined, e);
+    throw e;
+  }
   require$$9.debugFn('notice', 'complete: request');
   const downloadUrlText = await downloadUrlResponse.text();
   require$$9.debugFn('inspect', 'response: raw download url', downloadUrlText);
@@ -12011,7 +12047,9 @@ async function streamDownloadWithFetch(localPath, downloadUrl) {
   let response; // Declare response here to access it in catch if needed
 
   try {
+    utils.debugApiRequest('GET', downloadUrl);
     response = await fetch(downloadUrl);
+    utils.debugApiResponse('GET', downloadUrl, response.status);
     if (!response.ok) {
       const errorMsg = `Download failed due to bad server response: ${response.status} ${response.statusText} for ${downloadUrl}`;
       logger.logger.fail(errorMsg);
@@ -12050,6 +12088,9 @@ async function streamDownloadWithFetch(localPath, downloadUrl) {
       data: localPath
     };
   } catch (e) {
+    if (!response) {
+      utils.debugApiResponse('GET', downloadUrl, undefined, e);
+    }
     logger.logger.fail('An error was thrown while trying to download a manifest file... url:', downloadUrl);
     require$$9.debugDir('error', e);
 
@@ -12091,11 +12132,19 @@ async function getLastCommitDetails({
   logger.logger.info(`Requesting last commit for default branch ${defaultBranch} for ${orgGithub}/${repoSlug}...`);
   const commitApiUrl = `${repoApiUrl}/commits?sha=${defaultBranch}&per_page=1`;
   require$$9.debugFn('inspect', 'url: commit', commitApiUrl);
-  const commitResponse = await fetch(commitApiUrl, {
-    headers: {
-      Authorization: `Bearer ${githubToken}`
-    }
-  });
+  utils.debugApiRequest('GET', commitApiUrl);
+  let commitResponse;
+  try {
+    commitResponse = await fetch(commitApiUrl, {
+      headers: {
+        Authorization: `Bearer ${githubToken}`
+      }
+    });
+    utils.debugApiResponse('GET', commitApiUrl, commitResponse.status);
+  } catch (e) {
+    utils.debugApiResponse('GET', commitApiUrl, undefined, e);
+    throw e;
+  }
   const commitText = await commitResponse.text();
   require$$9.debugFn('inspect', 'response: commit', commitText);
   let lastCommit;
@@ -12187,12 +12236,20 @@ async function getRepoDetails({
   require$$9.debugDir('inspect', {
     repoApiUrl
   });
-  const repoDetailsResponse = await fetch(repoApiUrl, {
-    method: 'GET',
-    headers: {
-      Authorization: `Bearer ${githubToken}`
-    }
-  });
+  let repoDetailsResponse;
+  try {
+    utils.debugApiRequest('GET', repoApiUrl);
+    repoDetailsResponse = await fetch(repoApiUrl, {
+      method: 'GET',
+      headers: {
+        Authorization: `Bearer ${githubToken}`
+      }
+    });
+    utils.debugApiResponse('GET', repoApiUrl, repoDetailsResponse.status);
+  } catch (e) {
+    utils.debugApiResponse('GET', repoApiUrl, undefined, e);
+    throw e;
+  }
   logger.logger.success(`Request completed.`);
   const repoDetailsText = await repoDetailsResponse.text();
   require$$9.debugFn('inspect', 'response: repo', repoDetailsText);
@@ -12235,12 +12292,20 @@ async function getRepoBranchTree({
   logger.logger.info(`Requesting default branch file tree; branch \`${defaultBranch}\`, repo \`${orgGithub}/${repoSlug}\`...`);
   const treeApiUrl = `${repoApiUrl}/git/trees/${defaultBranch}?recursive=1`;
   require$$9.debugFn('inspect', 'url: tree', treeApiUrl);
-  const treeResponse = await fetch(treeApiUrl, {
-    method: 'GET',
-    headers: {
-      Authorization: `Bearer ${githubToken}`
-    }
-  });
+  let treeResponse;
+  try {
+    utils.debugApiRequest('GET', treeApiUrl);
+    treeResponse = await fetch(treeApiUrl, {
+      method: 'GET',
+      headers: {
+        Authorization: `Bearer ${githubToken}`
+      }
+    });
+    utils.debugApiResponse('GET', treeApiUrl, treeResponse.status);
+  } catch (e) {
+    utils.debugApiResponse('GET', treeApiUrl, undefined, e);
+    throw e;
+  }
   const treeText = await treeResponse.text();
   require$$9.debugFn('inspect', 'response: tree', treeText);
   let treeDetails;
@@ -14995,5 +15060,5 @@ void (async () => {
     await utils.captureException(e);
   }
 })();
-//# debugId=3a127de6-5ee9-48f9-aded-7e7e7e868c6a
+//# debugId=ede65737-8f7f-42fe-be24-d7339a0b3189
 //# sourceMappingURL=cli.js.map