Skip to content

Commit

Permalink
refactor: rename snykOss folder to snykOssOld
Browse files Browse the repository at this point in the history
  • Loading branch information
j-luong committed Oct 23, 2023
1 parent f1572a1 commit 92fc0fc
Show file tree
Hide file tree
Showing 40 changed files with 50 additions and 50 deletions.
4 changes: 2 additions & 2 deletions src/snyk/base/modules/baseSnykModule.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
6 changes: 3 additions & 3 deletions src/snyk/common/commands/commandController.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion src/snyk/common/commands/types.ts
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion src/snyk/common/services/learnService.ts
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
8 changes: 4 additions & 4 deletions src/snyk/common/services/moduleParserProvider.ts
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
14 changes: 7 additions & 7 deletions src/snyk/extension.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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<void> {
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
6 changes: 3 additions & 3 deletions src/test/unit/common/commands/commandController.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
8 changes: 4 additions & 4 deletions src/test/unit/common/services/learnService.test.ts
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 2 additions & 2 deletions src/test/unit/snykOss/editor/editorDecorator.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
8 changes: 4 additions & 4 deletions src/test/unit/snykOss/services/ossService.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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', () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -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';

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down

0 comments on commit 92fc0fc

Please sign in to comment.