chore: delete expired docker promo

snyk · May 29, 2019 · 3539980 · 3539980
1 parent aa4d81a
commit 3539980
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 230 deletions.
diff --git a/src/cli/commands/monitor.ts b/src/cli/commands/monitor.ts
@@ -14,7 +14,6 @@ import * as spinner from '../../lib/spinner';
 import * as detect from '../../lib/detect';
 import * as plugins from '../../lib/plugins';
 import {ModuleInfo} from '../../lib/module-info'; // TODO(kyegupov): fix import
-import * as docker from '../../lib/docker-promotion';
 import {SingleDepRootResult, MultiDepRootsResult, isMultiResult, MonitorError } from '../../lib/types';
 
 const SEPARATOR = '\n-------------------------------------------------------\n';
@@ -253,10 +252,6 @@ function formatMonitorOutput(
         'View plans here: ' + manageUrl + '\n\n') :
       '');
 
-  if (docker.shouldSuggestDocker(options)) {
-    strOutput += chalk.bold.white(docker.suggestionText);
-  }
-
   return options.json ?
     JSON.stringify(_.assign({}, res, {
       manageUrl,

diff --git a/src/cli/commands/test.ts b/src/cli/commands/test.ts
@@ -7,7 +7,6 @@ import * as config from '../../lib/config';
 import {isCI} from '../../lib/is-ci';
 import {exists as apiTokenExists} from '../../lib/api-token';
 import {SEVERITIES, WIZARD_SUPPORTED_PMS} from '../../lib/snyk-test/common';
-import * as docker from '../../lib/docker-promotion';
 import * as Debug from 'debug';
 import {TestOptions} from '../../lib/types';
 import {isLocalFolder} from '../../lib/detect';
@@ -238,11 +237,6 @@ function displayResult(res, options: TestOptions & OptionsAtDisplayStage) {
   }
   const testedInfoText = `Tested ${pathOrDepsText} for known ${issuesText}`;
 
-  let dockerSuggestion = '';
-  if (docker.shouldSuggestDocker(options)) {
-    dockerSuggestion += chalk.bold.white(docker.suggestionText);
-  }
-
   let multiProjAdvice = '';
 
   if (options.advertiseSubprojectsCount) {
@@ -267,8 +261,7 @@ function displayResult(res, options: TestOptions & OptionsAtDisplayStage) {
       prefix + meta + summaryOKText + multiProjAdvice + (
         isCI() ? '' :
           dockerAdvice +
-          nextStepsText +
-          dockerSuggestion)
+          nextStepsText)
     );
   }
 
@@ -300,21 +293,6 @@ function displayResult(res, options: TestOptions & OptionsAtDisplayStage) {
     summary += chalk.bold.green('\n\nRun `snyk wizard` to address these issues.');
   }
 
-  if (options.docker &&
-    (config.disableSuggestions !== 'true')) {
-    const optOutSuggestions =
-      '\n\nTo remove this message in the future, please run `snyk config set disableSuggestions=true`';
-    if (!options.file) {
-      dockerSuggestion += chalk.bold.white('\n\nPro tip: use `--file` option to get base image remediation advice.' +
-        `\nExample: $ snyk test --docker ${options.path} --file=path/to/Dockerfile`) + optOutSuggestions;
-    } else if (!options['exclude-base-image-vulns']) {
-      dockerSuggestion +=
-        chalk.bold.white(
-          '\n\nPro tip: use `--exclude-base-image-vulns` to exclude from display Docker base image vulnerabilities.') +
-          optOutSuggestions;
-    }
-  }
-
   const vulns = res.vulnerabilities || [];
   const groupedVulns = groupVulnerabilities(vulns);
   const sortedGroupedVulns = _.orderBy(
@@ -335,7 +313,7 @@ function displayResult(res, options: TestOptions & OptionsAtDisplayStage) {
     groupedVulnInfoOutput.join('\n\n') + '\n\n\n' +
     groupedDockerBinariesVulnInfoOutput.join('\n\n') + '\n\n' + meta + summary;
 
-  return prefix + body + multiProjAdvice + dockerAdvice + dockerSuggestion;
+  return prefix + body + multiProjAdvice + dockerAdvice;
 }
 
 function formatDockerBinariesIssues(

diff --git a/src/lib/docker-promotion.js b/src/lib/docker-promotion.js
diff --git a/test/acceptance/docker-promotion.test.js b/test/acceptance/docker-promotion.test.js