snyk 1.853.0 → 1.854.0

package/dist/cli/245.index.js

@@ -5550,6 +5550,7 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.extendAnalysis = exports.analyzeFolders = exports.analyzeBundle = void 0;
 /* eslint-disable no-await-in-loop */
 const lodash_omit_1 = __importDefault(__webpack_require__(76427));
+const uuid_1 = __webpack_require__(42277);
 const files_1 = __webpack_require__(32083);
 const constants_1 = __webpack_require__(65765);
 const http_1 = __webpack_require__(60776);
@@ -5612,6 +5613,9 @@ function normalizeResultFiles(files, baseDir) {
     return files;
 }
 async function analyzeFolders(options) {
+    if (!options.connection.requestId) {
+        options.connection.requestId = (0, uuid_1.v4)();
+    }
     const fileBundle = await (0, bundles_1.createBundleFromFolders)({
         ...options.connection,
         ...options.fileOptions,
@@ -5794,7 +5798,7 @@ async function* prepareRemoteBundle(options) {
     emitter_1.emitter.createBundleProgress(cumulativeProgress, options.files.length);
     for (const chunkedFiles of (0, files_1.composeFilePayloads)(options.files, constants_1.MAX_PAYLOAD)) {
         const apiParams = {
-            ...(0, lodash_pick_1.default)(options, ['baseURL', 'sessionToken', 'source', 'removedFiles']),
+            ...(0, lodash_pick_1.default)(options, ['baseURL', 'sessionToken', 'source', 'removedFiles', 'requestId']),
             files: chunkedFiles.reduce((d, f) => {
                 // deepcode ignore PrototypePollution: FP this is an internal code
                 d[f.bundlePath] = f.hash;
@@ -5829,7 +5833,7 @@ async function* prepareRemoteBundle(options) {
 async function uploadRemoteBundle(options) {
     let uploadedFiles = 0;
     emitter_1.emitter.uploadBundleProgress(0, options.files.length);
-    const apiParams = (0, lodash_pick_1.default)(options, ['baseURL', 'sessionToken', 'source', 'bundleHash']);
+    const apiParams = (0, lodash_pick_1.default)(options, ['baseURL', 'sessionToken', 'source', 'bundleHash', 'requestId']);
     const uploadFileChunks = async (bucketFiles) => {
         // Note: we specifically create __new__ isolated bundles here to faster files upload
         const resp = await (0, http_1.createBundle)({
@@ -5858,7 +5862,7 @@ async function fullfillRemoteBundle(options) {
     // Check remove bundle to make sure no missing files left
     let attempts = 0;
     let { remoteBundle } = options;
-    const connectionOptions = (0, lodash_pick_1.default)(options, ['baseURL', 'sessionToken', 'source']);
+    const connectionOptions = (0, lodash_pick_1.default)(options, ['baseURL', 'sessionToken', 'source', 'requestId']);
     while (remoteBundle.missingFiles.length && attempts < (options.maxAttempts || constants_1.MAX_UPLOAD_ATTEMPTS)) {
         const missingFiles = await (0, files_1.resolveBundleFiles)(options.baseDir, remoteBundle.missingFiles);
         await uploadRemoteBundle({
@@ -5878,7 +5882,7 @@ async function fullfillRemoteBundle(options) {
 }
 async function remoteBundleFactory(options) {
     let remoteBundle = null;
-    const baseOptions = (0, lodash_pick_1.default)(options, ['baseURL', 'sessionToken', 'source', 'baseDir']);
+    const baseOptions = (0, lodash_pick_1.default)(options, ['baseURL', 'sessionToken', 'source', 'baseDir', 'requestId']);
     const bundleFactory = prepareRemoteBundle((0, lodash_omit_1.default)(options, ['baseDir']));
     for await (const response of bundleFactory) {
         if (response.type === 'error') {
@@ -5899,9 +5903,9 @@ exports.remoteBundleFactory = remoteBundleFactory;
  * @param source
  * @returns
  */
-async function getSupportedFiles(baseURL, source) {
+async function getSupportedFiles(baseURL, source, requestId) {
     emitter_1.emitter.supportedFilesLoaded(null);
-    const resp = await (0, http_1.getFilters)(baseURL, source);
+    const resp = await (0, http_1.getFilters)(baseURL, source, undefined, requestId);
     if (resp.type === 'error') {
         throw resp.error;
     }
@@ -5919,7 +5923,7 @@ async function createBundleFromFolders(options) {
     const baseDir = (0, files_1.determineBaseDir)(options.paths);
     const [supportedFiles, fileIgnores] = await Promise.all([
         // Fetch supporte files to save network traffic
-        getSupportedFiles(options.baseURL, options.source),
+        getSupportedFiles(options.baseURL, options.source, options.requestId),
         // Scan for custom ignore rules
         (0, files_1.collectIgnoreRules)(options.paths, options.symlinksEnabled, options.defaultFileIgnores),
     ]);
@@ -5938,7 +5942,7 @@ async function createBundleFromFolders(options) {
         emitter_1.emitter.scanFilesProgress(totalFiles);
     }
     const bundleOptions = {
-        ...(0, lodash_pick_1.default)(options, ['baseURL', 'sessionToken', 'source']),
+        ...(0, lodash_pick_1.default)(options, ['baseURL', 'sessionToken', 'source', 'requestId']),
         baseDir,
         files: bundleFiles,
     };
@@ -6437,6 +6441,9 @@ async function prepareExtendingBundle(baseDir, supportedFiles, fileIgnores = con
     processingFiles = processingFiles.map(f => resolveBundleFilePath(baseDir, f)).filter(f => !isMatch(f, fileIgnores));
     if (processingFiles.length) {
         // Determine existing files (minus removed)
+        if (isWindows) {
+            processingFiles = processingFiles.map(f => f.replace(/\\/g, '/')); // fg requires forward-slashes in Windows globs
+        }
         const entries = await (0, fast_glob_1.default)(processingFiles, {
             ...fgOptions,
             cwd: baseDir,
@@ -6641,7 +6648,8 @@ async function getIpFamily(authHost) {
         method: 'post',
         family, // family param forces the handler to dispatch a request using IP at "family" version
     }, 0);
-    return res.success ? family : undefined;
+    const ipv6Incompatible = res.error;
+    return ipv6Incompatible ? undefined : family;
 }
 exports.getIpFamily = getIpFamily;
 const CHECK_SESSION_ERROR_MESSAGES = {
@@ -6671,10 +6679,10 @@ async function checkSession(options) {
     return generateError(res.errorCode, CHECK_SESSION_ERROR_MESSAGES, 'checkSession');
 }
 exports.checkSession = checkSession;
-async function getFilters(baseURL, source, attempts = constants_1.MAX_RETRY_ATTEMPTS) {
+async function getFilters(baseURL, source, attempts = constants_1.MAX_RETRY_ATTEMPTS, requestId) {
     const apiName = 'filters';
     const res = await (0, needle_1.makeRequest)({
-        headers: { source },
+        headers: { source, ...(requestId && { 'snyk-request-id': requestId }) },
         url: `${baseURL}/${apiName}`,
         method: 'get',
     }, attempts);
@@ -6704,6 +6712,7 @@ async function createBundle(options) {
         headers: {
             ...prepareTokenHeaders(options.sessionToken),
             source: options.source,
+            ...(options.requestId && { 'snyk-request-id': options.requestId })
         },
         url: `${options.baseURL}/bundle`,
         method: 'post',
@@ -6727,6 +6736,7 @@ async function checkBundle(options) {
         headers: {
             ...prepareTokenHeaders(options.sessionToken),
             source: options.source,
+            ...(options.requestId && { 'snyk-request-id': options.requestId })
         },
         url: `${options.baseURL}/bundle/${options.bundleHash}`,
         method: 'get',
@@ -6749,6 +6759,7 @@ async function extendBundle(options) {
         headers: {
             ...prepareTokenHeaders(options.sessionToken),
             source: options.source,
+            ...(options.requestId && { 'snyk-request-id': options.requestId })
         },
         url: `${options.baseURL}/bundle/${options.bundleHash}`,
         method: 'put',
@@ -6782,6 +6793,7 @@ async function getAnalysis(options) {
         headers: {
             ...prepareTokenHeaders(options.sessionToken),
             source: options.source,
+            ...(options.requestId && { 'snyk-request-id': options.requestId })
         },
         url: `${options.baseURL}/analysis`,
         method: 'post',
@@ -6947,6 +6959,7 @@ async function makeRequest(payload, attempts = constants_1.MAX_RETRY_ATTEMPTS) {
     emitter_1.emitter.apiRequestLog(`=> HTTP ${method === null || method === void 0 ? void 0 : method.toUpperCase()} ${url} ${data !== null && data !== void 0 ? data : ''}`.slice(0, 399));
     do {
         let errorCode;
+        let error;
         let response;
         try {
             response = await (0, needle_1.default)(method, url, data, options);
@@ -6957,6 +6970,7 @@ async function makeRequest(payload, attempts = constants_1.MAX_RETRY_ATTEMPTS) {
             errorCode = response.statusCode;
         }
         catch (err) {
+            error = err; // do not swallow the error, pass further to the caller instead
             errorCode = constants_1.NETWORK_ERRORS[err.code || err.errno];
             emitter_1.emitter.apiRequestLog(`Requested url --> ${url} | error --> ${err}`);
         }
@@ -6975,10 +6989,10 @@ async function makeRequest(payload, attempts = constants_1.MAX_RETRY_ATTEMPTS) {
         }
         else {
             attempts = 0;
-            return { success: false, errorCode };
+            return { success: false, errorCode, error };
         }
     } while (attempts > 0);
-    return { success: false, errorCode: constants_1.ErrorCodes.serviceUnavailable };
+    return { success: false, errorCode: constants_1.ErrorCodes.serviceUnavailable, error: undefined };
 }
 exports.makeRequest = makeRequest;
 //# sourceMappingURL=needle.js.map