From 99f9406a2db21b9aa3a39e2e4fcabedfa9b6d946 Mon Sep 17 00:00:00 2001 From: AaronvDiepen Date: Thu, 17 Mar 2022 11:57:58 +0100 Subject: [PATCH] Implemented changes suggested by Deepsource.io Signed-off-by: AaronvDiepen --- packages/cli/src/commands/plugin/diff.ts | 2 +- packages/config-loader/src/loader.ts | 2 +- .../AuthSessionStore.test.ts | 2 +- .../src/lib/BitbucketRepositoryParser.test.ts | 2 +- .../src/lib/BitbucketRepositoryParser.ts | 27 +++++++++---------- .../service/fact/FactRetrieverEngine.test.ts | 2 +- .../entityMetadataFactRetriever.ts | 2 +- .../entityOwnershipFactRetriever.ts | 2 +- .../factRetrievers/techdocsFactRetriever.ts | 2 +- .../persistence/TechInsightsDatabase.ts | 4 +-- scripts/prepare-release.js | 2 +- 11 files changed, 24 insertions(+), 25 deletions(-) diff --git a/packages/cli/src/commands/plugin/diff.ts b/packages/cli/src/commands/plugin/diff.ts index 153bd16597..9a2a3b2e3e 100644 --- a/packages/cli/src/commands/plugin/diff.ts +++ b/packages/cli/src/commands/plugin/diff.ts @@ -63,7 +63,7 @@ export default async (cmd: Command) => { const data = await readPluginData(); const templateFiles = await diffTemplateFiles('default-plugin', data); await handleAllFiles(fileHandlers, templateFiles, promptFunc); - await finalize(); + finalize(); }; // Reads templating data from the existing plugin diff --git a/packages/config-loader/src/loader.ts b/packages/config-loader/src/loader.ts index 9a3287e285..7ceb2e8548 100644 --- a/packages/config-loader/src/loader.ts +++ b/packages/config-loader/src/loader.ts @@ -226,7 +226,7 @@ export async function loadConfig( } } - const envConfigs = await readEnvConfig(process.env); + const envConfigs = readEnvConfig(process.env); const watchConfigFile = (watchProp: LoadConfigOptionsWatch) => { let watchedFiles = Array.from(loadedPaths); diff --git a/packages/core-app-api/src/lib/AuthSessionManager/AuthSessionStore.test.ts b/packages/core-app-api/src/lib/AuthSessionManager/AuthSessionStore.test.ts index 83d6035171..3f8622890b 100644 --- a/packages/core-app-api/src/lib/AuthSessionManager/AuthSessionStore.test.ts +++ b/packages/core-app-api/src/lib/AuthSessionManager/AuthSessionStore.test.ts @@ -185,7 +185,7 @@ describe('GheAuth AuthSessionStore', () => { await expect( withLogCollector(async () => { - await secondStore.setSession('no' as any); + secondStore.setSession('no' as any); }), ).resolves.toMatchObject({ warn: [ diff --git a/plugins/catalog-backend-module-bitbucket/src/lib/BitbucketRepositoryParser.test.ts b/plugins/catalog-backend-module-bitbucket/src/lib/BitbucketRepositoryParser.test.ts index 58845fc3d1..41f467ebaa 100644 --- a/plugins/catalog-backend-module-bitbucket/src/lib/BitbucketRepositoryParser.test.ts +++ b/plugins/catalog-backend-module-bitbucket/src/lib/BitbucketRepositoryParser.test.ts @@ -30,7 +30,7 @@ describe('BitbucketRepositoryParser', () => { presence: 'optional', }), ]; - const actual = await defaultRepositoryParser({ + const actual = defaultRepositoryParser({ target: `${browseUrl}${path}`, }); diff --git a/plugins/catalog-backend-module-bitbucket/src/lib/BitbucketRepositoryParser.ts b/plugins/catalog-backend-module-bitbucket/src/lib/BitbucketRepositoryParser.ts index 57a162e1e4..0afaf79db3 100644 --- a/plugins/catalog-backend-module-bitbucket/src/lib/BitbucketRepositoryParser.ts +++ b/plugins/catalog-backend-module-bitbucket/src/lib/BitbucketRepositoryParser.ts @@ -34,17 +34,16 @@ export type BitbucketRepositoryParser = (options: { logger: Logger; }) => AsyncIterable; -export const defaultRepositoryParser = - async function* defaultRepositoryParser(options: { - target: string; - presence?: 'optional' | 'required'; - }) { - yield processingResult.location({ - type: 'url', - target: options.target, - // Not all locations may actually exist, since the user defined them as a wildcard pattern. - // Thus, we emit them as optional and let the downstream processor find them while not outputting - // an error if it couldn't. - presence: options.presence ?? 'optional', - }); - }; +export function* defaultRepositoryParser(options: { + target: string; + presence?: 'optional' | 'required'; +}) { + yield processingResult.location({ + type: 'url', + target: options.target, + // Not all locations may actually exist, since the user defined them as a wildcard pattern. + // Thus, we emit them as optional and let the downstream processor find them while not outputting + // an error if it couldn't. + presence: options.presence ?? 'optional', + }); +} diff --git a/plugins/tech-insights-backend/src/service/fact/FactRetrieverEngine.test.ts b/plugins/tech-insights-backend/src/service/fact/FactRetrieverEngine.test.ts index 8d1f7180a3..1b5dad1f33 100644 --- a/plugins/tech-insights-backend/src/service/fact/FactRetrieverEngine.test.ts +++ b/plugins/tech-insights-backend/src/service/fact/FactRetrieverEngine.test.ts @@ -144,7 +144,7 @@ describe('FactRetrieverEngine', () => { engine.schedule(); const job: any = engine.getJob('test-factretriever'); job.triggerScheduledJobNow(); - expect(job.cadence!!).toEqual(cadence); + expect(job.cadence!).toEqual(cadence); expect(testFactRetriever.handler).toHaveBeenCalledWith( expect.objectContaining({ entityFilter: testFactRetriever.entityFilter }), ); diff --git a/plugins/tech-insights-backend/src/service/fact/factRetrievers/entityMetadataFactRetriever.ts b/plugins/tech-insights-backend/src/service/fact/factRetrievers/entityMetadataFactRetriever.ts index 535aede115..26b1e4274b 100644 --- a/plugins/tech-insights-backend/src/service/fact/factRetrievers/entityMetadataFactRetriever.ts +++ b/plugins/tech-insights-backend/src/service/fact/factRetrievers/entityMetadataFactRetriever.ts @@ -53,7 +53,7 @@ export const entityMetadataFactRetriever: FactRetriever = { return entities.items.map((entity: Entity) => { return { entity: { - namespace: entity.metadata.namespace!!, + namespace: entity.metadata.namespace!, kind: entity.kind, name: entity.metadata.name, }, diff --git a/plugins/tech-insights-backend/src/service/fact/factRetrievers/entityOwnershipFactRetriever.ts b/plugins/tech-insights-backend/src/service/fact/factRetrievers/entityOwnershipFactRetriever.ts index 8f61f182ad..b9a91e67f7 100644 --- a/plugins/tech-insights-backend/src/service/fact/factRetrievers/entityOwnershipFactRetriever.ts +++ b/plugins/tech-insights-backend/src/service/fact/factRetrievers/entityOwnershipFactRetriever.ts @@ -51,7 +51,7 @@ export const entityOwnershipFactRetriever: FactRetriever = { return entities.items.map((entity: Entity) => { return { entity: { - namespace: entity.metadata.namespace!!, + namespace: entity.metadata.namespace!, kind: entity.kind, name: entity.metadata.name, }, diff --git a/plugins/tech-insights-backend/src/service/fact/factRetrievers/techdocsFactRetriever.ts b/plugins/tech-insights-backend/src/service/fact/factRetrievers/techdocsFactRetriever.ts index c1c3ba5d20..2717f94475 100644 --- a/plugins/tech-insights-backend/src/service/fact/factRetrievers/techdocsFactRetriever.ts +++ b/plugins/tech-insights-backend/src/service/fact/factRetrievers/techdocsFactRetriever.ts @@ -49,7 +49,7 @@ export const techdocsFactRetriever: FactRetriever = { return entities.items.map((entity: Entity) => { return { entity: { - namespace: entity.metadata.namespace!!, + namespace: entity.metadata.namespace!, kind: entity.kind, name: entity.metadata.name, }, diff --git a/plugins/tech-insights-backend/src/service/persistence/TechInsightsDatabase.ts b/plugins/tech-insights-backend/src/service/persistence/TechInsightsDatabase.ts index ddb90b75cd..3507e280a1 100644 --- a/plugins/tech-insights-backend/src/service/persistence/TechInsightsDatabase.ts +++ b/plugins/tech-insights-backend/src/service/persistence/TechInsightsDatabase.ts @@ -62,7 +62,7 @@ export class TechInsightsDatabase implements TechInsightsStore { return Object.values(groupedSchemas) .map(schemas => { const sorted = rsort(schemas.map(it => it.version)); - return schemas.find(it => it.version === sorted[0])!!; + return schemas.find(it => it.version === sorted[0])!; }) .map((it: RawDbFactSchemaRow) => ({ ...omit(it, 'schema'), @@ -188,7 +188,7 @@ export class TechInsightsDatabase implements TechInsightsStore { throw new Error(`No schema found for ${id}. `); } const sorted = rsort(existingSchemas.map(it => it.version)); - return existingSchemas.find(it => it.version === sorted[0])!!; + return existingSchemas.find(it => it.version === sorted[0])!; } private async deleteExpiredFactsByDate( diff --git a/scripts/prepare-release.js b/scripts/prepare-release.js index c4a790b2cc..ad783c4609 100755 --- a/scripts/prepare-release.js +++ b/scripts/prepare-release.js @@ -259,7 +259,7 @@ async function updateBackstageReleaseVersion(repo, type) { } } else if (type === 'patch') { if (preMode) { - throw new Error(`Unexpected pre mode ${preMode} on branch ${branchName}`); + throw new Error(`Unexpected pre mode ${preMode} on current branch`); } nextVersion = semver.inc(currentVersion, 'patch'); }