snyk 1.1069.0 → 1.1071.0

package/dist/cli/917.index.js

@@ -2475,13 +2475,27 @@ async function test(...args) {
     // TODO remove 'app-vulns' options and warning message once
     // https://github.com/snyk/cli/pull/3433 is merged
     if (options.docker) {
-        if (!options['app-vulns'] || options['exclude-app-vulns']) {
+        // order is important here, we want:
+        // 1) exclude-app-vulns set -> no app vulns
+        // 2) app-vulns set -> app-vulns
+        // 3) neither set -> containerAppVulnsEnabled
+        if (options['exclude-app-vulns']) {
             options['exclude-app-vulns'] = true;
         }
-        // we can't print the warning message with JSON output as that would make
-        // the JSON output invalid.
-        if (!options['app-vulns'] && !options['json']) {
-            console.log(theme.color.status.warn(appVulnsReleaseWarningMsg));
+        else if (options['app-vulns']) {
+            options['exclude-app-vulns'] = false;
+        }
+        else {
+            options['exclude-app-vulns'] = !(await feature_flags_1.hasFeatureFlag('containerCliAppVulnsEnabled', options));
+            // we can't print the warning message with JSON output as that would make
+            // the JSON output invalid.
+            // We also only want to print the message if the user did not overwrite
+            // the default with one of the flags.
+            if (options['exclude-app-vulns'] &&
+                !options['json'] &&
+                !options['sarif']) {
+                console.log(theme.color.status.warn(appVulnsReleaseWarningMsg));
+            }
         }
     }
     const ecosystem = ecosystems_1.getEcosystemForTest(options);