snyk 1.1233.0 → 1.1235.0

package/dist/cli/245.index.js

@@ -11080,7 +11080,16 @@ async function* prepareRemoteBundle(options) {
     emitter_1.emitter.createBundleProgress(cumulativeProgress, options.files.length);
     for (const chunkedFiles of files_1.composeFilePayloads(options.files)) {
         const apiParams = {
-            ...lodash_pick_1.default(options, ['baseURL', 'sessionToken', 'source', 'extraHeaders', 'removedFiles', 'requestId', 'org']),
+            ...lodash_pick_1.default(options, [
+                'baseURL',
+                'sessionToken',
+                'source',
+                'extraHeaders',
+                'removedFiles',
+                'requestId',
+                'org',
+                'orgId',
+            ]),
             files: chunkedFiles.reduce((d, f) => {
                 // deepcode ignore PrototypePollution: FP this is an internal code
                 d[f.bundlePath] = f.hash;
@@ -11122,6 +11131,7 @@ async function uploadRemoteBundle(options) {
         'bundleHash',
         'requestId',
         'org',
+        'orgId',
         'extraHeaders',
     ]);
     const uploadFileChunks = async (bucketFiles) => {
@@ -11152,7 +11162,15 @@ async function fullfillRemoteBundle(options) {
     // Check remove bundle to make sure no missing files left
     let attempts = 0;
     let { remoteBundle } = options;
-    const connectionOptions = lodash_pick_1.default(options, ['baseURL', 'sessionToken', 'source', 'requestId', 'org', 'extraHeaders']);
+    const connectionOptions = lodash_pick_1.default(options, [
+        'baseURL',
+        'sessionToken',
+        'source',
+        'requestId',
+        'org',
+        'orgId',
+        'extraHeaders',
+    ]);
     while (remoteBundle.missingFiles.length && attempts < (options.maxAttempts || constants_1.MAX_UPLOAD_ATTEMPTS)) {
         const missingFiles = await files_1.resolveBundleFiles(options.baseDir, remoteBundle.missingFiles);
         await uploadRemoteBundle({
@@ -11179,6 +11197,7 @@ async function remoteBundleFactory(options) {
         'baseDir',
         'requestId',
         'org',
+        'orgId',
         'extraHeaders',
     ]);
     const bundleFactory = prepareRemoteBundle(lodash_omit_1.default(options, ['baseDir']));
@@ -11201,9 +11220,9 @@ exports.remoteBundleFactory = remoteBundleFactory;
  * @param source
  * @returns
  */
-async function getSupportedFiles(baseURL, source, requestId, languages) {
+async function getSupportedFiles(baseURL, source, requestId, languages, orgId) {
     emitter_1.emitter.supportedFilesLoaded(null);
-    const resp = await http_1.getFilters(baseURL, source, undefined, requestId);
+    const resp = await http_1.getFilters(baseURL, source, constants_1.MAX_RETRY_ATTEMPTS, requestId, orgId);
     if (resp.type === 'error') {
         throw resp.error;
     }
@@ -11233,7 +11252,7 @@ exports.getSupportedFiles = getSupportedFiles;
  */
 async function createBundleFromFolders(options) {
     // Fetch supported files to save network traffic
-    const supportedFiles = await getSupportedFiles(options.baseURL, options.source, options.requestId, options.languages);
+    const supportedFiles = await getSupportedFiles(options.baseURL, options.source, options.requestId, options.languages, options.orgId);
     // Collect files and create a remote bundle
     return await createBundleWithCustomFiles(options, supportedFiles);
 }
@@ -11266,7 +11285,7 @@ async function createBundleWithCustomFiles(options, supportedFiles) {
         emitter_1.emitter.scanFilesProgress(totalFiles);
     }
     const bundleOptions = {
-        ...lodash_pick_1.default(options, ['baseURL', 'sessionToken', 'source', 'requestId', 'org', 'extraHeaders']),
+        ...lodash_pick_1.default(options, ['baseURL', 'sessionToken', 'source', 'requestId', 'org', 'orgId', 'extraHeaders']),
         baseDir,
         files: bundleFiles,
     };
@@ -11991,6 +12010,7 @@ const zlib_1 = __webpack_require__(59796);
 const util_1 = __webpack_require__(73837);
 const constants_1 = __webpack_require__(65765);
 const needle_1 = __webpack_require__(14577);
+const httpUtils_1 = __webpack_require__(11294);
 // The trick to typecast union type alias
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 function isSubsetErrorCode(code, messages) {
@@ -12086,11 +12106,18 @@ 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, requestId) {
+async function getFilters(baseURL, source, attempts = constants_1.MAX_RETRY_ATTEMPTS, requestId, orgId) {
     const apiName = 'filters';
+    let url;
+    try {
+        url = httpUtils_1.getURL(baseURL, '/' + apiName, orgId);
+    }
+    catch (err) {
+        return generateError(400, err.message, apiName);
+    }
     const res = await needle_1.makeRequest({
         headers: { source, ...(requestId && { 'snyk-request-id': requestId }) },
-        url: `${baseURL}/${apiName}`,
+        url,
         method: 'get',
     }, attempts);
     if (res.success) {
@@ -12118,13 +12145,20 @@ const CREATE_BUNDLE_ERROR_MESSAGES = {
 };
 async function createBundle(options) {
     const payloadBody = await compressAndEncode(options.files);
+    let url;
+    try {
+        url = httpUtils_1.getURL(options.baseURL, '/bundle', options.orgId);
+    }
+    catch (err) {
+        return generateError(400, err.message, 'createBundle');
+    }
     const payload = {
         headers: {
             'content-type': 'application/octet-stream',
             'content-encoding': 'gzip',
             ...commonHttpHeaders(options),
         },
-        url: `${options.baseURL}/bundle`,
+        url,
         method: 'post',
         body: payloadBody,
         isJson: false,
@@ -12143,11 +12177,18 @@ const CHECK_BUNDLE_ERROR_MESSAGES = {
     [constants_1.ErrorCodes.notFound]: 'Uploaded bundle has expired',
 };
 async function checkBundle(options) {
+    let url;
+    try {
+        url = httpUtils_1.getURL(options.baseURL, `/bundle/${options.bundleHash}`, options.orgId);
+    }
+    catch (err) {
+        return generateError(400, err.message, 'checkBundle');
+    }
     const res = await needle_1.makeRequest({
         headers: {
             ...commonHttpHeaders(options),
         },
-        url: `${options.baseURL}/bundle/${options.bundleHash}`,
+        url,
         method: 'get',
     });
     if (res.success)
@@ -12165,13 +12206,20 @@ const EXTEND_BUNDLE_ERROR_MESSAGES = {
 };
 async function extendBundle(options) {
     const payloadBody = await compressAndEncode(lodash_pick_1.default(options, ['files', 'removedFiles']));
+    let url;
+    try {
+        url = httpUtils_1.getURL(options.baseURL, `/bundle/${options.bundleHash}`, options.orgId);
+    }
+    catch (err) {
+        return generateError(400, err.message, 'extendBundle');
+    }
     const res = await needle_1.makeRequest({
         headers: {
             'content-type': 'application/octet-stream',
             'content-encoding': 'gzip',
             ...commonHttpHeaders(options),
         },
-        url: `${options.baseURL}/bundle/${options.bundleHash}`,
+        url,
         method: 'put',
         body: payloadBody,
         isJson: false,
@@ -12200,11 +12248,18 @@ const GET_ANALYSIS_ERROR_MESSAGES = {
     [constants_1.ErrorCodes.serverError]: 'Getting analysis failed',
 };
 async function getAnalysis(options) {
+    let url;
+    try {
+        url = httpUtils_1.getURL(options.baseURL, '/analysis', options.orgId);
+    }
+    catch (err) {
+        return generateError(400, err.message, 'getAnalysis');
+    }
     const config = {
         headers: {
             ...commonHttpHeaders(options),
         },
-        url: `${options.baseURL}/analysis`,
+        url,
         method: 'post',
         body: {
             key: {
@@ -12234,11 +12289,18 @@ const REPORT_ERROR_MESSAGES = {
  * Trigger a file-based test with reporting.
  */
 async function initReport(options) {
+    let url;
+    try {
+        url = httpUtils_1.getURL(options.baseURL, `/report`, options.orgId);
+    }
+    catch (err) {
+        return generateError(400, err.message, 'initReport');
+    }
     const config = {
         headers: {
             ...commonHttpHeaders(options),
         },
-        url: `${options.baseURL}/report`,
+        url,
         method: 'post',
         body: {
             workflowData: {
@@ -12267,11 +12329,18 @@ exports.initReport = initReport;
  */
 async function getReport(options) {
     var _a;
+    let url;
+    try {
+        url = httpUtils_1.getURL(options.baseURL, `/report/${options.pollId}`, options.orgId);
+    }
+    catch (err) {
+        return generateError(400, err.message, 'getReport');
+    }
     const config = {
         headers: {
             ...commonHttpHeaders(options),
         },
-        url: `${options.baseURL}/report/${options.pollId}`,
+        url,
         method: 'get',
     };
     const res = await needle_1.makeRequest(config);
@@ -12284,11 +12353,18 @@ exports.getReport = getReport;
  * Trigger an SCM-based test with reporting.
  */
 async function initScmReport(options) {
+    let url;
+    try {
+        url = httpUtils_1.getURL(options.baseURL, `/test`, options.orgId);
+    }
+    catch (err) {
+        return generateError(400, err.message, 'initReport');
+    }
     const config = {
         headers: {
             ...commonHttpHeaders(options),
         },
-        url: `${options.baseURL}/test`,
+        url,
         method: 'post',
         body: {
             workflowData: {
@@ -12309,11 +12385,18 @@ exports.initScmReport = initScmReport;
  */
 async function getScmReport(options) {
     var _a;
+    let url;
+    try {
+        url = httpUtils_1.getURL(options.baseURL, `/test/${options.pollId}`, options.orgId);
+    }
+    catch (err) {
+        return generateError(400, err.message, 'getReport');
+    }
     const config = {
         headers: {
             ...commonHttpHeaders(options),
         },
-        url: `${options.baseURL}/test/${options.pollId}`,
+        url,
         method: 'get',
     };
     const res = await needle_1.makeRequest(config);
@@ -12578,7 +12661,7 @@ async function initAndPollReportGeneric(initReportFunc, getReportFunc, options)
     while (true) {
         // eslint-disable-next-line no-await-in-loop
         apiResponse = await getReportFunc({
-            ...lodash_pick_1.default(options, ['baseURL', 'sessionToken', 'source', 'requestId', 'org']),
+            ...lodash_pick_1.default(options, ['baseURL', 'sessionToken', 'source', 'requestId', 'org', 'orgId']),
             pollId,
         });
         if (apiResponse.type === 'error') {
@@ -12653,6 +12736,30 @@ exports.reportScm = reportScm;
 
 /***/ }),
 
+/***/ 11294:
+/***/ ((__unused_webpack_module, exports) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.getURL = void 0;
+function getURL(baseURL, path, orgId) {
+    if (routeToGateway(baseURL)) {
+        if (!orgId) {
+            throw new Error('Org is required for this operation');
+        }
+        return `${baseURL}/hidden/orgs/${orgId}/code${path}`;
+    }
+    return `${baseURL}${path}`;
+}
+exports.getURL = getURL;
+function routeToGateway(baseURL) {
+    return baseURL.includes('snykgov.io');
+}
+//# sourceMappingURL=httpUtils.js.map
+
+/***/ }),
+
 /***/ 49503:
 /***/ ((module, __unused_webpack_exports, __webpack_require__) => {