diff --git a/src/lib/plugins/get-deps-from-plugin.ts b/src/lib/plugins/get-deps-from-plugin.ts index 946ca73a0c..b5af4b4ed5 100644 --- a/src/lib/plugins/get-deps-from-plugin.ts +++ b/src/lib/plugins/get-deps-from-plugin.ts @@ -1,15 +1,14 @@ +import * as debugModule from 'debug'; import { legacyPlugin as pluginApi } from '@snyk/cli-interface'; -import detect = require('../../lib/detect'); -import { TestOptions } from '../types'; -import { Options } from '../types'; -import { NoSupportedManifestsFoundError } from '../errors'; + import { find } from '../find-files'; -import { AUTO_DETECTABLE_FILES } from '../detect'; -import { getSinglePluginResult } from '../plugins/get-single-plugin-result'; -import { getMultiPluginResult } from '../plugins/get-multi-plugin-result'; +import { Options, TestOptions } from '../types'; +import { NoSupportedManifestsFoundError } from '../errors'; +import { getMultiPluginResult } from './get-multi-plugin-result'; +import { getSinglePluginResult } from './get-single-plugin-result'; +import { detectPackageFile, AUTO_DETECTABLE_FILES } from '../detect'; -// tslint:disable-next-line:no-var-requires -const debug = require('debug')('snyk'); +const debug = debugModule('snyk'); // Force getDepsFromPlugin to return scannedProjects for processing export async function getDepsFromPlugin( @@ -34,13 +33,14 @@ export async function getDepsFromPlugin( // TODO: is this needed for the auto detect handling above? // don't override options.file if scanning multiple files at once if (!options.scanAllUnmanaged) { - options.file = options.file || detect.detectPackageFile(root); + options.file = options.file || detectPackageFile(root); } if (!options.docker && !(options.file || options.packageManager)) { throw NoSupportedManifestsFoundError([...root]); } inspectRes = await getSinglePluginResult(root, options); } + if (!pluginApi.isMultiResult(inspectRes)) { if (!inspectRes.package) { // something went wrong if both are not present... diff --git a/src/lib/plugins/get-multi-plugin-result.ts b/src/lib/plugins/get-multi-plugin-result.ts index d776d10d05..66ebe565da 100644 --- a/src/lib/plugins/get-multi-plugin-result.ts +++ b/src/lib/plugins/get-multi-plugin-result.ts @@ -1,9 +1,9 @@ import * as _ from 'lodash'; +import * as path from 'path'; import * as cliInterface from '@snyk/cli-interface'; -import pathUtil = require('path'); import { TestOptions, Options } from '../types'; -import { detectPackageManagerFromFile } from '../../lib/detect'; +import { detectPackageManagerFromFile } from '../detect'; import { SupportedPackageManagers } from '../package-managers'; import { getSinglePluginResult } from './get-single-plugin-result'; @@ -21,7 +21,7 @@ export async function getMultiPluginResult( for (const targetFile of targetFiles) { const optionsClone = _.cloneDeep(options); - optionsClone.file = pathUtil.basename(targetFile); + optionsClone.file = path.basename(targetFile); optionsClone.packageManager = detectPackageManagerFromFile( optionsClone.file, ); diff --git a/src/lib/snyk-test/run-test.ts b/src/lib/snyk-test/run-test.ts index 8867af1715..be2647c030 100644 --- a/src/lib/snyk-test/run-test.ts +++ b/src/lib/snyk-test/run-test.ts @@ -1,44 +1,44 @@ -import * as _ from 'lodash'; import * as fs from 'fs'; -import pathUtil = require('path'); -import moduleToObject = require('snyk-module'); +import * as _ from 'lodash'; +import * as path from 'path'; +import * as debugModule from 'debug'; +import * as moduleToObject from 'snyk-module'; import * as depGraphLib from '@snyk/dep-graph'; -import analytics = require('../analytics'); -import * as config from '../config'; -import { isCI } from '../is-ci'; -import request = require('../request'); -import snyk = require('../'); -import spinner = require('../spinner'); -import common = require('./common'); -import { DepTree, TestOptions } from '../types'; -import * as projectMetadata from '../project-metadata'; -import { GitTarget } from '../project-metadata/types'; import { - convertTestDepGraphResultToLegacy, + TestResult, + DockerIssue, AnnotatedIssue, LegacyVulnApiResult, TestDepGraphResponse, - DockerIssue, - TestResult, + convertTestDepGraphResultToLegacy, } from './legacy'; -import { Options } from '../types'; import { - NoSupportedManifestsFoundError, + AuthFailedError, InternalServerError, + NoSupportedManifestsFoundError, FailedToGetVulnerabilitiesError, FailedToRunTestError, } from '../errors'; +import * as snyk from '../'; +import { isCI } from '../is-ci'; +import * as common from './common'; +import * as config from '../config'; +import * as analytics from '../analytics'; +import { pluckPolicies } from '../policy'; import { maybePrintDeps } from '../print-deps'; -import { SupportedPackageManagers } from '../package-managers'; +import { GitTarget } from '../project-metadata/types'; +import * as projectMetadata from '../project-metadata'; +import { DepTree, Options, TestOptions } from '../types'; import { countPathsToGraphRoot, pruneGraph } from '../prune'; -import { AuthFailedError } from '../errors/authentication-failed-error'; -import { pluckPolicies } from '../policy'; +import { SupportedPackageManagers } from '../package-managers'; import { getDepsFromPlugin } from '../plugins/get-deps-from-plugin'; import { ScannedProjectCustom } from '../plugins/get-multi-plugin-result'; -// tslint:disable-next-line:no-var-requires -const debug = require('debug')('snyk'); +import request = require('../request'); +import spinner = require('../spinner'); + +const debug = debugModule('snyk'); export = runTest; @@ -277,8 +277,8 @@ async function assembleLocalPayloads( 'Analyzing ' + analysisType + ' dependencies for ' + - (pathUtil.relative('.', pathUtil.join(root, options.file || '')) || - pathUtil.relative('..', '.') + ' project dir'); + (path.relative('.', path.join(root, options.file || '')) || + path.relative('..', '.') + ' project dir'); try { const payloads: Payload[] = [];