fully remove forEach async

Author: Hweinstock

packages/core/src/awsService/ec2/activation.ts

@@ -21,6 +21,7 @@ import {
 import { Ec2ConnecterMap } from './connectionManagerMap'
 import { ec2LogsScheme } from '../../shared/constants'
 import { Ec2LogDocumentProvider } from './ec2LogDocumentProvider'
+import { mapOverMap } from '../../shared/utilities/collectionUtils'
 
 const connectionManagers = new Ec2ConnecterMap()
 
@@ -83,5 +84,5 @@ export async function activate(ctx: ExtContext): Promise<void> {
 }
 
 export async function deactivate(): Promise<void> {
-    connectionManagers.forEach(async (manager) => await manager.dispose())
+    await mapOverMap(connectionManagers, async (_, manager) => await manager.dispose())
 }

packages/core/src/awsService/ec2/remoteSessionManager.ts

@@ -6,6 +6,7 @@
 import { EC2, SSM } from 'aws-sdk'
 import { SsmClient } from '../../shared/clients/ssmClient'
 import { Disposable } from 'vscode'
+import { mapOverMap } from '../../shared/utilities/collectionUtils'
 
 export class Ec2SessionTracker extends Map<EC2.InstanceId, SSM.SessionId> implements Disposable {
     public constructor(
@@ -31,7 +32,7 @@ export class Ec2SessionTracker extends Map<EC2.InstanceId, SSM.SessionId> implem
     }
 
     public async dispose(): Promise<void> {
-        this.forEach(async (_sessionId, instanceId) => await this.disconnectEnv(instanceId))
+        await mapOverMap(this, async (_, instanceId) => await this.disconnectEnv(instanceId))
     }
 
     public isConnectedTo(instanceId: EC2.InstanceId): boolean {

packages/core/src/codewhisperer/service/importAdderProvider.ts

@@ -55,7 +55,7 @@ export class ImportAdderProvider implements vscode.CodeLensProvider {
         ) {
             const line = findLineToInsertImportStatement(editor, firstLineOfRecommendation)
             let mergedStatements = ``
-            r.mostRelevantMissingImports?.forEach(async (i) => {
+            r.mostRelevantMissingImports?.forEach((i) => {
                 // trust service response that this to-be-added import is necessary
                 if (i.statement) {
                     mergedStatements += i.statement + '\n'

packages/core/src/shared/utilities/collectionUtils.ts

@@ -566,3 +566,7 @@ export function createCollectionFromPages<T>(...pages: T[]): AsyncCollection<T>
 export function isPresent<T>(value: T | undefined): value is T {
     return value !== undefined
 }
+
+export async function mapOverMap<K, V, O>(m: Map<K, V>, f: (k: K, v: V) => Promise<O>): Promise<O[]> {
+    return await Promise.all(Array.from(m).map(async ([k, v]) => await f(k, v)))
+}

packages/core/src/test/lambda/commands/listSamResources.test.ts

@@ -62,7 +62,7 @@ describe('listSamResources', () => {
             { name: 'stringify array', value: '[]' },
             { name: 'array object', value: [] },
         ]
-        testcases.forEach(async ({ name, value }) => {
+        testcases.forEach(({ name, value }) => {
             it(`returns empty array given SAM CLI return ${name} given any issue`, async () => {
                 runSamCliListResourceStub.resolves(value)
 

packages/core/src/test/shared/fs/fs.test.ts

@@ -218,15 +218,15 @@ describe('FileSystem', function () {
     describe('mkdir()', function () {
         const paths = ['a', 'a/b', 'a/b/c', 'a/b/c/d/']
 
-        paths.forEach(async function (p) {
+        paths.forEach(function (p) {
             it(`creates folder: '${p}'`, async function () {
                 const dirPath = testFolder.pathFrom(p)
                 await fs.mkdir(dirPath)
                 assert(existsSync(dirPath))
             })
         })
 
-        paths.forEach(async function (p) {
+        paths.forEach(function (p) {
             it(`creates folder but uses the "fs" module if in Cloud9: '${p}'`, async function () {
                 sandbox.stub(extensionUtilities, 'isCloud9').returns(true)
                 const dirPath = testFolder.pathFrom(p)