@socketsecurity/cli-with-sentry 1.0.99 → 1.0.101

package/dist/cli.js

@@ -3379,47 +3379,37 @@ async function fetchGhsaDetails(ids) {
   const octokitGraphql = getOctokitGraphql();
   try {
     const gqlCacheKey = `${ids.join('-')}-graphql-snapshot`;
-    const gqlResp = await cacheFetch(gqlCacheKey, () => octokitGraphql(`
-        query($identifiers: [SecurityAdvisoryIdentifierFilter!]!) {
-          securityAdvisories(first: ${ids.length}, identifiers: $identifiers) {
-            nodes {
-              ghsaId
-              cveId
-              summary
-              severity
-              publishedAt
-              withdrawnAt
-              references {
-                url
-              }
-              vulnerabilities(first: 10) {
-                nodes {
-                  package {
-                    ecosystem
-                    name
-                  }
-                  vulnerableVersionRange
-                }
-              }
+    const aliases = ids.map((id, index) => `advisory${index}: securityAdvisory(ghsaId: "${id}") {
+        ghsaId
+        summary
+        severity
+        publishedAt
+        withdrawnAt
+        vulnerabilities(first: 10) {
+          nodes {
+            package {
+              ecosystem
+              name
             }
+            vulnerableVersionRange
           }
-        }`, {
-      identifiers: ids.map(id => ({
-        type: 'GHSA',
-        value: id
-      }))
-    }));
-    const advisories = gqlResp?.securityAdvisories?.nodes || [];
-    for (const advisory of advisories) {
-      if (advisory.ghsaId) {
-        results.set(advisory.ghsaId, advisory);
-      }
-    }
-
-    // Log any missing advisories
-    for (const id of ids) {
-      if (!results.has(id)) {
-        require$$8.debugFn('notice', `No advisory found for ${id}`);
+        }
+      }`).join('\n');
+    const gqlResp = await cacheFetch(gqlCacheKey, () => octokitGraphql(`
+        query {
+          ${aliases}
+        }
+      `));
+    for (let i = 0, {
+        length
+      } = ids; i < length; i += 1) {
+      const id = ids[i];
+      const advisoryKey = `advisory${i}`;
+      const advisory = gqlResp?.[advisoryKey];
+      if (advisory && advisory.ghsaId) {
+        results.set(id, advisory);
+      } else {
+        require$$8.debugFn('notice', `miss: no advisory found for ${id}`);
       }
     }
   } catch (e) {
@@ -3938,7 +3928,9 @@ async function coanaFix(fixConfig) {
       }
     };
   }
+  require$$8.debugFn('notice', `fetch: ${ids.length} GHSA details for ${arrays.joinAnd(ids)}`);
   const ghsaDetails = await fetchGhsaDetails(ids);
+  require$$8.debugFn('notice', `found: ${ghsaDetails.size} GHSA details`);
   const scanBaseNames = new Set(scanFilepaths.map(p => path.basename(p)));
   let count = 0;
   let overallFixed = false;
@@ -3979,7 +3971,9 @@ async function coanaFix(fixConfig) {
         continue ghsaLoop;
       }
       require$$8.debugFn('notice', `pr: creating for ${id}`);
-      const summary = ghsaDetails.get(id)?.summary;
+      const details = ghsaDetails.get(id);
+      const summary = details?.summary;
+      require$$8.debugFn('notice', `ghsa: ${id} details ${details ? 'found' : 'missing'}`);
       const pushed =
       // eslint-disable-next-line no-await-in-loop
       (await utils.gitCreateBranch(branch, cwd)) && (
@@ -15529,5 +15523,5 @@ void (async () => {
     await utils.captureException(e);
   }
 })();
-//# debugId=dc11ece4-8083-4322-9e08-9883c0bc7831
+//# debugId=a4903131-9deb-4ec0-b986-17c43c335d82
 //# sourceMappingURL=cli.js.map