snyk 1.1061.0 → 1.1063.0

package/dist/cli/263.index.js

@@ -5797,7 +5797,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', 'requestId', 'base64Encoding', 'org']),
+            ...(0, lodash_pick_1.default)(options, ['baseURL', 'sessionToken', 'source', 'removedFiles', 'requestId', 'org']),
             files: chunkedFiles.reduce((d, f) => {
                 // deepcode ignore PrototypePollution: FP this is an internal code
                 d[f.bundlePath] = f.hash;
@@ -5832,15 +5832,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',
-        'requestId',
-        'base64Encoding',
-        'org',
-    ]);
+    const apiParams = (0, lodash_pick_1.default)(options, ['baseURL', 'sessionToken', 'source', 'bundleHash', 'requestId', 'org']);
     const uploadFileChunks = async (bucketFiles) => {
         // Note: we specifically create __new__ isolated bundles here to faster files upload
         const resp = await (0, http_1.createBundle)({
@@ -5869,7 +5861,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', 'requestId', 'base64Encoding', 'org']);
+    const connectionOptions = (0, lodash_pick_1.default)(options, ['baseURL', 'sessionToken', 'source', 'requestId', 'org']);
     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({
@@ -5889,15 +5881,7 @@ async function fullfillRemoteBundle(options) {
 }
 async function remoteBundleFactory(options) {
     let remoteBundle = null;
-    const baseOptions = (0, lodash_pick_1.default)(options, [
-        'baseURL',
-        'sessionToken',
-        'source',
-        'baseDir',
-        'requestId',
-        'base64Encoding',
-        'org',
-    ]);
+    const baseOptions = (0, lodash_pick_1.default)(options, ['baseURL', 'sessionToken', 'source', 'baseDir', 'requestId', 'org']);
     const bundleFactory = prepareRemoteBundle((0, lodash_omit_1.default)(options, ['baseDir']));
     for await (const response of bundleFactory) {
         if (response.type === 'error') {
@@ -5969,7 +5953,7 @@ async function createBundleFromFolders(options) {
         emitter_1.emitter.scanFilesProgress(totalFiles);
     }
     const bundleOptions = {
-        ...(0, lodash_pick_1.default)(options, ['baseURL', 'sessionToken', 'source', 'requestId', 'base64Encoding']),
+        ...(0, lodash_pick_1.default)(options, ['baseURL', 'sessionToken', 'source', 'requestId']),
         baseDir,
         files: bundleFiles,
         ...(((_b = (_a = options.analysisContext) === null || _a === void 0 ? void 0 : _a.org) === null || _b === void 0 ? void 0 : _b.name) ? { org: options.analysisContext.org.name } : {}),
@@ -6627,14 +6611,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.getVerifyCallbackUrl = exports.getAnalysis = exports.AnalysisStatus = exports.extendBundle = exports.checkBundle = exports.createBundle = exports.getFilters = exports.checkSession = exports.getIpFamily = exports.startSession = exports.compressAndEncode = exports.setBase64Encoding = void 0;
+exports.getVerifyCallbackUrl = exports.getAnalysis = exports.AnalysisStatus = exports.extendBundle = exports.checkBundle = exports.createBundle = exports.getFilters = exports.checkSession = exports.getIpFamily = exports.startSession = exports.compressAndEncode = void 0;
 const uuid_1 = __webpack_require__(42277);
 const lodash_pick_1 = __importDefault(__webpack_require__(25030));
 const zlib_1 = __webpack_require__(78761);
 const util_1 = __webpack_require__(31669);
 const constants_1 = __webpack_require__(65765);
 const needle_1 = __webpack_require__(14577);
-const url_1 = __webpack_require__(78835);
 // The trick to typecast union type alias
 function isSubsetErrorCode(code, messages) {
     if (code in messages) {
@@ -6665,22 +6648,6 @@ const GENERIC_ERROR_MESSAGES = {
     [constants_1.ErrorCodes.dnsNotFound]: constants_1.DEFAULT_ERROR_MESSAGES[constants_1.ErrorCodes.dnsNotFound],
     [constants_1.ErrorCodes.connectionRefused]: constants_1.DEFAULT_ERROR_MESSAGES[constants_1.ErrorCodes.connectionRefused],
 };
-function setBase64Encoding(options) {
-    if (!options.base64Encoding) {
-        const { hostname } = new url_1.URL(options.baseURL);
-        const rg = new RegExp('^(|dev.)snyk.io');
-        if (rg.test(hostname.slice(hostname.indexOf('.') + 1))) {
-            return options.base64Encoding;
-        }
-        else {
-            return true;
-        }
-    }
-    else {
-        return options.base64Encoding;
-    }
-}
-exports.setBase64Encoding = setBase64Encoding;
 async function compressAndEncode(payload) {
     // encode payload and compress;
     const deflate = (0, util_1.promisify)(zlib_1.gzip);
@@ -6770,26 +6737,19 @@ const CREATE_BUNDLE_ERROR_MESSAGES = {
     [constants_1.ErrorCodes.notFound]: 'Unable to resolve requested oid',
 };
 async function createBundle(options) {
-    const base64Encoding = setBase64Encoding(options);
-    let payloadBody;
-    if (base64Encoding) {
-        payloadBody = await compressAndEncode(options.files);
-    }
-    else {
-        payloadBody = options.files;
-    }
+    const payloadBody = await compressAndEncode(options.files);
     const payload = {
         headers: {
             ...prepareTokenHeaders(options.sessionToken),
             source: options.source,
             ...(options.requestId && { 'snyk-request-id': options.requestId }),
-            ...(base64Encoding ? { 'content-type': 'application/octet-stream', 'content-encoding': 'gzip' } : null),
+            ...{ 'content-type': 'application/octet-stream', 'content-encoding': 'gzip' },
             ...(options.org && { 'snyk-org-name': options.org }),
         },
         url: `${options.baseURL}/bundle`,
         method: 'post',
         body: payloadBody,
-        isJson: base64Encoding ? false : true,
+        isJson: false,
     };
     const res = await (0, needle_1.makeRequest)(payload);
     if (res.success) {
@@ -6829,26 +6789,19 @@ const EXTEND_BUNDLE_ERROR_MESSAGES = {
     [constants_1.ErrorCodes.notFound]: 'Parent bundle has expired',
 };
 async function extendBundle(options) {
-    const base64Encoding = setBase64Encoding(options);
-    let payloadBody;
-    if (base64Encoding) {
-        payloadBody = await compressAndEncode((0, lodash_pick_1.default)(options, ['files', 'removedFiles']));
-    }
-    else {
-        payloadBody = (0, lodash_pick_1.default)(options, ['files', 'removedFiles']);
-    }
+    const payloadBody = await compressAndEncode((0, lodash_pick_1.default)(options, ['files', 'removedFiles']));
     const res = await (0, needle_1.makeRequest)({
         headers: {
             ...prepareTokenHeaders(options.sessionToken),
             source: options.source,
             ...(options.requestId && { 'snyk-request-id': options.requestId }),
-            ...(base64Encoding ? { 'content-type': 'application/octet-stream', 'content-encoding': 'gzip' } : null),
+            ...{ 'content-type': 'application/octet-stream', 'content-encoding': 'gzip' },
             ...(options.org && { 'snyk-org-name': options.org }),
         },
         url: `${options.baseURL}/bundle/${options.bundleHash}`,
         method: 'put',
         body: payloadBody,
-        isJson: base64Encoding ? false : true,
+        isJson: false,
     });
     if (res.success)
         return { type: 'success', value: res.body };