From cf17af6ac8ae38ee35529b74441c50d90f2367f2 Mon Sep 17 00:00:00 2001
From: Liliana Kastilio <lili@snyk.io>
Date: Tue, 24 Dec 2019 17:19:43 +0000
Subject: [PATCH] feat: drop pinning flag

---
 .../test/formatters/legacy-format-issue.ts    |  8 +---
 src/cli/commands/test/index.ts                |  6 +--
 src/lib/types.ts                              |  1 -
 .../cli-test/cli-test.python.spec.ts          | 47 ++-----------------
 4 files changed, 7 insertions(+), 55 deletions(-)

diff --git a/src/cli/commands/test/formatters/legacy-format-issue.ts b/src/cli/commands/test/formatters/legacy-format-issue.ts
index dbe19b05c3..e8f8ee402e 100644
--- a/src/cli/commands/test/formatters/legacy-format-issue.ts
+++ b/src/cli/commands/test/formatters/legacy-format-issue.ts
@@ -46,11 +46,7 @@ export function formatIssues(
     extraInfo: vuln.note ? chalk.bold('\n  Note: ' + vuln.note) : '',
     remediationInfo:
       vuln.metadata.type !== 'license' && localPackageTest
-        ? createRemediationText(
-            vuln,
-            packageManager,
-            !!options.pinningSupported,
-          )
+        ? createRemediationText(vuln, packageManager)
         : '',
     fixedIn: options.docker ? createFixedInText(vuln) : '',
     dockerfilePackage: options.docker ? dockerfileInstructionText(vuln) : '',
@@ -174,7 +170,6 @@ function createFixedInText(vuln: GroupedVuln): string {
 function createRemediationText(
   vuln: GroupedVuln,
   packageManager: SupportedPackageManagers,
-  pinningSupported: boolean,
 ): string {
   let wizardHintText = '';
   if (WIZARD_SUPPORTED_PACKAGE_MANAGERS.includes(packageManager)) {
@@ -182,7 +177,6 @@ function createRemediationText(
   }
 
   if (
-    pinningSupported &&
     vuln.fixedIn &&
     PINNING_SUPPORTED_PACKAGE_MANAGERS.includes(packageManager)
   ) {
diff --git a/src/cli/commands/test/index.ts b/src/cli/commands/test/index.ts
index 088ee263b6..d3d43cd12a 100644
--- a/src/cli/commands/test/index.ts
+++ b/src/cli/commands/test/index.ts
@@ -183,14 +183,10 @@ async function test(...args: MethodArgs): Promise<string> {
     throw err;
   }
 
-  const pipResults: LegacyVulnApiResult = results.find(
+  const pinningSupported: LegacyVulnApiResult = results.find(
     (res) => res.packageManager === 'pip',
   );
 
-  const pinningSupported =
-    pipResults &&
-    (await isFeatureFlagSupportedForOrg('pythonPinningAdvice', config.org)).ok;
-
   let response = results
     .map((unused, i) => {
       resultOptions[i].pinningSupported = pinningSupported;
diff --git a/src/lib/types.ts b/src/lib/types.ts
index 1ec57d1dae..0e8e964b5f 100644
--- a/src/lib/types.ts
+++ b/src/lib/types.ts
@@ -29,7 +29,6 @@ export interface TestOptions {
   interactive: boolean;
   'prune-repeated-subdependencies'?: boolean;
   showVulnPaths: ShowVulnPaths;
-  pinningSupported?: boolean;
   failOn?: FailOn;
 }
 export interface ProtectOptions {
diff --git a/test/acceptance/cli-test/cli-test.python.spec.ts b/test/acceptance/cli-test/cli-test.python.spec.ts
index 6d1ea69271..7d8dfe1fe0 100644
--- a/test/acceptance/cli-test/cli-test.python.spec.ts
+++ b/test/acceptance/cli-test/cli-test.python.spec.ts
@@ -28,14 +28,7 @@ export const PythonTests: AcceptanceTests = {
       await params.cli.test('pip-app', {
         file: 'requirements.txt',
       });
-      let req = params.server.popRequest();
-      t.equal(req.method, 'GET', 'makes GET request');
-      t.match(
-        req.url,
-        'cli-config/feature-flags/pythonPinningAdvice',
-        'to correct url',
-      );
-      req = params.server.popRequest();
+      const req = params.server.popRequest();
       t.equal(req.method, 'POST', 'makes POST request');
       t.equal(
         req.headers['x-snyk-cli-version'],
@@ -86,14 +79,7 @@ export const PythonTests: AcceptanceTests = {
       await params.cli.test('pipenv-app', {
         file: 'Pipfile',
       });
-      let req = params.server.popRequest();
-      t.equal(req.method, 'GET', 'makes GET request');
-      t.match(
-        req.url,
-        'cli-config/feature-flags/pythonPinningAdvice',
-        'to correct url',
-      );
-      req = params.server.popRequest();
+      const req = params.server.popRequest();
       t.equal(req.method, 'POST', 'makes POST request');
       t.equal(
         req.headers['x-snyk-cli-version'],
@@ -152,14 +138,7 @@ export const PythonTests: AcceptanceTests = {
           fs.readFileSync('pip-app-transitive-vuln/cli-output.txt', 'utf8'),
         );
       }
-      let req = params.server.popRequest();
-      t.equal(req.method, 'GET', 'makes GET request');
-      t.match(
-        req.url,
-        'cli-config/feature-flags/pythonPinningAdvice',
-        'to correct url',
-      );
-      req = params.server.popRequest();
+      const req = params.server.popRequest();
       t.equal(req.method, 'POST', 'makes POST request');
       t.equal(
         req.headers['x-snyk-cli-version'],
@@ -220,14 +199,7 @@ export const PythonTests: AcceptanceTests = {
           ),
         );
       }
-      let req = params.server.popRequest();
-      t.equal(req.method, 'GET', 'makes GET request');
-      t.match(
-        req.url,
-        'cli-config/feature-flags/pythonPinningAdvice',
-        'to correct url',
-      );
-      req = params.server.popRequest();
+      const req = params.server.popRequest();
       t.equal(req.method, 'POST', 'makes POST request');
       t.equal(
         req.headers['x-snyk-cli-version'],
@@ -278,16 +250,7 @@ export const PythonTests: AcceptanceTests = {
         file: 'setup.py',
       });
 
-      let req = params.server.popRequest();
-
-      t.equal(req.method, 'GET', 'makes GET request');
-      t.match(
-        req.url,
-        'cli-config/feature-flags/pythonPinningAdvice',
-        'to correct url',
-      );
-
-      req = params.server.popRequest();
+      const req = params.server.popRequest();
       t.equal(req.method, 'POST', 'makes POST request');
       t.equal(
         req.headers['x-snyk-cli-version'],