snyk 1.778.0 → 1.779.0

package/dist/cli/917.index.js

@@ -53,7 +53,7 @@ const types_1 = __webpack_require__(42258);
 const analytics = __webpack_require__(82744);
 const math_utils_1 = __webpack_require__(48537);
 const file_utils_1 = __webpack_require__(58486);
-function addIacAnalytics(formattedResults, ignoredIssuesCount, isLocalCustomRules) {
+function addIacAnalytics(formattedResults, ignoredIssuesCount) {
     let totalIssuesCount = 0;
     const customRulesIdsFoundInIssues = {};
     let issuesFromCustomRulesCount = 0;
@@ -84,9 +84,7 @@ function addIacAnalytics(formattedResults, ignoredIssuesCount, isLocalCustomRule
     analytics.add('iac-test-count', formattedResults.length);
     analytics.add('iac-custom-rules-issues-count', issuesFromCustomRulesCount);
     analytics.add('iac-custom-rules-issues-percentage', math_utils_1.calculatePercentage(issuesFromCustomRulesCount, totalIssuesCount));
-    if (!isLocalCustomRules) {
-        analytics.add('iac-custom-rules-checksum', file_utils_1.computeCustomRulesBundleChecksum());
-    }
+    analytics.add('iac-custom-rules-checksum', file_utils_1.computeCustomRulesBundleChecksum());
     analytics.add('iac-custom-rules-coverage-count', uniqueCustomRulesCount);
 }
 exports.addIacAnalytics = addIacAnalytics;
@@ -679,7 +677,6 @@ const analytics_1 = __webpack_require__(22716);
 const usage_tracking_1 = __webpack_require__(43156);
 const policy_1 = __webpack_require__(25476);
 const measurable_methods_1 = __webpack_require__(78272);
-const feature_flags_1 = __webpack_require__(63011);
 const assert_iac_options_flag_1 = __webpack_require__(68590);
 const user_config_1 = __webpack_require__(28137);
 const config_1 = __webpack_require__(22541);
@@ -687,26 +684,33 @@ const policy_2 = __webpack_require__(32615);
 const errors_1 = __webpack_require__(55191);
 const error_utils_1 = __webpack_require__(23872);
 const oci_pull_1 = __webpack_require__(5029);
-const unsupported_entitlement_error_1 = __webpack_require__(78673);
 const url_utils_1 = __webpack_require__(80256);
+const chalk_1 = __webpack_require__(32589);
 // 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) {
-    var _a;
+    var _a, _b, _c;
     try {
         let customRulesPath;
         const orgPublicId = (_a = options.org) !== null && _a !== void 0 ? _a : config_1.default.org;
         const iacOrgSettings = await measurable_methods_1.getIacOrgSettings(orgPublicId);
         if (options.rules) {
-            await assertRulesFlagAvailable(orgPublicId, iacOrgSettings);
+            if (!((_b = iacOrgSettings.entitlements) === null || _b === void 0 ? void 0 : _b.iacCustomRulesEntitlement)) {
+                throw new assert_iac_options_flag_1.UnsupportedEntitlementFlagError('rules', 'iacCustomRulesEntitlement');
+            }
             customRulesPath = options.rules;
         }
         const isOCIRegistryURLProvided = checkOCIRegistryURLProvided(iacOrgSettings);
+        if (isOCIRegistryURLProvided || customRulesPath) {
+            console.log(chalk_1.default.hex('#ff9b00')('Using custom rules to generate misconfigurations.'));
+        }
         if (isOCIRegistryURLProvided && customRulesPath) {
             throw new FailedToExecuteCustomRulesError();
         }
         if (isOCIRegistryURLProvided) {
-            await assertPullAvailable(orgPublicId, iacOrgSettings);
+            if (!((_c = iacOrgSettings.entitlements) === null || _c === void 0 ? void 0 : _c.iacCustomRulesEntitlement)) {
+                throw new oci_pull_1.UnsupportedEntitlementPullError('iacCustomRulesEntitlement');
+            }
             await pullIaCCustomRules(iacOrgSettings);
         }
         else {
@@ -736,7 +740,7 @@ async function test(pathToScan, options) {
             // If something has gone wrong, err on the side of allowing the user to
             // run their tests by squashing the error.
         }
-        analytics_1.addIacAnalytics(filteredIssues, ignoreCount, !!customRulesPath);
+        analytics_1.addIacAnalytics(filteredIssues, ignoreCount);
         // TODO: add support for proper typing of old TestResult interface.
         return {
             results: filteredIssues,
@@ -829,7 +833,7 @@ async function pullIaCCustomRules(iacOrgSettings) {
             throw new FailedToPullCustomBundleError('There was an authentication error. Incorrect credentials provided.');
         }
         else if (err.statusCode === 404) {
-            throw new FailedToPullCustomBundleError('The remote repository could not be found. Please check the provided URL.');
+            throw new FailedToPullCustomBundleError('The remote repository could not be found. Please check the provided registry URL.');
         }
         else if (err instanceof oci_pull_1.InvalidManifestSchemaVersionError) {
             throw new FailedToPullCustomBundleError(err.message);
@@ -846,62 +850,15 @@ async function pullIaCCustomRules(iacOrgSettings) {
     }
 }
 exports.pullIaCCustomRules = pullIaCCustomRules;
-/**
- * Asserts the custom-rules feature is available for the provided org.
- */
-async function assertCustomRulesAvailable(orgPublicId, iacOrgSettings) {
-    var _a;
-    const isCustomRulesEnabled = !!(await feature_flags_1.isFeatureFlagSupportedForOrg('iacCustomRules', orgPublicId)).ok;
-    if (!isCustomRulesEnabled) {
-        throw new errors_1.UnsupportedFeatureFlagError('iacCustomRules');
-    }
-    const isEntitledToCustomRules = !!((_a = iacOrgSettings.entitlements) === null || _a === void 0 ? void 0 : _a.iacCustomRulesEntitlement);
-    if (!isEntitledToCustomRules) {
-        throw new unsupported_entitlement_error_1.UnsupportedEntitlementError('iacCustomRulesEntitlement');
-    }
-}
-/**
- * Asserts the --rules flag is available for the provided org.
- */
-async function assertRulesFlagAvailable(orgPublicId, iacOrgSettings) {
-    try {
-        await assertCustomRulesAvailable(orgPublicId, iacOrgSettings);
-    }
-    catch (err) {
-        if (err instanceof unsupported_entitlement_error_1.UnsupportedEntitlementError) {
-            throw new assert_iac_options_flag_1.UnsupportedEntitlementFlagError('rules', err.entitlement);
-        }
-        else if (err instanceof errors_1.UnsupportedFeatureFlagError) {
-            throw new assert_iac_options_flag_1.FlagError('rules', err.featureFlag);
-        }
-        else {
-            throw err;
-        }
-    }
-}
-/**
- * Asserts the feature custom-rules bundles pulling feature is available for the provided org.
- */
-async function assertPullAvailable(orgPublicId, iacOrgSettings) {
-    try {
-        await assertCustomRulesAvailable(orgPublicId, iacOrgSettings);
-    }
-    catch (err) {
-        if (err instanceof unsupported_entitlement_error_1.UnsupportedEntitlementError) {
-            throw new oci_pull_1.UnsupportedEntitlementPullError(err.entitlement);
-        }
-        else if (err instanceof errors_1.UnsupportedFeatureFlagError) {
-            throw new oci_pull_1.UnsupportedFeatureFlagPullError(err.featureFlag);
-        }
-    }
-}
 class FailedToPullCustomBundleError extends errors_1.CustomError {
     constructor(message) {
         super(message || 'Could not pull custom bundle');
         this.code = types_1.IaCErrorCodes.FailedToPullCustomBundleError;
         this.strCode = error_utils_1.getErrorStringCode(this.code);
-        this.userMessage = `${message ? message + ' ' : ''}
-    We were unable to download the custom bundle to the disk. Please ensure access to the remote Registry and validate you have provided all the right parameters.`;
+        this.userMessage =
+            `${message ? message + ' ' : ''}` +
+                '\nWe were unable to download the custom bundle to the disk. Please ensure access to the remote Registry and validate you have provided all the right parameters.' +
+                '\nSee documentation on troubleshooting: https://docs.snyk.io/products/snyk-infrastructure-as-code/custom-rules/use-IaC-custom-rules-with-CLI/using-a-remote-custom-rules-bundle#troubleshooting';
     }
 }
 exports.FailedToPullCustomBundleError = FailedToPullCustomBundleError;
@@ -1188,7 +1145,7 @@ exports.pull = measurableOciPull;
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.UnsupportedEntitlementPullError = exports.UnsupportedFeatureFlagPullError = exports.InvalidRemoteRegistryURLError = exports.InvalidManifestSchemaVersionError = exports.FailedToBuildOCIArtifactError = exports.pull = exports.extractOCIRegistryURLComponents = exports.CUSTOM_RULES_TARBALL = void 0;
+exports.UnsupportedEntitlementPullError = exports.InvalidRemoteRegistryURLError = exports.InvalidManifestSchemaVersionError = exports.FailedToBuildOCIArtifactError = exports.pull = exports.extractOCIRegistryURLComponents = exports.CUSTOM_RULES_TARBALL = void 0;
 const registryClient = __webpack_require__(28310);
 const fs_1 = __webpack_require__(35747);
 const path = __webpack_require__(85622);
@@ -1286,15 +1243,6 @@ class InvalidRemoteRegistryURLError extends errors_1.CustomError {
     }
 }
 exports.InvalidRemoteRegistryURLError = InvalidRemoteRegistryURLError;
-class UnsupportedFeatureFlagPullError extends errors_1.CustomError {
-    constructor(featureFlag) {
-        super('OCI Pull not supported - Missing the ${featureFlag} feature flag');
-        this.code = types_1.IaCErrorCodes.UnsupportedFeatureFlagPullError;
-        this.strCode = error_utils_1.getErrorStringCode(this.code);
-        this.userMessage = `The custom rules feature is not supported for this org - The feature flag '${featureFlag}' is not currently enabled. It can be enabled via Snyk Preview, if you are on the Enterprise Plan.`;
-    }
-}
-exports.UnsupportedFeatureFlagPullError = UnsupportedFeatureFlagPullError;
 class UnsupportedEntitlementPullError extends errors_1.CustomError {
     constructor(entitlement) {
         super(`OCI Pull not supported - Missing the ${entitlement} entitlement`);
@@ -2360,28 +2308,6 @@ FailOnError.ERROR_MESSAGE = 'Invalid fail on argument, please use one of: ' +
     Object.keys(common_1.FAIL_ON).join(' | ');
 
 
-/***/ }),
-
-/***/ 78673:
-/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
-
-"use strict";
-
-Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.UnsupportedEntitlementError = void 0;
-const custom_error_1 = __webpack_require__(17188);
-class UnsupportedEntitlementError extends custom_error_1.CustomError {
-    constructor(entitlement, userMessage = `This feature is currently not enabled for your org. To enable it, please contact snyk support.`) {
-        super('Unsupported feature - Missing the ${entitlementName} entitlement');
-        this.entitlement = entitlement;
-        this.code = UnsupportedEntitlementError.ERROR_CODE;
-        this.userMessage = userMessage;
-    }
-}
-exports.UnsupportedEntitlementError = UnsupportedEntitlementError;
-UnsupportedEntitlementError.ERROR_CODE = 403;
-
-
 /***/ }),
 
 /***/ 9401: