Merge pull request #10287 from AaronvDiepen/master

Implement code changes as suggested by analysis tools

.changeset/silent-bobcats-matter.md

@@ -0,0 +1,9 @@
+---
+'@backstage/cli': patch
+'@backstage/config-loader': patch
+'@backstage/core-app-api': patch
+'@backstage/plugin-catalog-backend-module-bitbucket': patch
+'@backstage/plugin-tech-insights-backend': patch
+---
+
+Implemented changes suggested by Deepsource.io including multiple double non-null assertion operators and unexpected awaits for non-promise values.

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

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);

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: [

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}`,
       });
 

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 }),
     );

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,
         },

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,
         },

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,
         },

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(

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');
   }