Skip to content

Commit

Permalink
fix: a few lint warnings
Browse files Browse the repository at this point in the history
bastiandoetsch committed Nov 8, 2024
1 parent 404406b commit c95a4c2
Showing 15 changed files with 29 additions and 61 deletions.
22 changes: 11 additions & 11 deletions src/snyk/common/analytics/AnalyticsEvent.ts
Original file line number Diff line number Diff line change
@@ -7,9 +7,9 @@ export class AnalyticsEvent implements AbstractAnalyticsEvent {
private readonly targetId: string;
private readonly timestampMs: number;
private readonly durationMs: number;
private readonly results: Map<string, any>;
private readonly errors: any[];
private readonly extension: Map<string, any>;
private readonly results: Map<string, unknown>;
private readonly errors: unknown[];
private readonly extension: Map<string, unknown>;

constructor(
deviceId: string,
@@ -19,19 +19,19 @@ export class AnalyticsEvent implements AbstractAnalyticsEvent {
targetId: string = 'pkg:filesystem/scrubbed',
timestampMs: number = Date.now(),
durationMs: number = 0,
results: Map<string, any> = new Map<string, any>(),
errors: any[] = [],
extension: Map<string, any> = new Map<string, any>(),
results: Map<string, unknown> = new Map<string, unknown>(),
errors: unknown[] = [],
extension: Map<string, unknown> = new Map<string, unknown>(),
) {
this.interactionType = interactionType;
this.category = category;
this.status = status ?? 'success';
this.targetId = targetId ?? 'pkg:filesystem/scrubbed';
this.timestampMs = timestampMs ?? Date.now();
this.durationMs = durationMs ?? 0;
this.results = results ?? new Map<string, any>();
this.results = results ?? new Map<string, unknown>();
this.errors = errors ?? [];
this.extension = extension ?? new Map<string, any>();
this.extension = extension ?? new Map<string, unknown>();
if (deviceId && deviceId.length > 0) {
this.extension.set('device_id', deviceId);
}
@@ -61,15 +61,15 @@ export class AnalyticsEvent implements AbstractAnalyticsEvent {
return this.durationMs;
}

public getResults(): Map<string, any> {
public getResults(): Map<string, unknown> {
return this.results;
}

public getErrors(): any[] {
public getErrors(): unknown[] {
return this.errors;
}

public getExtension(): Map<string, any> {
public getExtension(): Map<string, unknown> {
return this.extension;
}
}
12 changes: 9 additions & 3 deletions src/snyk/common/analytics/AnalyticsSender.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
// noinspection InfiniteLoopJS

import { ILog } from '../logger/interfaces';
import { IConfiguration } from '../configuration/configuration';
import { sleep } from '@amplitude/experiment-node-server/dist/src/util/time';
@@ -39,11 +41,13 @@ export class AnalyticsSender {
}

private async start(): Promise<void> {
// noinspection InfiniteLoopJS
// eslint-disable-next-line no-constant-condition
while (true) {
// eslint-disable-next-line no-await-in-loop
const authToken = await this.configuration.getToken();

if (this.eventQueue.length === 0 || !authToken || authToken.trim() === '') {
// eslint-disable-next-line no-await-in-loop
await sleep(1000);
continue;
}
@@ -54,10 +58,12 @@ export class AnalyticsSender {
try {
const args = [];
args.push(eventPair.event);
// eslint-disable-next-line no-await-in-loop
await this.commandExecutor.executeCommand(SNYK_REPORT_ANALTYICS, args);
eventPair.callback();
} catch (e) {
this.logger.error(e);
} catch (error) {
// eslint-disable-next-line @typescript-eslint/no-base-to-string
this.logger.error(`could not send ${eventPair.event} ${error}`);
} finally {
// let's not rely on indexes in the eventQueue array not having changed
const index = this.eventQueue.indexOf(eventPair);
1 change: 0 additions & 1 deletion src/snyk/common/configuration/configuration.ts
Original file line number Diff line number Diff line change
@@ -12,7 +12,6 @@ import {
ADVANCED_CUSTOM_ENDPOINT,
ADVANCED_CUSTOM_LS_PATH,
ADVANCED_ORGANIZATION,
ANALYTICS_PLUGIN_INSTALLED_SENT,
CODE_QUALITY_ENABLED_SETTING,
CODE_SECURITY_ENABLED_SETTING,
CONFIGURATION_IDENTIFIER,
4 changes: 1 addition & 3 deletions src/snyk/snykOss/providers/ossDetailPanelProvider.ts
Original file line number Diff line number Diff line change
@@ -62,8 +62,7 @@ export class OssDetailPanelProvider
);
this.registerListeners();
}

const images: Record<string, string> = [
[
['icon-code', 'svg'],
['dark-critical-severity', 'svg'],
['dark-high-severity', 'svg'],
@@ -76,7 +75,6 @@ export class OssDetailPanelProvider
accumulator[name] = uri.toString();
return accumulator;
}, {});

let html: string = '';
// TODO: delete this when SNYK_GENERATE_ISSUE_DESCRIPTION command is in stable CLI.
if (issue.additionalData.details) {
4 changes: 2 additions & 2 deletions src/snyk/snykOss/providers/ossVulnerabilityTreeProvider.ts
Original file line number Diff line number Diff line change
@@ -53,7 +53,7 @@ export default class OssIssueTreeProvider extends ProductIssueTreeProvider<OssIs

let folderVulnCount = 0;

if (folderResult instanceof Error && folderResult.message === LsErrorMessage.repositoryInvalidError) {
if (folderResult instanceof Error && folderResult.message === LsErrorMessage.repositoryInvalidError.toString()) {
nodes.push(this.getFaultyRepositoryErrorTreeNode(folderName, folderResult.toString()));
continue;
}
@@ -173,7 +173,7 @@ export default class OssIssueTreeProvider extends ProductIssueTreeProvider<OssIs

filterIssues(issues: Issue<OssIssueData>[]): Issue<OssIssueData>[] {
return issues.filter(vuln => {
switch (vuln.severity.toLowerCase()) {
switch (vuln.severity) {
case IssueSeverity.Critical:
return this.configuration.severityFilter.critical;
case IssueSeverity.High:
Original file line number Diff line number Diff line change
@@ -2,18 +2,13 @@ import EventEmitter from 'events';
import { ImportedModule, ModuleVulnerabilityCount } from './importedModule';

export enum VulnerabilityCountEvents {
PackageJsonFound = 'packageJsonFound',
Start = 'start',
Scanned = 'scanned',
Done = 'done',
Error = 'error',
}

export class VulnerabilityCountEmitter extends EventEmitter {
packageJsonFound(fileName: string): void {
this.emit(VulnerabilityCountEvents.PackageJsonFound, fileName);
}

startScanning(importedModules: ImportedModule[]): void {
this.emit(VulnerabilityCountEvents.Start, importedModules);
}
@@ -26,6 +21,7 @@ export class VulnerabilityCountEmitter extends EventEmitter {
this.emit(VulnerabilityCountEvents.Done, moduleInfos);
}

// eslint-disable-next-line @typescript-eslint/no-redundant-type-constituents
error(error: Error | unknown): void {
this.emit(VulnerabilityCountEvents.Error, error);
}
1 change: 0 additions & 1 deletion src/test/integration/configuration.test.ts
Original file line number Diff line number Diff line change
@@ -3,7 +3,6 @@ import { FeaturesConfiguration } from '../../snyk/common/configuration/configura
import { configuration } from '../../snyk/common/configuration/instance';
import vscode from 'vscode';
import { ADVANCED_CUSTOM_ENDPOINT } from '../../snyk/common/constants/settings';
import { extensionContext } from '../../snyk/common/vscode/extensionContext';

suite('Configuration', () => {
test('settings change is reflected', async () => {
11 changes: 0 additions & 11 deletions src/test/unit/base/services/authenticationService.test.ts
Original file line number Diff line number Diff line change
@@ -25,17 +25,6 @@ suite('AuthenticationService', () => {
let clearTokenSpy: sinon.SinonSpy;
let previewFeaturesSpy: sinon.SinonSpy;

const NEEDLE_DEFAULT_TIMEOUT = 1000;

const overrideNeedleTimeoutOptions = {
// eslint-disable-next-line camelcase
open_timeout: NEEDLE_DEFAULT_TIMEOUT,
// eslint-disable-next-line camelcase
response_timeout: NEEDLE_DEFAULT_TIMEOUT,
// eslint-disable-next-line camelcase
read_timeout: NEEDLE_DEFAULT_TIMEOUT,
};

setup(() => {
baseModule = {} as IBaseSnykModule;
setContextSpy = sinon.fake();
3 changes: 1 addition & 2 deletions src/test/unit/common/commands/commandController.test.ts
Original file line number Diff line number Diff line change
@@ -16,8 +16,7 @@ import { IConfiguration } from '../../../../snyk/common/configuration/configurat
import { IFolderConfigs } from '../../../../snyk/common/configuration/folderConfigs';

suite('CommandController', () => {
const sleep = util.promisify(setTimeout);

util.promisify(setTimeout);
let controller: CommandController;

setup(() => {
16 changes: 0 additions & 16 deletions src/test/unit/mocks/uri.mock.ts

This file was deleted.

2 changes: 0 additions & 2 deletions src/test/unit/mocks/workspace.mock.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import * as os from 'os';
import path from 'path';
import { IVSCodeWorkspace } from '../../../snyk/common/vscode/workspace';

export function stubWorkspaceConfiguration<T>(configSetting: string, returnValue: T | undefined): IVSCodeWorkspace {
Original file line number Diff line number Diff line change
@@ -9,7 +9,6 @@ import { CodeActionContext, CodeActionKind, Range, TextDocument } from '../../..
import { SnykCodeActionsProvider } from '../../../../snyk/snykCode/codeActions/codeIssuesActionsProvider';
import { IssueUtils } from '../../../../snyk/snykCode/utils/issueUtils';
import { IConfiguration } from '../../../../snyk/common/configuration/configuration';
import { FEATURE_FLAGS } from '../../../../snyk/common/constants/featureFlags';

suite('Snyk Code actions provider', () => {
let issuesActionsProvider: SnykCodeActionsProvider;
2 changes: 0 additions & 2 deletions src/test/unit/snykCode/codeSettings.test.ts
Original file line number Diff line number Diff line change
@@ -10,12 +10,10 @@ import { CodeSettings, ICodeSettings } from '../../../snyk/snykCode/codeSettings
suite('Snyk Code Settings', () => {
let settings: ICodeSettings;
let setContextFake: SinonSpy;
let setFeatureFlagFake: SinonSpy;
let contextService: IContextService;

setup(() => {
setContextFake = sinon.fake();
setFeatureFlagFake = sinon.fake();

contextService = {
setContext: setContextFake,
Original file line number Diff line number Diff line change
@@ -96,8 +96,11 @@ suite('OSS code actions provider', () => {

sinon.stub(ossActionsProvider, 'getIssueRange').returns(rangeMock);
// stubbing private methods workaround is to cast to any
// eslint-disable-next-line @typescript-eslint/no-explicit-any
sinon.stub(ossActionsProvider, <any>'getVulnerabilities').returns(vulnerabilities);
// eslint-disable-next-line @typescript-eslint/no-explicit-any
sinon.stub(ossActionsProvider, <any>'getMostSevereVulnerability').returns(mostSevereVulnerability);
// eslint-disable-next-line @typescript-eslint/no-explicit-any
sinon.stub(ossActionsProvider, <any>'getActions').returns(codeActions);

// act
Original file line number Diff line number Diff line change
@@ -60,7 +60,7 @@ suite('OSS VulnerabilityCountProvider', () => {
let sampleFileName = 'package.json';
const sameplUri = `file:///Users/some.user/Documents/some-project/${sampleFileName}`;

let languageClientStub: { sendRequest: any };
let languageClientStub: { sendRequest: unknown };
let uriStub;

setup(() => {

0 comments on commit c95a4c2

Please sign in to comment.