refactor delay logic into remoteSession

Author: Hweinstock

src/ec2/model.ts

@@ -17,7 +17,7 @@ import {
     ensureDependencies,
     getDeniedSsmActions,
     openRemoteTerminal,
-    promptToAddPolicies,
+    promptToAddInlinePolicy,
 } from '../shared/remoteSession'
 import { DefaultIamClient } from '../shared/clients/iamClient'
 import { ErrorInformation } from '../shared/errors'
@@ -38,7 +38,6 @@ interface Ec2RemoteEnv extends VscodeRemoteConnection {
 
 const ec2ConnectScriptPrefix = 'ec2_connect'
 const hostNamePrefix = 'ec2-'
-const policyAttachDelay = 5000
 
 export class Ec2ConnectionManager {
     protected ssmClient: SsmClient
@@ -128,7 +127,7 @@ export class Ec2ConnectionManager {
         const hasPermission = await this.hasProperPermissions(IamRole!.Arn)
 
         if (!hasPermission) {
-            const policiesAdded = await promptToAddPolicies(this.iamClient, IamRole!.Arn!)
+            const policiesAdded = await promptToAddInlinePolicy(this.iamClient, IamRole!.Arn!)
 
             if (!policiesAdded) {
                 const message = `Did not add permissions. Ensure an IAM role with the proper permissions is attached to the instance. Found attached role: ${
@@ -139,13 +138,6 @@ export class Ec2ConnectionManager {
                     documentationUri: this.policyDocumentationUri,
                 })
             }
-            const timeout = new Timeout(policyAttachDelay)
-
-            function delay(ms: number) {
-                return new Promise(resolve => setTimeout(resolve, ms))
-            }
-            await showMessageWithCancel(`Adding Inline Policy to ${IamRole!.Arn}`, timeout)
-            await delay(policyAttachDelay).finally(() => timeout.cancel())
         }
     }
 

src/shared/remoteSession.ts

@@ -35,6 +35,8 @@ const minimumSsmActions = [
     'ssmmessages:OpenDataChannel',
 ]
 
+const policyAttachDelay = 5000
+
 export async function openRemoteTerminal(options: vscode.TerminalOptions, onClose: () => void) {
     const timeout = new Timeout(60000)
 
@@ -187,19 +189,31 @@ export async function getDeniedSsmActions(client: IamClient, roleArn: string): P
     return deniedActions
 }
 
-export async function promptToAddPolicies(client: IamClient, roleArn: string): Promise<boolean> {
+export async function promptToAddInlinePolicy(client: IamClient, roleArn: string): Promise<boolean> {
     const promptText = `${
         getIdeProperties().company
     } Toolkit will add required actions to role ${roleArn}:\n${getFormattedSsmActions()}`
     const confirmation = await showConfirmationMessage({ prompt: promptText, confirm: 'Approve' })
 
     if (confirmation) {
-        addSsmActionsToInlinePolicy(client, roleArn)
+        await addInlinePolicyWithDelay(client, roleArn)
     }
 
     return confirmation
 }
 
+async function addInlinePolicyWithDelay(client: IamClient, roleArn: string) {
+    const timeout = new Timeout(policyAttachDelay)
+    await showMessageWithCancel(`Adding Inline Policy to ${roleArn}`, timeout)
+    await addSsmActionsToInlinePolicy(client, roleArn)
+
+    function delay(ms: number) {
+        return new Promise(resolve => setTimeout(resolve, ms))
+    }
+
+    await delay(policyAttachDelay).finally(() => timeout.cancel())
+}
+
 function getFormattedSsmActions() {
     const formattedActions = minimumSsmActions.map(action => `"${action}",\n`).reduce((l, r) => l + r)