snyk 1.866.0 → 1.869.0

package/dist/cli/367.index.js

@@ -30,9 +30,11 @@ exports.default = async (...args) => {
         throw new assert_iac_options_flag_1.UnsupportedEntitlementCommandError('gen-driftignore', 'iacDrift');
     }
     try {
-        const args = drift_1.parseGenDriftIgnoreFlags(options);
-        const ret = await drift_1.driftctl(args);
-        process.exit(ret);
+        const ret = await drift_1.runDriftCTL({
+            options: { kind: 'gen-driftignore', ...options },
+            stdio: 'inherit',
+        });
+        process.exit(ret.code);
     }
     catch (e) {
         const err = new Error('Error running `iac gen-driftignore` ' + e);

package/dist/cli/367.index.js.map

@@ -1 +1 @@
-{"version":3,"file":"367.index.js","mappings":";;;;;;;;;;AACA,0DAA4D;AAC5D,+CAA8D;AAC9D,2CAAyE;AACzE,yDAAiG;AACjG,6DAAwG;AACxG,4CAAsC;AAEtC,kBAAe,KAAK,EAAE,GAAG,IAAgB,EAAgB,EAAE;;IACzD,MAAM,EAAE,OAAO,EAAE,GAAG,yCAAkB,CAAC,GAAG,IAAI,CAAC,CAAC;IAEhD,oGAAoG;IACpG,4CAA4C;IAC5C,IAAI,OAAO,CAAC,GAAG,IAAI,IAAI,EAAE;QACvB,OAAO,WAAW,CAAC,iBAAiB,CAAC,CAAC;KACvC;IAED,iDAAiD;IACjD,8BAA8B;IAC9B,MAAM,WAAW,SAAG,OAAO,CAAC,GAAG,mCAAI,gBAAM,CAAC,GAAG,CAAC;IAC9C,MAAM,cAAc,GAAG,MAAM,wCAAiB,CAAC,WAAW,CAAC,CAAC;IAC5D,IAAI,QAAC,cAAc,CAAC,YAAY,0CAAE,QAAQ,GAAE;QAC1C,MAAM,IAAI,4DAAkC,CAAC,iBAAiB,EAAE,UAAU,CAAC,CAAC;KAC7E;IAED,IAAI;QACF,MAAM,IAAI,GAAG,gCAAwB,CAAC,OAAO,CAAC,CAAC;QAC/C,MAAM,GAAG,GAAG,MAAM,gBAAQ,CAAC,IAAI,CAAC,CAAC;QACjC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;KACnB;IAAC,OAAO,CAAC,EAAE;QACV,MAAM,GAAG,GAAG,IAAI,KAAK,CAAC,sCAAsC,GAAG,CAAC,CAAC,CAAC;QAClE,OAAO,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;KAC5B;AACH,CAAC,CAAC","sources":["webpack://snyk/./src/cli/commands/gen-driftignore.ts"],"sourcesContent":["import { MethodArgs } from '../args';\nimport { processCommandArgs } from './process-command-args';\nimport * as legacyError from '../../lib/errors/legacy-errors';\nimport { driftctl, parseGenDriftIgnoreFlags } from '../../lib/iac/drift';\nimport { getIacOrgSettings } from './test/iac-local-execution/org-settings/get-iac-org-settings';\nimport { UnsupportedEntitlementCommandError } from './test/iac-local-execution/assert-iac-options-flag';\nimport config from '../../lib/config';\n\nexport default async (...args: MethodArgs): Promise<any> => {\n  const { options } = processCommandArgs(...args);\n\n  // Ensure that this gen-driftignore command can only be runned when using `snyk iac gen-driftignore`\n  // Avoid `snyk gen-driftignore` direct usage\n  if (options.iac != true) {\n    return legacyError('gen-driftignore');\n  }\n\n  // Ensure that we are allowed to run that command\n  // by checking the entitlement\n  const orgPublicId = options.org ?? config.org;\n  const iacOrgSettings = await getIacOrgSettings(orgPublicId);\n  if (!iacOrgSettings.entitlements?.iacDrift) {\n    throw new UnsupportedEntitlementCommandError('gen-driftignore', 'iacDrift');\n  }\n\n  try {\n    const args = parseGenDriftIgnoreFlags(options);\n    const ret = await driftctl(args);\n    process.exit(ret);\n  } catch (e) {\n    const err = new Error('Error running `iac gen-driftignore` ' + e);\n    return Promise.reject(err);\n  }\n};\n"],"names":[],"sourceRoot":""}
+{"version":3,"file":"367.index.js","mappings":";;;;;;;;;;AACA,0DAA4D;AAC5D,+CAA8D;AAC9D,2CAAkD;AAClD,yDAAiG;AACjG,6DAAwG;AACxG,4CAAsC;AAEtC,kBAAe,KAAK,EAAE,GAAG,IAAgB,EAAgB,EAAE;;IACzD,MAAM,EAAE,OAAO,EAAE,GAAG,yCAAkB,CAAC,GAAG,IAAI,CAAC,CAAC;IAEhD,oGAAoG;IACpG,4CAA4C;IAC5C,IAAI,OAAO,CAAC,GAAG,IAAI,IAAI,EAAE;QACvB,OAAO,WAAW,CAAC,iBAAiB,CAAC,CAAC;KACvC;IAED,iDAAiD;IACjD,8BAA8B;IAC9B,MAAM,WAAW,SAAG,OAAO,CAAC,GAAG,mCAAI,gBAAM,CAAC,GAAG,CAAC;IAC9C,MAAM,cAAc,GAAG,MAAM,wCAAiB,CAAC,WAAW,CAAC,CAAC;IAC5D,IAAI,QAAC,cAAc,CAAC,YAAY,0CAAE,QAAQ,GAAE;QAC1C,MAAM,IAAI,4DAAkC,CAAC,iBAAiB,EAAE,UAAU,CAAC,CAAC;KAC7E;IAED,IAAI;QACF,MAAM,GAAG,GAAG,MAAM,mBAAW,CAAC;YAC5B,OAAO,EAAE,EAAE,IAAI,EAAE,iBAAiB,EAAE,GAAG,OAAO,EAAE;YAChD,KAAK,EAAE,SAAS;SACjB,CAAC,CAAC;QACH,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;KACxB;IAAC,OAAO,CAAC,EAAE;QACV,MAAM,GAAG,GAAG,IAAI,KAAK,CAAC,sCAAsC,GAAG,CAAC,CAAC,CAAC;QAClE,OAAO,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;KAC5B;AACH,CAAC,CAAC","sources":["webpack://snyk/./src/cli/commands/gen-driftignore.ts"],"sourcesContent":["import { MethodArgs } from '../args';\nimport { processCommandArgs } from './process-command-args';\nimport * as legacyError from '../../lib/errors/legacy-errors';\nimport { runDriftCTL } from '../../lib/iac/drift';\nimport { getIacOrgSettings } from './test/iac-local-execution/org-settings/get-iac-org-settings';\nimport { UnsupportedEntitlementCommandError } from './test/iac-local-execution/assert-iac-options-flag';\nimport config from '../../lib/config';\n\nexport default async (...args: MethodArgs): Promise<any> => {\n  const { options } = processCommandArgs(...args);\n\n  // Ensure that this gen-driftignore command can only be runned when using `snyk iac gen-driftignore`\n  // Avoid `snyk gen-driftignore` direct usage\n  if (options.iac != true) {\n    return legacyError('gen-driftignore');\n  }\n\n  // Ensure that we are allowed to run that command\n  // by checking the entitlement\n  const orgPublicId = options.org ?? config.org;\n  const iacOrgSettings = await getIacOrgSettings(orgPublicId);\n  if (!iacOrgSettings.entitlements?.iacDrift) {\n    throw new UnsupportedEntitlementCommandError('gen-driftignore', 'iacDrift');\n  }\n\n  try {\n    const ret = await runDriftCTL({\n      options: { kind: 'gen-driftignore', ...options },\n      stdio: 'inherit',\n    });\n    process.exit(ret.code);\n  } catch (e) {\n    const err = new Error('Error running `iac gen-driftignore` ' + e);\n    return Promise.reject(err);\n  }\n};\n"],"names":[],"sourceRoot":""}

package/dist/cli/917.index.js

@@ -873,8 +873,16 @@ async function loadAndParseTerraformFiles(pathToScan, parsedFiles, failedFiles,
     // this is because we need all files in the same directory to share the same variable context
     for (const currentDirectory of allDirectories) {
         const filePathsInDirectory = getFilesForDirectory(pathToScan, currentDirectory);
-        if (filePathsInDirectory.length === 0)
-            continue; // skip directories that have 0 files but have other directories
+        if (filePathsInDirectory.length === 0 || // skip directories that have 0 files but have other directories
+            (filePathsInDirectory.length === 1 && allParsedFiles.length === 1) // skip single files that have already been parsed
+        )
+            continue;
+        if (filePathsInDirectory.length === 1 &&
+            allParsedFiles.length === 0 &&
+            (!handle_terraform_files_utils_1.shouldBeParsed(filePathsInDirectory[0]) ||
+                handle_terraform_files_utils_1.isIgnoredFile(filePathsInDirectory[0]))) {
+            throw new file_loader_1.NoFilesToScanError();
+        }
         try {
             const tfFilesToParse = await file_loader_1.loadContentForFiles(filePathsInDirectory);
             const { parsedFiles: parsedTfFiles, failedFiles: failedTfFiles, } = file_parser_1.parseTerraformFiles(tfFilesToParse);
@@ -883,7 +891,8 @@ async function loadAndParseTerraformFiles(pathToScan, parsedFiles, failedFiles,
         }
         catch (err) {
             if (allParsedFiles.length !== 0 && err instanceof file_loader_1.NoFilesToScanError) {
-                // ignore this error since we might only have .tf files in the folder and we have separated them
+                // ignore this error since we might only have TF files in the folder and we have separated them,
+                // or if we have a single file scan of a non-TF file, and we have already parsed it
             }
             else {
                 throw err;
@@ -900,12 +909,9 @@ exports.loadAndParseTerraformFiles = loadAndParseTerraformFiles;
  * @returns {string[]} An array with all the non-empty nested directories in this path
  */
 function getAllDirectoriesForPath(pathToScan, maxDepth) {
-    // if it is a single file (it has an extension)
+    // if it is a single file (it has an extension), we return the current path
     if (handle_terraform_files_utils_1.isSingleFile(pathToScan)) {
-        if (!handle_terraform_files_utils_1.shouldBeParsed(pathToScan) || handle_terraform_files_utils_1.isIgnoredFile(pathToScan)) {
-            throw new file_loader_1.NoFilesToScanError();
-        }
-        return [path.resolve(pathToScan)]; // we return the current path if it is a single file
+        return [path.resolve(pathToScan)];
     }
     // if the path we scanned itself is an empty directory, finish the scan here
     if (fs.readdirSync(pathToScan).length === 0) {
@@ -984,7 +990,6 @@ const feature_flags_1 = __webpack_require__(63011);
 const rules_1 = __webpack_require__(98895);
 const file_loader_1 = __webpack_require__(13552);
 const share_results_1 = __webpack_require__(3558);
-const handle_terraform_files_1 = __webpack_require__(41806);
 // this method executes the local processing engine and then formats the results to adapt with the CLI output.
 // this flow is the default GA flow for IAC scanning.
 async function test(pathToScan, options) {
@@ -1023,7 +1028,7 @@ async function test(pathToScan, options) {
         // we may have loaded and parsed all but terraform files in the previous step
         // so now we check if we need to do a second load and parse which dereferences TF vars
         if (validFileTypes && !validFileTypes.includes(types_1.ValidFileType.Terraform)) {
-            const { allParsedFiles, allFailedFiles, } = await handle_terraform_files_1.loadAndParseTerraformFiles(pathToScan, parsedFiles, failedFiles, options.detectionDepth);
+            const { allParsedFiles, allFailedFiles, } = await measurable_methods_1.loadAndParseTerraformFiles(pathToScan, parsedFiles, failedFiles, options.detectionDepth);
             parsedFiles = allParsedFiles;
             failedFiles = allFailedFiles;
         }
@@ -1038,7 +1043,7 @@ async function test(pathToScan, options) {
         const resultsWithCustomSeverities = await measurable_methods_1.applyCustomSeverities(scannedFiles, iacOrgSettings.customPolicies);
         let projectPublicIds = {};
         if (options.report) {
-            projectPublicIds = await share_results_1.formatAndShareResults(resultsWithCustomSeverities, options, orgPublicId);
+            projectPublicIds = await share_results_1.formatAndShareResults(resultsWithCustomSeverities, options, orgPublicId, policy);
         }
         const formattedResults = measurable_methods_1.formatScanResults(resultsWithCustomSeverities, options, iacOrgSettings.meta, projectPublicIds);
         const { filteredIssues, ignoreCount } = policy_1.filterIgnoredIssues(policy, formattedResults);
@@ -1283,7 +1288,7 @@ exports.calculatePercentage = (relativeValue, totalValue) => +(totalValue ? (rel
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.pull = exports.localTest = exports.cleanLocalCache = exports.trackUsage = exports.formatScanResults = exports.applyCustomSeverities = exports.getIacOrgSettings = exports.scanFiles = exports.parseFiles = exports.loadFiles = exports.initLocalCache = exports.performanceAnalyticsDecorator = exports.asyncPerformanceAnalyticsDecorator = void 0;
+exports.loadAndParseTerraformFiles = exports.pull = exports.localTest = exports.cleanLocalCache = exports.trackUsage = exports.formatScanResults = exports.applyCustomSeverities = exports.getIacOrgSettings = exports.scanFiles = exports.parseFiles = exports.loadFiles = exports.initLocalCache = exports.performanceAnalyticsDecorator = exports.asyncPerformanceAnalyticsDecorator = void 0;
 const file_loader_1 = __webpack_require__(13552);
 const file_parser_1 = __webpack_require__(2314);
 const file_scanner_1 = __webpack_require__(16879);
@@ -1296,6 +1301,7 @@ const index_1 = __webpack_require__(55409);
 const oci_pull_1 = __webpack_require__(5029);
 const analytics_1 = __webpack_require__(22716);
 const types_1 = __webpack_require__(42258);
+const handle_terraform_files_1 = __webpack_require__(41806);
 // Note: The return type of the returned async function needs to be Promise<Val> for
 // the compiler to be happy, so we need to unwrap it with the messy
 // Awaiter<ReturnType<T>> rather than just using ReturnType<T> directly.
@@ -1341,6 +1347,8 @@ const measurableLocalTest = asyncPerformanceAnalyticsDecorator(index_1.test, typ
 exports.localTest = measurableLocalTest;
 const measurableOciPull = asyncPerformanceAnalyticsDecorator(oci_pull_1.pull, types_1.PerformanceAnalyticsKey.Total);
 exports.pull = measurableOciPull;
+const measurableLoadAndParseTerraformFiles = asyncPerformanceAnalyticsDecorator(handle_terraform_files_1.loadAndParseTerraformFiles, types_1.PerformanceAnalyticsKey.Total);
+exports.loadAndParseTerraformFiles = measurableLoadAndParseTerraformFiles;
 
 
 /***/ }),
@@ -2228,13 +2236,13 @@ const feature_flags_1 = __webpack_require__(63011);
 const cli_share_results_1 = __webpack_require__(24016);
 const assert_iac_options_flag_1 = __webpack_require__(68590);
 const share_results_formatter_1 = __webpack_require__(37324);
-async function formatAndShareResults(results, options, orgPublicId) {
+async function formatAndShareResults(results, options, orgPublicId, policy) {
     const isCliReportEnabled = await feature_flags_1.isFeatureFlagSupportedForOrg('iacCliShareResults', orgPublicId);
     if (!isCliReportEnabled.ok) {
         throw new assert_iac_options_flag_1.FeatureFlagError('report', 'iacCliShareResults');
     }
     const formattedResults = share_results_formatter_1.formatShareResults(results, options);
-    return await cli_share_results_1.shareResults(formattedResults);
+    return await cli_share_results_1.shareResults(formattedResults, policy);
 }
 exports.formatAndShareResults = formatAndShareResults;
 
@@ -3337,8 +3345,8 @@ const request_1 = __webpack_require__(52050);
 const api_token_1 = __webpack_require__(95181);
 const envelope_formatters_1 = __webpack_require__(88784);
 const authentication_failed_error_1 = __webpack_require__(23770);
-async function shareResults(results) {
-    const scanResults = results.map(envelope_formatters_1.convertIacResultToScanResult);
+async function shareResults(results, policy) {
+    const scanResults = results.map((result) => envelope_formatters_1.convertIacResultToScanResult(result, policy));
     const { res, body } = await request_1.makeRequest({
         method: 'POST',
         url: `${config_1.default.API}/iac-cli-share-results`,
@@ -3365,7 +3373,8 @@ exports.shareResults = shareResults;
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.convertIacResultToScanResult = void 0;
-function convertIacResultToScanResult(iacResult) {
+function convertIacResultToScanResult(iacResult, policy) {
+    var _a;
     return {
         identity: {
             type: iacResult.projectType,
@@ -3380,6 +3389,7 @@ function convertIacResultToScanResult(iacResult) {
         }),
         name: iacResult.projectName,
         target: { name: iacResult.projectName },
+        policy: (_a = policy === null || policy === void 0 ? void 0 : policy.toString()) !== null && _a !== void 0 ? _a : '',
     };
 }
 exports.convertIacResultToScanResult = convertIacResultToScanResult;