snyk 1.1038.0 → 1.1040.0

package/dist/cli/917.index.js

@@ -2275,6 +2275,7 @@ const keys = [
     'var-file',
     'detectionDepth',
     'cloud-context',
+    'snyk-cloud-environment',
     // PolicyOptions
     'ignore-policy',
     'policy-path',
@@ -2379,6 +2380,7 @@ async function prepareTestConfig(paths, options) {
     const scan = (_a = options.scan) !== null && _a !== void 0 ? _a : 'resource-changes';
     const varFile = options['var-file'];
     const cloudContext = index_1.getFlag(options, 'cloud-context');
+    const snykCloudEnvironment = index_1.getFlag(options, 'snyk-cloud-environment');
     const insecure = options.insecure;
     return {
         paths,
@@ -2395,6 +2397,7 @@ async function prepareTestConfig(paths, options) {
         varFile,
         depthDetection,
         cloudContext,
+        snykCloudEnvironment,
         insecure,
         org,
     };
@@ -3093,6 +3096,7 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.formatSnykIacTestTestData = exports.formatTestData = void 0;
 const constants_1 = __webpack_require__(68620);
 const legacy_1 = __webpack_require__(34013);
+const utils_1 = __webpack_require__(9176);
 function formatTestData({ oldFormattedResults, iacOutputMeta: iacTestMeta, ignoresCount, }) {
     const resultsBySeverity = formatScanResultsNewOutput(oldFormattedResults);
     return {
@@ -3158,9 +3162,7 @@ function formatSnykIacTestTestData(snykIacTestScanResult, projectName, orgName)
     let contextSuppressedIssueCount;
     const suppressedResults = (_a = snykIacTestScanResult === null || snykIacTestScanResult === void 0 ? void 0 : snykIacTestScanResult.scanAnalytics) === null || _a === void 0 ? void 0 : _a.suppressedResults;
     if (suppressedResults) {
-        contextSuppressedIssueCount = Object.values(suppressedResults).reduce(function (count, resourcesForRuleId) {
-            return (count += resourcesForRuleId.length);
-        }, 0);
+        contextSuppressedIssueCount = utils_1.countSuppressedIssues(suppressedResults);
     }
     return {
         resultsBySeverity,
@@ -3552,7 +3554,7 @@ exports.shouldLogUserMessages = shouldLogUserMessages;
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.maxLineWidth = exports.contentPadding = exports.colors = void 0;
+exports.countSuppressedIssues = exports.maxLineWidth = exports.contentPadding = exports.colors = void 0;
 const chalk_1 = __webpack_require__(32589);
 exports.colors = {
     severities: {
@@ -3571,6 +3573,11 @@ exports.contentPadding = ' '.repeat(2);
 exports.maxLineWidth = process.stdout.columns
     ? Math.min(process.stdout.columns, 80)
     : 80;
+exports.countSuppressedIssues = (suppressedIssues) => {
+    return Object.values(suppressedIssues).reduce(function (count, resourcesForRuleId) {
+        return (count += resourcesForRuleId.length);
+    }, 0);
+};
 
 
 /***/ }),
@@ -4326,6 +4333,39 @@ function getWorkingDirectoryForPath(p) {
 exports.getWorkingDirectoryForPath = getWorkingDirectoryForPath;
 
 
+/***/ }),
+
+/***/ 64321:
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.getIacCloudContext = void 0;
+const utils_1 = __webpack_require__(9176);
+function getIacCloudContext(testConfig, testOutput) {
+    var _a, _b;
+    let iacCloudContext;
+    if (testConfig.cloudContext) {
+        iacCloudContext = 'cloud-context';
+    }
+    else if (testConfig.snykCloudEnvironment) {
+        iacCloudContext = 'snyk-cloud-environment';
+    }
+    let iacCloudContextSuppressedIssuesCount = 0;
+    const suppressedIssues = (_b = (_a = testOutput.results) === null || _a === void 0 ? void 0 : _a.scanAnalytics) === null || _b === void 0 ? void 0 : _b.suppressedResults;
+    if (suppressedIssues) {
+        iacCloudContextSuppressedIssuesCount = utils_1.countSuppressedIssues(suppressedIssues);
+    }
+    return {
+        iacCloudContext,
+        iacCloudContextCloudProvider: testConfig.cloudContext,
+        iacCloudContextSuppressedIssuesCount,
+    };
+}
+exports.getIacCloudContext = getIacCloudContext;
+
+
 /***/ }),
 
 /***/ 55098:
@@ -4411,8 +4451,9 @@ exports.addIacAnalytics = void 0;
 const constants_1 = __webpack_require__(64895);
 const analytics = __webpack_require__(82744);
 const iac_type_1 = __webpack_require__(55098);
-function addIacAnalytics(testOutput) {
-    const iacAnalytics = computeIacAnalytics(testOutput);
+const iac_cloud_context_1 = __webpack_require__(64321);
+function addIacAnalytics(testConfig, testOutput) {
+    const iacAnalytics = computeIacAnalytics(testConfig, testOutput);
     analytics.add('iac-type', iacAnalytics.iacType);
     analytics.add('packageManager', iacAnalytics.packageManager);
     analytics.add('iac-issues-count', iacAnalytics.iacIssuesCount);
@@ -4421,11 +4462,18 @@ function addIacAnalytics(testOutput) {
     analytics.add('iac-resources-count', iacAnalytics.iacResourcesCount);
     analytics.add('iac-error-codes', iacAnalytics.iacErrorCodes);
     analytics.add('iac-test-binary-version', iacAnalytics.iacTestBinaryVersion);
+    // cloud context analytics
+    if (iacAnalytics.iacCloudContext) {
+        analytics.add('iac-cloud-context', iacAnalytics.iacCloudContext);
+        analytics.add('iac-cloud-context-cloud-provider', iacAnalytics.iacCloudContextCloudProvider);
+        analytics.add('iac-cloud-context-suppressed-issues-count', iacAnalytics.iacCloudContextSuppressedIssuesCount);
+    }
 }
 exports.addIacAnalytics = addIacAnalytics;
-function computeIacAnalytics(testOutput) {
+function computeIacAnalytics(testConfig, testOutput) {
     var _a, _b, _c, _d, _e, _f;
     const iacType = iac_type_1.getIacType(testOutput);
+    const iacCloudContext = iac_cloud_context_1.getIacCloudContext(testConfig, testOutput);
     return {
         iacType,
         packageManager: Object.keys(iacType),
@@ -4435,6 +4483,8 @@ function computeIacAnalytics(testOutput) {
         iacResourcesCount: ((_e = (_d = testOutput.results) === null || _d === void 0 ? void 0 : _d.resources) === null || _e === void 0 ? void 0 : _e.length) || 0,
         iacErrorCodes: [...new Set((_f = testOutput.errors) === null || _f === void 0 ? void 0 : _f.map((error) => error.code))] || [],
         iacTestBinaryVersion: constants_1.policyEngineReleaseVersion,
+        // iacRulesBundleVersion = ''; // TODO: Add when we have the rules bundle version
+        ...iacCloudContext,
     };
 }
 
@@ -4523,8 +4573,8 @@ const local_cache_1 = __webpack_require__(68081);
 const analytics_1 = __webpack_require__(26507);
 async function test(testConfig) {
     const { policyEnginePath, rulesBundlePath } = await local_cache_1.initLocalCache(testConfig);
-    const testOutput = scan_1.scan(testConfig, policyEnginePath, rulesBundlePath);
-    analytics_1.addIacAnalytics(testOutput);
+    const testOutput = await scan_1.scan(testConfig, policyEnginePath, rulesBundlePath);
+    analytics_1.addIacAnalytics(testConfig, testOutput);
     return testOutput;
 }
 exports.test = test;
@@ -4772,12 +4822,12 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.getChecksum = exports.formatPolicyEngineFileName = exports.policyEngineVersion = void 0;
 const os = __webpack_require__(12087);
 const policyEngineChecksums = `
-057406a372f29f765b41b32f67414224595caf5ce4aa17619ee6e12e95cd6050  snyk-iac-test_0.34.1_Windows_arm64.exe
-1a37bb164198051ede0f45e3fcfabf3de4932c2ac4ef9f271514d921b287cb96  snyk-iac-test_0.34.1_Linux_x86_64
-316c911299558c66e38c38f5205fbac10cee2cffa3f34e20bb4785950964a957  snyk-iac-test_0.34.1_Darwin_arm64
-7e8ea9c57f4a846f39ffb3843db4c2dc9f164669a3ae8084c68b425039160264  snyk-iac-test_0.34.1_Windows_x86_64.exe
-dcd933804997898aa40744d6e42a97b6990243a55f1396dcc9a6d6e1db5b534c  snyk-iac-test_0.34.1_Linux_arm64
-f15d4093f0f0d2ae573a61add594ad7481c2f57474543203d3e3e419ba04cd3b  snyk-iac-test_0.34.1_Darwin_x86_64
+04fe9c50afad4ab91815281930f142d17e4047d0187564fffa81d2a04e292915  snyk-iac-test_0.35.1_Windows_x86_64.exe
+2876226d01d3b8c906bc1835d8f03ebb7b809b8a3bbce3e743d3301df86664b5  snyk-iac-test_0.35.1_Linux_x86_64
+36dbb048fc79669a7ae4924079a44248eeed83a5e785fa3877bb275d28f7be42  snyk-iac-test_0.35.1_Darwin_arm64
+4d08c4fe6027685681171903669372323f6018083bcc67ce804fd4a939ed4859  snyk-iac-test_0.35.1_Windows_arm64.exe
+4da012c52785749e24695d8b7f70782697afb06cc0125b6e3d062ba19d65b479  snyk-iac-test_0.35.1_Linux_arm64
+d6e017549e2806df32ecd61052d5f7489cca213a437af68d7e982b6200f8f81a  snyk-iac-test_0.35.1_Darwin_x86_64
 `;
 exports.policyEngineVersion = getPolicyEngineVersion();
 function formatPolicyEngineFileName(releaseVersion) {
@@ -5459,28 +5509,29 @@ const analytics_1 = __webpack_require__(82744);
 const env_paths_1 = __webpack_require__(21766);
 const debug = newDebug('snyk-iac');
 exports.systemCachePath = (_a = config_1.default.CACHE_PATH) !== null && _a !== void 0 ? _a : env_paths_1.default('snyk').cache;
-function scan(options, policyEnginePath, rulesBundlePath) {
-    const { tempOutput: outputPath, tempDir: tempDirPath, tempPolicy: tempPolicyPath, } = createTemporaryFiles(options);
+async function scan(options, policyEnginePath, rulesBundlePath) {
+    const { tempOutput: outputPath, tempDir: tempDirPath, tempPolicy: tempPolicyPath, } = await createTemporaryFiles(options);
     try {
-        return scanWithConfig(options, policyEnginePath, rulesBundlePath, outputPath, tempPolicyPath);
+        return await scanWithConfig(options, policyEnginePath, rulesBundlePath, outputPath, tempPolicyPath);
     }
     finally {
-        deleteTemporaryFiles(tempDirPath);
+        await deleteTemporaryFiles(tempDirPath);
     }
 }
 exports.scan = scan;
-function scanWithConfig(options, policyEnginePath, rulesBundlePath, outputPath, policyPath) {
+async function scanWithConfig(options, policyEnginePath, rulesBundlePath, outputPath, policyPath) {
     const env = { ...process.env };
-    env['SNYK_API_URL'] = getApiUrl();
-    env['SNYK_API_TOKEN'] = getApiToken();
+    env['SNYK_IAC_TEST_API_REST_URL'] =
+        process.env['SNYK_IAC_TEST_API_REST_URL'] || getApiUrl();
+    env['SNYK_IAC_TEST_API_REST_TOKEN'] =
+        process.env['SNYK_IAC_TEST_API_REST_TOKEN'] || getApiToken();
+    env['SNYK_IAC_TEST_API_V1_URL'] =
+        process.env['SNYK_IAC_TEST_API_V1_URL'] || getApiUrl();
+    env['SNYK_IAC_TEST_API_V1_TOKEN'] =
+        process.env['SNYK_IAC_TEST_API_V1_TOKEN'] || getApiToken();
     const args = processFlags(options, rulesBundlePath, outputPath, policyPath);
     args.push(...options.paths);
-    const child = childProcess.spawnSync(policyEnginePath, args, {
-        encoding: 'utf-8',
-        stdio: 'pipe',
-        env: env,
-        maxBuffer: 1024 * 1024 * 10,
-    });
+    const child = await spawn(policyEnginePath, args, env);
     debug('policy engine standard error:\n%s', '\n' + child.stderr);
     if (child.status && child.status !== 0) {
         throw new ScanError(`invalid exit status: ${child.status}`);
@@ -5488,15 +5539,13 @@ function scanWithConfig(options, policyEnginePath, rulesBundlePath, outputPath,
     if (child.error) {
         throw new ScanError(`spawning process: ${child.error}`);
     }
-    let snykIacTestOutput, parsedSnykIacTestOutput;
     try {
-        snykIacTestOutput = fs.readFileSync(outputPath, 'utf-8');
-        parsedSnykIacTestOutput = JSON.parse(snykIacTestOutput);
+        const output = await readFile(outputPath);
+        return results_1.mapSnykIacTestOutputToTestOutput(JSON.parse(output));
     }
     catch (e) {
         throw new ScanError(`invalid output encoding: ${e}`);
     }
-    return results_1.mapSnykIacTestOutputToTestOutput(parsedSnykIacTestOutput);
 }
 function processFlags(options, rulesBundlePath, outputPath, policyPath) {
     const flags = [
@@ -5535,6 +5584,9 @@ function processFlags(options, rulesBundlePath, outputPath, policyPath) {
     if (options.cloudContext) {
         flags.push('-cloud-context', options.cloudContext);
     }
+    if (options.snykCloudEnvironment) {
+        flags.push('-snyk-cloud-environment', options.snykCloudEnvironment);
+    }
     if (options.insecure) {
         flags.push('-http-tls-skip-verify');
     }
@@ -5543,33 +5595,123 @@ function processFlags(options, rulesBundlePath, outputPath, policyPath) {
     }
     return flags;
 }
-function createTemporaryFiles(options) {
+async function createTemporaryFiles(options) {
     try {
-        const tempDir = fs.mkdtempSync(path.join(os.tmpdir(), 'snyk-'));
+        const tempDir = await mkdtemp(path.join(os.tmpdir(), 'snyk-'));
         const tempOutput = path.join(tempDir, 'output.json');
         const tempPolicy = path.join(tempDir, '.snyk');
-        fs.writeFileSync(tempOutput, '');
-        fs.writeFileSync(tempPolicy, options.policy || '');
+        await writeFile(tempPolicy, options.policy || '');
         return { tempOutput, tempDir, tempPolicy };
     }
     catch (e) {
         throw new ScanError(`unable to create config/output file: ${e}`);
     }
 }
-function deleteTemporaryFiles(tempDirPath) {
+async function deleteTemporaryFiles(tempDirPath) {
     try {
-        rimraf.sync(tempDirPath);
+        await remove(tempDirPath);
     }
     catch (e) {
         debug('unable to delete temporary directory', e);
     }
 }
+async function mkdtemp(path) {
+    return new Promise((resolve, reject) => {
+        fs.mkdtemp(path, (err, folder) => {
+            if (err) {
+                reject(err);
+            }
+            else {
+                resolve(folder);
+            }
+        });
+    });
+}
+async function writeFile(path, content) {
+    return new Promise((resolve, reject) => {
+        fs.writeFile(path, content, (err) => {
+            if (err) {
+                reject(err);
+            }
+            else {
+                resolve();
+            }
+        });
+    });
+}
+async function readFile(path) {
+    return new Promise((resolve, reject) => {
+        fs.readFile(path, 'utf-8', (err, content) => {
+            if (err) {
+                reject(err);
+            }
+            else {
+                resolve(content);
+            }
+        });
+    });
+}
+async function remove(path) {
+    return new Promise((resolve, reject) => {
+        rimraf(path, (err) => {
+            if (err) {
+                reject(err);
+            }
+            else {
+                resolve();
+            }
+        });
+    });
+}
 function getApiUrl() {
     return config_1.default.API_REST_URL;
 }
 function getApiToken() {
     return api_token_1.api() || '';
 }
+async function spawn(path, args, env) {
+    return new Promise((resolve) => {
+        const child = childProcess.spawn(path, args, {
+            stdio: 'pipe',
+            env: env,
+        });
+        const stdout = [];
+        child.stdout.on('data', (data) => {
+            stdout.push(Buffer.from(data));
+        });
+        const stderr = [];
+        child.stderr.on('data', (data) => {
+            stderr.push(Buffer.from(data));
+        });
+        // If 'error' is emitted, 'exit' might or might not be emitted, too. The
+        // 'returned' flag prevents the promise from being resolved twice if an
+        // error occurs.
+        let returned = false;
+        child.on('exit', (status) => {
+            if (returned) {
+                return;
+            }
+            returned = true;
+            resolve({
+                stdout: Buffer.concat(stdout),
+                stderr: Buffer.concat(stderr),
+                status,
+            });
+        });
+        child.on('error', (error) => {
+            if (returned) {
+                return;
+            }
+            returned = true;
+            resolve({
+                stdout: Buffer.concat(stdout),
+                stderr: Buffer.concat(stderr),
+                status: null,
+                error,
+            });
+        });
+    });
+}
 class ScanError extends errors_1.CustomError {
     constructor(message) {
         super(message);