start migration

Author: Hweinstock

packages/core/scripts/build/generateServiceClient.ts

@@ -106,7 +106,7 @@ async function insertServiceClientsIntoJsSdk(
     jsSdkPath: string,
     serviceClientDefinitions: ServiceClientDefinition[]
 ): Promise<void> {
-    serviceClientDefinitions.forEach((serviceClientDefinition) => {
+    for (const serviceClientDefinition of serviceClientDefinitions) {
         const apiVersion = getApiVersion(serviceClientDefinition.serviceJsonPath)
 
         // Copy the Service Json into the JS SDK for generation
@@ -116,7 +116,7 @@ async function insertServiceClientsIntoJsSdk(
             `${serviceClientDefinition.serviceName.toLowerCase()}-${apiVersion}.normal.json`
         )
         nodefs.copyFileSync(serviceClientDefinition.serviceJsonPath, jsSdkServiceJsonPath)
-    })
+    }
 
     const apiMetadataPath = path.join(jsSdkPath, 'apis', 'metadata.json')
     await patchServicesIntoApiMetadata(
@@ -150,10 +150,9 @@ async function patchServicesIntoApiMetadata(apiMetadataPath: string, serviceName
 
     const apiMetadataJson = nodefs.readFileSync(apiMetadataPath).toString()
     const apiMetadata = JSON.parse(apiMetadataJson) as ApiMetadata
-
-    serviceNames.forEach((serviceName) => {
+    for (const serviceName of serviceNames) {
         apiMetadata[serviceName.toLowerCase()] = { name: serviceName }
-    })
+    }
 
     nodefs.writeFileSync(apiMetadataPath, JSON.stringify(apiMetadata, undefined, 4))
 }

packages/core/scripts/lint/testLint.ts

@@ -12,9 +12,9 @@ void (async () => {
         const mocha = new Mocha()
 
         const testFiles = await glob('dist/src/testLint/**/*.test.js')
-        testFiles.forEach((file) => {
+        for (const file of testFiles) {
             mocha.addFile(file)
-        })
+        }
 
         mocha.run((failures) => {
             const exitCode = failures ? 1 : 0

packages/core/src/extensionNode.ts

@@ -60,6 +60,7 @@ import { activate as activateThreatComposerEditor } from './threatComposer/activ
 import { isSsoConnection, hasScopes } from './auth/connection'
 import { CrashMonitoring, setContext } from './shared'
 import { AuthFormId } from './login/webview/vue/types'
+import { addAll } from './shared/utilities/collectionUtils'
 
 let localize: nls.LocalizeFunc
 
@@ -85,10 +86,11 @@ export async function activate(context: vscode.ExtensionContext) {
 
         const toolkitEnvDetails = getExtEnvironmentDetails()
         // Splits environment details by new line, filter removes the empty string
-        toolkitEnvDetails
-            .split(/\r?\n/)
-            .filter(Boolean)
-            .forEach((line) => getLogger().info(line))
+        const logger = getLogger()
+        const linesToLog = toolkitEnvDetails.split(/\r?\n/).filter(Boolean)
+        for (const line of linesToLog) {
+            logger.info(line)
+        }
 
         globals.awsContextCommands = new AwsContextCommands(globals.regionProvider, Auth.instance)
         globals.schemaService = new SchemaService()
@@ -343,17 +345,19 @@ async function getAuthState(): Promise<Omit<AuthUserState, 'source'>> {
     const enabledScopes: Set<string> = new Set()
     if (Auth.instance.hasConnections) {
         authStatus = 'expired'
-        ;(await Auth.instance.listConnections()).forEach((conn) => {
+        const connections = await Auth.instance.listConnections()
+        for (const conn of connections) {
             const state = Auth.instance.getConnectionState(conn)
             if (state === 'valid') {
                 authStatus = 'connected'
             }
+            const connectionsIds = getAuthFormIdsFromConnection(conn)
+            addAll(enabledConnections, connectionsIds)
 
-            getAuthFormIdsFromConnection(conn).forEach((id) => enabledConnections.add(id))
             if (isSsoConnection(conn)) {
-                conn.scopes?.forEach((s) => enabledScopes.add(s))
+                addAll(enabledScopes, conn.scopes ?? [])
             }
-        })
+        }
     }
 
     // There may be other SSO connections in toolkit, but there is no use case for

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

@@ -570,3 +570,9 @@ export function isPresent<T>(value: T | undefined): value is T {
 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)))
 }
+
+export function addAll<T>(s: Set<T>, items: T[]) {
+    for (const item of items) {
+        s.add(item)
+    }
+}