diff --git a/src/snyk/base/modules/baseSnykModule.ts b/src/snyk/base/modules/baseSnykModule.ts index 5a3bee102..11630844a 100644 --- a/src/snyk/base/modules/baseSnykModule.ts +++ b/src/snyk/base/modules/baseSnykModule.ts @@ -23,8 +23,8 @@ import { IMarkdownStringAdapter, MarkdownStringAdapter } from '../../common/vsco import { IWatcher } from '../../common/watchers/interfaces'; import { ICodeSettings } from '../../snykCode/codeSettings'; import SnykEditorsWatcher from '../../snykCode/watchers/editorsWatcher'; -import { OssService } from '../../snykOss/services/ossService'; -import { OssVulnerabilityCountService } from '../../snykOss/services/vulnerabilityCount/ossVulnerabilityCountService'; +import { OssService } from '../../snykOssOld/services/ossService'; +import { OssVulnerabilityCountService } from '../../snykOssOld/services/vulnerabilityCount/ossVulnerabilityCountService'; import { IAuthenticationService } from '../services/authenticationService'; import { ScanModeService } from '../services/scanModeService'; import SnykStatusBarItem, { IStatusBarItem } from '../statusBarItem/statusBarItem'; diff --git a/src/snyk/common/commands/commandController.ts b/src/snyk/common/commands/commandController.ts index cb2f31a28..a9bdbf829 100644 --- a/src/snyk/common/commands/commandController.ts +++ b/src/snyk/common/commands/commandController.ts @@ -6,9 +6,9 @@ import { createDCIgnore } from '../../snykCode/utils/ignoreFileUtils'; import { IssueUtils } from '../../snykCode/utils/issueUtils'; import { CodeIssueCommandArg } from '../../snykCode/views/interfaces'; import { IacIssueCommandArg } from '../../snykIac/views/interfaces'; -import { capitalizeOssSeverity } from '../../snykOss/ossResult'; -import { OssService } from '../../snykOss/services/ossService'; -import { OssIssueCommandArg } from '../../snykOss/views/ossVulnerabilityTreeProvider'; +import { capitalizeOssSeverity } from '../../snykOssOld/ossResult'; +import { OssService } from '../../snykOssOld/services/ossService'; +import { OssIssueCommandArg } from '../../snykOssOld/views/ossVulnerabilityTreeProvider'; import { IAnalytics } from '../analytics/itly'; import { SNYK_INITIATE_LOGIN_COMMAND, @@ -16,7 +16,7 @@ import { SNYK_OPEN_BROWSER_COMMAND, SNYK_SET_TOKEN_COMMAND, SNYK_TRUST_WORKSPACE_FOLDERS_COMMAND, - VSCODE_GO_TO_SETTINGS_COMMAND, + VSCODE_GO_TO_SETTINGS_COMMAND } from '../constants/commands'; import { COMMAND_DEBOUNCE_INTERVAL, IDE_NAME, SNYK_NAME_EXTENSION, SNYK_PUBLISHER } from '../constants/general'; import { ErrorHandler } from '../error/errorHandler'; @@ -48,7 +48,7 @@ export class CommandController { private languageServer: ILanguageServer, private logger: ILog, private analytics: IAnalytics, - ) {} + ) { } openBrowser(url: string): unknown { return this.executeCommand(SNYK_OPEN_BROWSER_COMMAND, this.openerService.openBrowserUrl.bind(this), url); diff --git a/src/snyk/common/commands/types.ts b/src/snyk/common/commands/types.ts index 5c61f0596..22d321333 100644 --- a/src/snyk/common/commands/types.ts +++ b/src/snyk/common/commands/types.ts @@ -1,7 +1,7 @@ import { completeFileSuggestionType } from '../../snykCode/interfaces'; import { CodeIssueCommandArg } from '../../snykCode/views/interfaces'; import { IacIssueCommandArg } from '../../snykIac/views/interfaces'; -import { OssIssueCommandArg } from '../../snykOss/views/ossVulnerabilityTreeProvider'; +import { OssIssueCommandArg } from '../../snykOssOld/views/ossVulnerabilityTreeProvider'; import { CodeIssueData, Issue } from '../languageServer/types'; export enum OpenCommandIssueType { diff --git a/src/snyk/common/services/learnService.ts b/src/snyk/common/services/learnService.ts index df3bd9964..7255f1f6d 100644 --- a/src/snyk/common/services/learnService.ts +++ b/src/snyk/common/services/learnService.ts @@ -1,4 +1,4 @@ -import { OssIssueCommandArg } from '../../snykOss/views/ossVulnerabilityTreeProvider'; +import { OssIssueCommandArg } from '../../snykOssOld/views/ossVulnerabilityTreeProvider'; import { SNYK_GET_LESSON_COMMAND } from '../constants/commands'; import { CodeIssueData, Issue } from '../languageServer/types'; import { IVSCodeCommands } from '../vscode/commands'; @@ -9,7 +9,7 @@ export type Lesson = { }; export class LearnService { - constructor(private commandExecutor: IVSCodeCommands) {} + constructor(private commandExecutor: IVSCodeCommands) { } async getOssLesson(vulnerability: OssIssueCommandArg): Promise { const cwe = vulnerability.identifiers?.CWE; diff --git a/src/snyk/common/services/moduleParserProvider.ts b/src/snyk/common/services/moduleParserProvider.ts index 7a6754e85..607120be5 100644 --- a/src/snyk/common/services/moduleParserProvider.ts +++ b/src/snyk/common/services/moduleParserProvider.ts @@ -1,7 +1,7 @@ -import { BabelParser } from '../../snykOss/services/vulnerabilityCount/parsers/babelParser'; -import { HtmlParser } from '../../snykOss/services/vulnerabilityCount/parsers/htmlParser'; -import { ModuleParser } from '../../snykOss/services/vulnerabilityCount/parsers/moduleParser'; -import { PackageJsonParser } from '../../snykOss/services/vulnerabilityCount/parsers/packageJsonParser'; +import { BabelParser } from '../../snykOssOld/services/vulnerabilityCount/parsers/babelParser'; +import { HtmlParser } from '../../snykOssOld/services/vulnerabilityCount/parsers/htmlParser'; +import { ModuleParser } from '../../snykOssOld/services/vulnerabilityCount/parsers/moduleParser'; +import { PackageJsonParser } from '../../snykOssOld/services/vulnerabilityCount/parsers/packageJsonParser'; import { IConfiguration } from '../configuration/configuration'; import { ILog } from '../logger/interfaces'; import { Language } from '../types'; diff --git a/src/snyk/extension.ts b/src/snyk/extension.ts index a3688f750..59146bcb8 100644 --- a/src/snyk/extension.ts +++ b/src/snyk/extension.ts @@ -73,13 +73,13 @@ import { CodeSuggestionWebviewProvider } from './snykCode/views/suggestion/codeS import { IacService } from './snykIac/iacService'; import IacIssueTreeProvider from './snykIac/views/iacIssueTreeProvider'; import { IacSuggestionWebviewProvider } from './snykIac/views/suggestion/iacSuggestionWebviewProvider'; -import { EditorDecorator } from './snykOss/editor/editorDecorator'; -import { OssService } from './snykOss/services/ossService'; -import { OssVulnerabilityCountService } from './snykOss/services/vulnerabilityCount/ossVulnerabilityCountService'; -import { ModuleVulnerabilityCountProvider } from './snykOss/services/vulnerabilityCount/vulnerabilityCountProvider'; -import { OssVulnerabilityTreeProvider } from './snykOss/views/ossVulnerabilityTreeProvider'; -import { OssSuggestionWebviewProvider } from './snykOss/views/suggestion/ossSuggestionWebviewProvider'; -import { DailyScanJob } from './snykOss/watchers/dailyScanJob'; +import { EditorDecorator } from './snykOssOld/editor/editorDecorator'; +import { OssService } from './snykOssOld/services/ossService'; +import { OssVulnerabilityCountService } from './snykOssOld/services/vulnerabilityCount/ossVulnerabilityCountService'; +import { ModuleVulnerabilityCountProvider } from './snykOssOld/services/vulnerabilityCount/vulnerabilityCountProvider'; +import { OssVulnerabilityTreeProvider } from './snykOssOld/views/ossVulnerabilityTreeProvider'; +import { OssSuggestionWebviewProvider } from './snykOssOld/views/suggestion/ossSuggestionWebviewProvider'; +import { DailyScanJob } from './snykOssOld/watchers/dailyScanJob'; class SnykExtension extends SnykLib implements IExtension { public async activate(vscodeContext: vscode.ExtensionContext): Promise { @@ -263,12 +263,12 @@ class SnykExtension extends SnykLib implements IExtension { this.registerCommands(vscodeContext); const codeSecurityIssueProvider = new CodeSecurityIssueTreeProvider( - this.viewManagerService, - this.contextService, - this.snykCode, - configuration, - vsCodeLanguages, - ), + this.viewManagerService, + this.contextService, + this.snykCode, + configuration, + vsCodeLanguages, + ), codeQualityIssueProvider = new CodeQualityIssueTreeProvider( this.viewManagerService, this.contextService, diff --git a/src/snyk/snykOss/codeActions/vulnerabilityCodeActionProvider.ts b/src/snyk/snykOssOld/codeActions/vulnerabilityCodeActionProvider.ts similarity index 100% rename from src/snyk/snykOss/codeActions/vulnerabilityCodeActionProvider.ts rename to src/snyk/snykOssOld/codeActions/vulnerabilityCodeActionProvider.ts diff --git a/src/snyk/snykOss/constants/nativeModules.ts b/src/snyk/snykOssOld/constants/nativeModules.ts similarity index 100% rename from src/snyk/snykOss/constants/nativeModules.ts rename to src/snyk/snykOssOld/constants/nativeModules.ts diff --git a/src/snyk/snykOss/editor/editorDecorator.ts b/src/snyk/snykOssOld/editor/editorDecorator.ts similarity index 100% rename from src/snyk/snykOss/editor/editorDecorator.ts rename to src/snyk/snykOssOld/editor/editorDecorator.ts diff --git a/src/snyk/snykOss/hoverProvider/vulnerabilityCountHoverProvider.ts b/src/snyk/snykOssOld/hoverProvider/vulnerabilityCountHoverProvider.ts similarity index 100% rename from src/snyk/snykOss/hoverProvider/vulnerabilityCountHoverProvider.ts rename to src/snyk/snykOssOld/hoverProvider/vulnerabilityCountHoverProvider.ts diff --git a/src/snyk/snykOss/messages/error.ts b/src/snyk/snykOssOld/messages/error.ts similarity index 100% rename from src/snyk/snykOss/messages/error.ts rename to src/snyk/snykOssOld/messages/error.ts diff --git a/src/snyk/snykOss/messages/test.ts b/src/snyk/snykOssOld/messages/test.ts similarity index 100% rename from src/snyk/snykOss/messages/test.ts rename to src/snyk/snykOssOld/messages/test.ts diff --git a/src/snyk/snykOss/messages/treeView.ts b/src/snyk/snykOssOld/messages/treeView.ts similarity index 100% rename from src/snyk/snykOss/messages/treeView.ts rename to src/snyk/snykOssOld/messages/treeView.ts diff --git a/src/snyk/snykOss/messages/vulnerabilityCount.ts b/src/snyk/snykOssOld/messages/vulnerabilityCount.ts similarity index 100% rename from src/snyk/snykOss/messages/vulnerabilityCount.ts rename to src/snyk/snykOssOld/messages/vulnerabilityCount.ts diff --git a/src/snyk/snykOss/ossResult.ts b/src/snyk/snykOssOld/ossResult.ts similarity index 100% rename from src/snyk/snykOss/ossResult.ts rename to src/snyk/snykOssOld/ossResult.ts diff --git a/src/snyk/snykOss/services/ossService.ts b/src/snyk/snykOssOld/services/ossService.ts similarity index 100% rename from src/snyk/snykOss/services/ossService.ts rename to src/snyk/snykOssOld/services/ossService.ts diff --git a/src/snyk/snykOss/services/vulnerabilityCount/importedModule.ts b/src/snyk/snykOssOld/services/vulnerabilityCount/importedModule.ts similarity index 100% rename from src/snyk/snykOss/services/vulnerabilityCount/importedModule.ts rename to src/snyk/snykOssOld/services/vulnerabilityCount/importedModule.ts diff --git a/src/snyk/snykOss/services/vulnerabilityCount/ossVulnerabilityCountService.ts b/src/snyk/snykOssOld/services/vulnerabilityCount/ossVulnerabilityCountService.ts similarity index 100% rename from src/snyk/snykOss/services/vulnerabilityCount/ossVulnerabilityCountService.ts rename to src/snyk/snykOssOld/services/vulnerabilityCount/ossVulnerabilityCountService.ts diff --git a/src/snyk/snykOss/services/vulnerabilityCount/parsers/babelParser.ts b/src/snyk/snykOssOld/services/vulnerabilityCount/parsers/babelParser.ts similarity index 100% rename from src/snyk/snykOss/services/vulnerabilityCount/parsers/babelParser.ts rename to src/snyk/snykOssOld/services/vulnerabilityCount/parsers/babelParser.ts diff --git a/src/snyk/snykOss/services/vulnerabilityCount/parsers/htmlParser.ts b/src/snyk/snykOssOld/services/vulnerabilityCount/parsers/htmlParser.ts similarity index 100% rename from src/snyk/snykOss/services/vulnerabilityCount/parsers/htmlParser.ts rename to src/snyk/snykOssOld/services/vulnerabilityCount/parsers/htmlParser.ts diff --git a/src/snyk/snykOss/services/vulnerabilityCount/parsers/moduleParser.ts b/src/snyk/snykOssOld/services/vulnerabilityCount/parsers/moduleParser.ts similarity index 100% rename from src/snyk/snykOss/services/vulnerabilityCount/parsers/moduleParser.ts rename to src/snyk/snykOssOld/services/vulnerabilityCount/parsers/moduleParser.ts diff --git a/src/snyk/snykOss/services/vulnerabilityCount/parsers/packageJsonParser.ts b/src/snyk/snykOssOld/services/vulnerabilityCount/parsers/packageJsonParser.ts similarity index 100% rename from src/snyk/snykOss/services/vulnerabilityCount/parsers/packageJsonParser.ts rename to src/snyk/snykOssOld/services/vulnerabilityCount/parsers/packageJsonParser.ts diff --git a/src/snyk/snykOss/services/vulnerabilityCount/vulnerabilityCountProvider.ts b/src/snyk/snykOssOld/services/vulnerabilityCount/vulnerabilityCountProvider.ts similarity index 100% rename from src/snyk/snykOss/services/vulnerabilityCount/vulnerabilityCountProvider.ts rename to src/snyk/snykOssOld/services/vulnerabilityCount/vulnerabilityCountProvider.ts diff --git a/src/snyk/snykOss/views/ossVulnerabilityTreeProvider.ts b/src/snyk/snykOssOld/views/ossVulnerabilityTreeProvider.ts similarity index 100% rename from src/snyk/snykOss/views/ossVulnerabilityTreeProvider.ts rename to src/snyk/snykOssOld/views/ossVulnerabilityTreeProvider.ts diff --git a/src/snyk/snykOss/views/suggestion/ossSuggestionWebviewProvider.ts b/src/snyk/snykOssOld/views/suggestion/ossSuggestionWebviewProvider.ts similarity index 100% rename from src/snyk/snykOss/views/suggestion/ossSuggestionWebviewProvider.ts rename to src/snyk/snykOssOld/views/suggestion/ossSuggestionWebviewProvider.ts diff --git a/src/snyk/snykOss/views/suggestion/ossSuggestionWebviewScript.ts b/src/snyk/snykOssOld/views/suggestion/ossSuggestionWebviewScript.ts similarity index 100% rename from src/snyk/snykOss/views/suggestion/ossSuggestionWebviewScript.ts rename to src/snyk/snykOssOld/views/suggestion/ossSuggestionWebviewScript.ts diff --git a/src/snyk/snykOss/vulnerabilityCountEmitter.ts b/src/snyk/snykOssOld/vulnerabilityCountEmitter.ts similarity index 100% rename from src/snyk/snykOss/vulnerabilityCountEmitter.ts rename to src/snyk/snykOssOld/vulnerabilityCountEmitter.ts diff --git a/src/snyk/snykOss/watchers/dailyScanJob.ts b/src/snyk/snykOssOld/watchers/dailyScanJob.ts similarity index 100% rename from src/snyk/snykOss/watchers/dailyScanJob.ts rename to src/snyk/snykOssOld/watchers/dailyScanJob.ts diff --git a/src/snyk/snykOss/watchers/manifestFileWatcher.ts b/src/snyk/snykOssOld/watchers/manifestFileWatcher.ts similarity index 100% rename from src/snyk/snykOss/watchers/manifestFileWatcher.ts rename to src/snyk/snykOssOld/watchers/manifestFileWatcher.ts diff --git a/src/test/unit/common/commands/commandController.test.ts b/src/test/unit/common/commands/commandController.test.ts index f0b8ef8c6..1f2c8e91c 100644 --- a/src/test/unit/common/commands/commandController.test.ts +++ b/src/test/unit/common/commands/commandController.test.ts @@ -5,15 +5,15 @@ import { ScanModeService } from '../../../../snyk/base/services/scanModeService' import { IAnalytics } from '../../../../snyk/common/analytics/itly'; import { CommandController } from '../../../../snyk/common/commands/commandController'; import { COMMAND_DEBOUNCE_INTERVAL } from '../../../../snyk/common/constants/general'; +import { CodeIssueData, IacIssueData } from '../../../../snyk/common/languageServer/types'; import { IOpenerService } from '../../../../snyk/common/services/openerService'; +import { IProductService } from '../../../../snyk/common/services/productService'; import { IVSCodeCommands } from '../../../../snyk/common/vscode/commands'; import { IVSCodeWorkspace } from '../../../../snyk/common/vscode/workspace'; -import { OssService } from '../../../../snyk/snykOss/services/ossService'; +import { OssService } from '../../../../snyk/snykOssOld/services/ossService'; import { LanguageServerMock } from '../../mocks/languageServer.mock'; import { LoggerMock } from '../../mocks/logger.mock'; import { windowMock } from '../../mocks/window.mock'; -import { IProductService } from '../../../../snyk/common/services/productService'; -import { CodeIssueData, IacIssueData } from '../../../../snyk/common/languageServer/types'; suite('CommandController', () => { const sleep = util.promisify(setTimeout); diff --git a/src/test/unit/common/services/learnService.test.ts b/src/test/unit/common/services/learnService.test.ts index e5715a87d..08ef41a7f 100644 --- a/src/test/unit/common/services/learnService.test.ts +++ b/src/test/unit/common/services/learnService.test.ts @@ -1,10 +1,10 @@ import { strictEqual } from 'assert'; import sinon from 'sinon'; -import { IVSCodeCommands } from '../../../../snyk/common/vscode/commands'; -import { LearnService } from '../../../../snyk/common/services/learnService'; -import { OssIssueCommandArg } from '../../../../snyk/snykOss/views/ossVulnerabilityTreeProvider'; -import { CodeIssueData, Issue, IssueSeverity } from '../../../../snyk/common/languageServer/types'; import { SNYK_GET_LESSON_COMMAND } from '../../../../snyk/common/constants/commands'; +import { CodeIssueData, Issue, IssueSeverity } from '../../../../snyk/common/languageServer/types'; +import { LearnService } from '../../../../snyk/common/services/learnService'; +import { IVSCodeCommands } from '../../../../snyk/common/vscode/commands'; +import { OssIssueCommandArg } from '../../../../snyk/snykOssOld/views/ossVulnerabilityTreeProvider'; suite('LearnService', () => { let commands: IVSCodeCommands; diff --git a/src/test/unit/snykOss/editor/editorDecorator.test.ts b/src/test/unit/snykOss/editor/editorDecorator.test.ts index a257e3db5..ab995cf88 100644 --- a/src/test/unit/snykOss/editor/editorDecorator.test.ts +++ b/src/test/unit/snykOss/editor/editorDecorator.test.ts @@ -3,8 +3,8 @@ import sinon from 'sinon'; import { IVSCodeLanguages } from '../../../../snyk/common/vscode/languages'; import { IThemeColorAdapter } from '../../../../snyk/common/vscode/theme'; import { IVSCodeWindow } from '../../../../snyk/common/vscode/window'; -import { EditorDecorator } from '../../../../snyk/snykOss/editor/editorDecorator'; -import { ModuleVulnerabilityCount } from '../../../../snyk/snykOss/services/vulnerabilityCount/importedModule'; +import { EditorDecorator } from '../../../../snyk/snykOssOld/editor/editorDecorator'; +import { ModuleVulnerabilityCount } from '../../../../snyk/snykOssOld/services/vulnerabilityCount/importedModule'; suite('OSS Editor Decorator', () => { let decorator: EditorDecorator; diff --git a/src/test/unit/snykOss/services/ossService.test.ts b/src/test/unit/snykOss/services/ossService.test.ts index de0817279..657877bca 100644 --- a/src/test/unit/snykOss/services/ossService.test.ts +++ b/src/test/unit/snykOss/services/ossService.test.ts @@ -13,10 +13,10 @@ import { IViewManagerService } from '../../../../snyk/common/services/viewManage import { IWebViewProvider } from '../../../../snyk/common/views/webviewProvider'; import { ExtensionContext } from '../../../../snyk/common/vscode/extensionContext'; import { IVSCodeWorkspace } from '../../../../snyk/common/vscode/workspace'; -import { OssFileResult, OssResult, OssSeverity } from '../../../../snyk/snykOss/ossResult'; -import { OssService } from '../../../../snyk/snykOss/services/ossService'; -import { OssIssueCommandArg } from '../../../../snyk/snykOss/views/ossVulnerabilityTreeProvider'; -import { DailyScanJob } from '../../../../snyk/snykOss/watchers/dailyScanJob'; +import { OssFileResult, OssResult, OssSeverity } from '../../../../snyk/snykOssOld/ossResult'; +import { OssService } from '../../../../snyk/snykOssOld/services/ossService'; +import { OssIssueCommandArg } from '../../../../snyk/snykOssOld/views/ossVulnerabilityTreeProvider'; +import { DailyScanJob } from '../../../../snyk/snykOssOld/watchers/dailyScanJob'; import { LanguageServerMock } from '../../mocks/languageServer.mock'; import { LoggerMock } from '../../mocks/logger.mock'; diff --git a/src/test/unit/snykOss/services/vulnerabilityCount/ossVulnerabilityCountService.test.ts b/src/test/unit/snykOss/services/vulnerabilityCount/ossVulnerabilityCountService.test.ts index 1e8277bc5..8251a89f9 100644 --- a/src/test/unit/snykOss/services/vulnerabilityCount/ossVulnerabilityCountService.test.ts +++ b/src/test/unit/snykOss/services/vulnerabilityCount/ossVulnerabilityCountService.test.ts @@ -4,20 +4,20 @@ import sinon from 'sinon'; import { IAnalytics } from '../../../../../snyk/common/analytics/itly'; import { IConfiguration } from '../../../../../snyk/common/configuration/configuration'; import { ICodeActionKindAdapter } from '../../../../../snyk/common/vscode/codeAction'; +import { ILanguageClientAdapter } from '../../../../../snyk/common/vscode/languageClient'; import { IVSCodeLanguages } from '../../../../../snyk/common/vscode/languages'; +import { ITextDocumentAdapter } from '../../../../../snyk/common/vscode/textdocument'; import { IThemeColorAdapter } from '../../../../../snyk/common/vscode/theme'; import { TextDocument, TextEditor } from '../../../../../snyk/common/vscode/types'; +import { IUriAdapter } from '../../../../../snyk/common/vscode/uri'; import { IVSCodeWindow } from '../../../../../snyk/common/vscode/window'; import { IVSCodeWorkspace } from '../../../../../snyk/common/vscode/workspace'; -import { EditorDecorator } from '../../../../../snyk/snykOss/editor/editorDecorator'; -import { OssFileResult } from '../../../../../snyk/snykOss/ossResult'; -import { OssService } from '../../../../../snyk/snykOss/services/ossService'; -import { OssVulnerabilityCountService } from '../../../../../snyk/snykOss/services/vulnerabilityCount/ossVulnerabilityCountService'; -import { ModuleVulnerabilityCountProvider } from '../../../../../snyk/snykOss/services/vulnerabilityCount/vulnerabilityCountProvider'; +import { EditorDecorator } from '../../../../../snyk/snykOssOld/editor/editorDecorator'; +import { OssFileResult } from '../../../../../snyk/snykOssOld/ossResult'; +import { OssService } from '../../../../../snyk/snykOssOld/services/ossService'; +import { OssVulnerabilityCountService } from '../../../../../snyk/snykOssOld/services/vulnerabilityCount/ossVulnerabilityCountService'; +import { ModuleVulnerabilityCountProvider } from '../../../../../snyk/snykOssOld/services/vulnerabilityCount/vulnerabilityCountProvider'; import { LoggerMock } from '../../../mocks/logger.mock'; -import { ILanguageClientAdapter } from '../../../../../snyk/common/vscode/languageClient'; -import { IUriAdapter } from '../../../../../snyk/common/vscode/uri'; -import { ITextDocumentAdapter } from '../../../../../snyk/common/vscode/textdocument'; suite('OSS VulnerabilityCountService', () => { let workspace: IVSCodeWorkspace; @@ -99,9 +99,9 @@ suite('OSS VulnerabilityCountService', () => { test('Processes file if active editor is opened on activation', () => { window.getActiveTextEditor = () => - ({ - document: undefined, - } as unknown as TextEditor); + ({ + document: undefined, + } as unknown as TextEditor); workspace.onDidChangeTextDocument = sinon.fake(); window.onDidChangeActiveTextEditor = sinon.fake(); diff --git a/src/test/unit/snykOss/services/vulnerabilityCount/parsers/babelParser.test.ts b/src/test/unit/snykOss/services/vulnerabilityCount/parsers/babelParser.test.ts index 4846065a1..c0bfb5f91 100644 --- a/src/test/unit/snykOss/services/vulnerabilityCount/parsers/babelParser.test.ts +++ b/src/test/unit/snykOss/services/vulnerabilityCount/parsers/babelParser.test.ts @@ -1,6 +1,6 @@ import { strictEqual } from 'assert'; import { Language } from '../../../../../../snyk/common/types'; -import { BabelParser } from '../../../../../../snyk/snykOss/services/vulnerabilityCount/parsers/babelParser'; +import { BabelParser } from '../../../../../../snyk/snykOssOld/services/vulnerabilityCount/parsers/babelParser'; /** * ES Import statements documentation: diff --git a/src/test/unit/snykOss/services/vulnerabilityCount/parsers/htmlParser.test.ts b/src/test/unit/snykOss/services/vulnerabilityCount/parsers/htmlParser.test.ts index 40ffd9f89..1e23b667a 100644 --- a/src/test/unit/snykOss/services/vulnerabilityCount/parsers/htmlParser.test.ts +++ b/src/test/unit/snykOss/services/vulnerabilityCount/parsers/htmlParser.test.ts @@ -1,6 +1,6 @@ import { deepStrictEqual, strictEqual } from 'assert'; -import { Range } from '../../../../../../snyk/snykOss/services/vulnerabilityCount/importedModule'; -import { HtmlParser } from '../../../../../../snyk/snykOss/services/vulnerabilityCount/parsers/htmlParser'; +import { Range } from '../../../../../../snyk/snykOssOld/services/vulnerabilityCount/importedModule'; +import { HtmlParser } from '../../../../../../snyk/snykOssOld/services/vulnerabilityCount/parsers/htmlParser'; suite('HTML Parser', () => { let parser: HtmlParser; diff --git a/src/test/unit/snykOss/services/vulnerabilityCount/parsers/moduleParserProvider.test.ts b/src/test/unit/snykOss/services/vulnerabilityCount/parsers/moduleParserProvider.test.ts index 3061a353a..40ce549b5 100644 --- a/src/test/unit/snykOss/services/vulnerabilityCount/parsers/moduleParserProvider.test.ts +++ b/src/test/unit/snykOss/services/vulnerabilityCount/parsers/moduleParserProvider.test.ts @@ -2,7 +2,7 @@ import { strictEqual } from 'assert'; import { IConfiguration } from '../../../../../../snyk/common/configuration/configuration'; import { ModuleParserProvider } from '../../../../../../snyk/common/services/moduleParserProvider'; import { Language } from '../../../../../../snyk/common/types'; -import { BabelParser } from '../../../../../../snyk/snykOss/services/vulnerabilityCount/parsers/babelParser'; +import { BabelParser } from '../../../../../../snyk/snykOssOld/services/vulnerabilityCount/parsers/babelParser'; import { LoggerMock } from '../../../../mocks/logger.mock'; suite('OSS ModuleParserProvider', () => { diff --git a/src/test/unit/snykOss/services/vulnerabilityCount/parsers/packageJsonParser.test.ts b/src/test/unit/snykOss/services/vulnerabilityCount/parsers/packageJsonParser.test.ts index dbe77ecd6..df042ac8d 100644 --- a/src/test/unit/snykOss/services/vulnerabilityCount/parsers/packageJsonParser.test.ts +++ b/src/test/unit/snykOss/services/vulnerabilityCount/parsers/packageJsonParser.test.ts @@ -1,5 +1,5 @@ import { strictEqual } from 'assert'; -import { PackageJsonParser } from '../../../../../../snyk/snykOss/services/vulnerabilityCount/parsers/packageJsonParser'; +import { PackageJsonParser } from '../../../../../../snyk/snykOssOld/services/vulnerabilityCount/parsers/packageJsonParser'; import { LoggerMock } from '../../../../mocks/logger.mock'; /** diff --git a/src/test/unit/snykOss/services/vulnerabilityCount/vulnerabilityCountProvider.test.ts b/src/test/unit/snykOss/services/vulnerabilityCount/vulnerabilityCountProvider.test.ts index fb5eb9ca4..6e9c0da11 100644 --- a/src/test/unit/snykOss/services/vulnerabilityCount/vulnerabilityCountProvider.test.ts +++ b/src/test/unit/snykOss/services/vulnerabilityCount/vulnerabilityCountProvider.test.ts @@ -2,13 +2,13 @@ import { deepStrictEqual, strictEqual } from 'assert'; import sinon from 'sinon'; import { CliError } from '../../../../../snyk/cli/services/cliService'; import { Language } from '../../../../../snyk/common/types'; -import { OssResultBody, OssVulnerability } from '../../../../../snyk/snykOss/ossResult'; -import { OssService } from '../../../../../snyk/snykOss/services/ossService'; -import { ImportedModule } from '../../../../../snyk/snykOss/services/vulnerabilityCount/importedModule'; -import { ModuleVulnerabilityCountProvider } from '../../../../../snyk/snykOss/services/vulnerabilityCount/vulnerabilityCountProvider'; import { ILanguageClientAdapter } from '../../../../../snyk/common/vscode/languageClient'; -import { IUriAdapter } from '../../../../../snyk/common/vscode/uri'; import { ITextDocumentAdapter } from '../../../../../snyk/common/vscode/textdocument'; +import { IUriAdapter } from '../../../../../snyk/common/vscode/uri'; +import { OssResultBody, OssVulnerability } from '../../../../../snyk/snykOssOld/ossResult'; +import { OssService } from '../../../../../snyk/snykOssOld/services/ossService'; +import { ImportedModule } from '../../../../../snyk/snykOssOld/services/vulnerabilityCount/importedModule'; +import { ModuleVulnerabilityCountProvider } from '../../../../../snyk/snykOssOld/services/vulnerabilityCount/vulnerabilityCountProvider'; suite('OSS ModuleVulnerabilityCountProvider', () => { let ossService: OssService; diff --git a/src/test/unit/snykOss/services/watchers/dailyScanJob.test.ts b/src/test/unit/snykOss/services/watchers/dailyScanJob.test.ts index a9de4a5eb..9cf326560 100644 --- a/src/test/unit/snykOss/services/watchers/dailyScanJob.test.ts +++ b/src/test/unit/snykOss/services/watchers/dailyScanJob.test.ts @@ -1,7 +1,7 @@ import { strictEqual } from 'assert'; import sinon from 'sinon'; import { IExtension } from '../../../../../snyk/base/modules/interfaces'; -import { DailyScanJob } from '../../../../../snyk/snykOss/watchers/dailyScanJob'; +import { DailyScanJob } from '../../../../../snyk/snykOssOld/watchers/dailyScanJob'; suite('OSS DailyScanJob', () => { let extension: IExtension;