Merge pull request #1615 from snyk/revert/fix-git-less-install

Revert "Merge pull request #1601 from snyk/feat/iac-experimental-local-exec"
snyk · Feb 4, 2021 · 1606fbd · 1606fbd
2 parents 2bdd4f6 + 79a326b
commit 1606fbd
Show file tree

Hide file tree

Showing 13 changed files with 3 additions and 370 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -359,7 +359,7 @@ jobs:
           command: |
             latest_version=$(cat lerna.json | jq .version -r)
             new_tag="v${latest_version}"
-            gh release create ${new_tag} --title "${new_tag}" -n "Release notes not implemented yet" --prerelease
+            gh release create ${new_tag} --title "${new_tag}" -n "Release Notes pending"
       - run:
           name: Add Assets to GitHub Release
           command: |

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -4,7 +4,6 @@ src/cli/commands/test/formatters/format-reachability.ts  @snyk/flow
 help/  @snyk/hammer
 *  @snyk/hammer @snyk/boost
 src/cli/commands/test/iac-output.ts @snyk/cloudconfig
-src/cli/commands/test/iac-local-execution/ @snyk/cloudconfig
 src/lib/cloud-config-projects.ts @snyk/cloudconfig
 src/lib/iac/ @snyk/cloudconfig
 src/lib/snyk-test/iac-test-result.ts @snyk/cloudconfig
@@ -13,7 +12,6 @@ src/lib/snyk-test/run-iac-test.ts @snyk/cloudconfig
 test/acceptance/cli-test/iac/ @snyk/cloudconfig
 test/fixtures/iac/ @snyk/cloudconfig
 test/smoke/spec/iac/ @snyk/cloudconfig
-test/smoke/.iac-data/ @snyk/cloudconfig
 src/lib/errors/invalid-iac-file.ts @snyk/cloudconfig
 src/lib/errors/unsupported-options-iac-error.ts @snyk/cloudconfig
 help/commands-docs/iac-examples.md @snyk/cloudconfig

diff --git a/.gitignore b/.gitignore
@@ -29,5 +29,3 @@ report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
 /test/acceptance/workspaces/**/target/
 test/acceptance/workspaces/**/.gradle
 test/**/.gradle
-.iac-data
-!test/smoke/.iac-data
diff --git a/package.json b/package.json
@@ -63,7 +63,6 @@
   "author": "snyk.io",
   "license": "Apache-2.0",
   "dependencies": {
-    "@open-policy-agent/opa-wasm": "git+https://github.com/open-policy-agent/npm-opa-wasm.git#f4a21fe6f4d70706f85106dc6ea867983747e040",
     "@snyk/cli-interface": "2.11.0",
     "@snyk/dep-graph": "1.21.0",
     "@snyk/gemfile": "1.2.0",

diff --git a/src/cli/commands/test/iac-local-execution/index.ts b/src/cli/commands/test/iac-local-execution/index.ts
diff --git a/src/cli/commands/test/iac-local-execution/policy-engine.ts b/src/cli/commands/test/iac-local-execution/policy-engine.ts
diff --git a/src/cli/commands/test/iac-local-execution/results-formatter.ts b/src/cli/commands/test/iac-local-execution/results-formatter.ts
diff --git a/src/cli/commands/test/iac-local-execution/types.ts b/src/cli/commands/test/iac-local-execution/types.ts
diff --git a/src/cli/commands/test/index.ts b/src/cli/commands/test/index.ts
@@ -51,8 +51,6 @@ import {
   getDisplayedOutput,
 } from './formatters/format-test-results';
 
-import * as iacLocalExecution from './iac-local-execution';
-
 const debug = Debug('snyk-test');
 const SEPARATOR = '\n-------------------------------------------------------\n';
 
@@ -135,13 +133,7 @@ async function test(...args: MethodArgs): Promise<TestCommandResult> {
     let res: (TestResult | TestResult[]) | Error;
 
     try {
-      if (options.iac && options.experimental) {
-        // this path is an experimental feature feature for IaC which does issue scanning locally without sending files to our Backend servers.
-        // once ready for GA, it is aimed to deprecate our remote-processing model, so IaC file scanning in the CLI is done locally.
-        res = await iacLocalExecution.test(path, options);
-      } else {
-        res = await snyk.test(path, testOpts);
-      }
+      res = await snyk.test(path, testOpts);
       if (testOpts.iacDirFiles) {
         options.iacDirFiles = testOpts.iacDirFiles;
       }

diff --git a/src/lib/snyk-test/common.ts b/src/lib/snyk-test/common.ts
@@ -20,7 +20,7 @@ export function assembleQueryString(options) {
   return Object.keys(qs).length !== 0 ? qs : null;
 }
 
-export enum SEVERITY {
+enum SEVERITY {
   LOW = 'low',
   MEDIUM = 'medium',
   HIGH = 'high',

diff --git a/test/smoke/.iac-data/data.json b/test/smoke/.iac-data/data.json
diff --git a/test/smoke/.iac-data/policy.wasm b/test/smoke/.iac-data/policy.wasm