Merge pull request #1012 from snyk/fix/passing_gradle_meta_to_monitor

Fix/passing gradle meta to monitor
snyk · Feb 23, 2020 · 6ae0ec4 · 6ae0ec4
2 parents 22fa0ab + 742f568
commit 6ae0ec4
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 21 deletions.
diff --git a/package.json b/package.json
@@ -54,7 +54,7 @@
   "author": "snyk.io",
   "license": "Apache-2.0",
   "dependencies": {
-    "@snyk/cli-interface": "2.3.0",
+    "@snyk/cli-interface": "2.3.2",
     "@snyk/configstore": "^3.2.0-rc1",
     "@snyk/dep-graph": "1.13.1",
     "@snyk/gemfile": "1.2.0",

diff --git a/src/cli/commands/monitor/index.ts b/src/cli/commands/monitor/index.ts
@@ -10,7 +10,6 @@ import {
   MonitorOptions,
   MonitorMeta,
   MonitorResult,
-  PluginMetadata,
   Options,
 } from '../../../lib/types';
 import * as config from '../../../lib/config';
@@ -31,6 +30,7 @@ import { extractPackageManager } from '../../../lib/plugins/extract-package-mana
 import { MultiProjectResultCustom } from '../../../lib/plugins/get-multi-plugin-result';
 import { convertMultiResultToMultiCustom } from '../../../lib/plugins/convert-multi-plugin-res-to-multi-custom';
 import { convertSingleResultToMultiCustom } from '../../../lib/plugins/convert-single-splugin-res-to-multi-custom';
+import { PluginMetadata } from '@snyk/cli-interface/legacy/plugin';
 
 const SEPARATOR = '\n-------------------------------------------------------\n';
 const debug = Debug('snyk');

diff --git a/src/lib/monitor/index.ts b/src/lib/monitor/index.ts
@@ -1,6 +1,5 @@
 import * as Debug from 'debug';
 import * as depGraphLib from '@snyk/dep-graph';
-import * as cliInterface from '@snyk/cli-interface';
 import * as snyk from '..';
 import { apiTokenExists } from '../api-token';
 import request = require('../request');
@@ -9,9 +8,9 @@ import * as os from 'os';
 import * as _ from 'lodash';
 import { isCI } from '../is-ci';
 import * as analytics from '../analytics';
-import { DepTree, MonitorMeta, MonitorResult, PluginMetadata } from '../types';
+import { DepTree, MonitorMeta, MonitorResult } from '../types';
 import * as projectMetadata from '../project-metadata';
-import * as path from 'path';
+
 import {
   MonitorError,
   ConnectionTimeoutError,
@@ -25,6 +24,8 @@ import { filterOutMissingDeps } from './filter-out-missing-deps';
 import { dropEmptyDeps } from './drop-empty-deps';
 import { pruneTree } from './prune-dep-tree';
 import { pluckPolicies } from '../policy';
+import { PluginMetadata } from '@snyk/cli-interface/legacy/plugin';
+import { ScannedProject } from '@snyk/cli-interface/legacy/common';
 
 const debug = Debug('snyk');
 
@@ -61,7 +62,7 @@ interface Meta {
 export async function monitor(
   root: string,
   meta: MonitorMeta,
-  scannedProject: cliInterface.legacyCommon.ScannedProject,
+  scannedProject: ScannedProject,
   options,
   pluginMeta: PluginMetadata,
   targetFileRelativePath?: string,
@@ -165,6 +166,9 @@ export async function monitor(
             projectName: meta['project-name'],
             prePruneDepCount, // undefined unless 'prune' is used,
             monitorGraph: false,
+            versionBuildInfo: JSON.stringify(
+              scannedProject.meta?.versionBuildInfo,
+            ),
           },
           policy: policy ? policy.toString() : undefined,
           package: pkg,
@@ -209,7 +213,7 @@ export async function monitor(
 export async function monitorGraph(
   root: string,
   meta: MonitorMeta,
-  scannedProject: cliInterface.legacyCommon.ScannedProject,
+  scannedProject: ScannedProject,
   pluginMeta: PluginMetadata,
   targetFileRelativePath?: string,
 ): Promise<MonitorResult> {

diff --git a/src/lib/plugins/get-multi-plugin-result.ts b/src/lib/plugins/get-multi-plugin-result.ts
@@ -2,12 +2,13 @@ import * as _ from 'lodash';
 import * as path from 'path';
 import * as cliInterface from '@snyk/cli-interface';
 
-import { TestOptions, Options, MonitorOptions, PluginMetadata } from '../types';
+import { TestOptions, Options, MonitorOptions } from '../types';
 import { detectPackageManagerFromFile } from '../detect';
 import { SupportedPackageManagers } from '../package-managers';
 import { getSinglePluginResult } from './get-single-plugin-result';
 import { convertSingleResultToMultiCustom } from './convert-single-splugin-res-to-multi-custom';
 import { convertMultiResultToMultiCustom } from './convert-multi-plugin-res-to-multi-custom';
+import { PluginMetadata } from '@snyk/cli-interface/legacy/plugin';
 
 export interface ScannedProjectCustom
   extends cliInterface.legacyCommon.ScannedProject {

diff --git a/src/lib/types.ts b/src/lib/types.ts
@@ -3,19 +3,6 @@ import { legacyCommon as legacyApi } from '@snyk/cli-interface';
 import { SEVERITY } from './snyk-test/legacy';
 import { FailOn } from './snyk-test/common';
 
-export interface PluginMetadata {
-  name: string;
-  packageFormatVersion?: string;
-  packageManager: SupportedPackageManagers;
-  imageLayers?: any;
-  targetFile?: string; // this is wrong (because Shaun said it)
-  runtime?: any;
-  dockerImageId: any;
-  meta?: {
-    allSubProjectNames: string[]; // To warn the user about subprojects not being scanned
-  };
-}
-
 export interface DepDict {
   [name: string]: DepTree;
 }