refactor: add stronger typing

Author: Hweinstock

packages/core/src/awsService/apprunner/wizards/imageRepositoryWizard.ts

@@ -59,7 +59,7 @@ function createEcrRole(client: IamClient): Promise<IamRole> {
             AssumeRolePolicyDocument: JSON.stringify(policy),
         })
         .then((resp) => {
-            const role = resp.Role! as IamRole
+            const role = resp.Role
             return client.attachRolePolicy({ RoleName: role.RoleName, PolicyArn: ecrPolicy }).then(() => role)
         })
 }

packages/core/src/shared/clients/clientWrapper.ts

@@ -28,10 +28,10 @@ export abstract class ClientWrapper<C extends AwsClient> implements vscode.Dispo
             : globals.sdkClientBuilderV3.getAwsService(args)
     }
 
-    protected async makeRequest<CommandInput extends object, Command extends AwsCommand>(
+    protected async makeRequest<CommandInput extends object, CommandOutput extends object, Command extends AwsCommand>(
         command: new (o: CommandInput) => Command,
         commandOptions: CommandInput
-    ) {
+    ): Promise<CommandOutput> {
         return await this.getClient().send(new command(commandOptions))
     }
 

packages/core/src/shared/clients/ec2.ts

@@ -22,6 +22,8 @@ import {
     paginateDescribeIamInstanceProfileAssociations,
     IamInstanceProfile,
     GetConsoleOutputCommand,
+    RebootInstancesCommandOutput,
+    GetConsoleOutputCommandOutput,
 } from '@aws-sdk/client-ec2'
 import { Timeout } from '../utilities/timeoutUtils'
 import { showMessageWithCancel } from '../utilities/messages'
@@ -191,7 +193,7 @@ export class Ec2Client extends ClientWrapper<EC2Client> {
         }
     }
 
-    public async rebootInstance(instanceId: string): Promise<void> {
+    public async rebootInstance(instanceId: string): Promise<RebootInstancesCommandOutput> {
         return await this.makeRequest(RebootInstancesCommand, { InstanceIds: [instanceId] })
     }
 
@@ -233,7 +235,10 @@ export class Ec2Client extends ClientWrapper<EC2Client> {
     }
 
     public async getConsoleOutput(instanceId: string, latest: boolean): Promise<SafeEc2GetConsoleOutputResult> {
-        const response = await this.makeRequest(GetConsoleOutputCommand, { InstanceId: instanceId, Latest: latest })
+        const response: GetConsoleOutputCommandOutput = await this.makeRequest(GetConsoleOutputCommand, {
+            InstanceId: instanceId,
+            Latest: latest,
+        })
 
         return {
             ...response,

packages/core/src/shared/clients/iam.ts

@@ -8,6 +8,7 @@ import {
     AttachRolePolicyCommand,
     AttachRolePolicyRequest,
     CreateRoleCommand,
+    CreateRoleCommandOutput,
     CreateRoleRequest,
     CreateRoleResponse,
     EvaluationResult,
@@ -18,6 +19,7 @@ import {
     paginateListAttachedRolePolicies,
     paginateListRoles,
     PutRolePolicyCommand,
+    PutRolePolicyCommandOutput,
     Role,
     SimulatePolicyResponse,
     SimulatePrincipalPolicyCommand,
@@ -32,6 +34,10 @@ export interface IamRole extends Role {
     Arn: string
 }
 
+export interface IamCreateRoleResponse extends CreateRoleResponse {
+    Role: IamRole
+}
+
 export class IamClient extends ClientWrapper<IAMClient> {
     public constructor(public override readonly regionCode: string) {
         super(regionCode, IAMClient)
@@ -48,8 +54,12 @@ export class IamClient extends ClientWrapper<IAMClient> {
         return this.getRoles(request).flatten().promise()
     }
 
-    public async createRole(request: CreateRoleRequest): Promise<CreateRoleResponse> {
-        return await this.makeRequest(CreateRoleCommand, request)
+    public async createRole(request: CreateRoleRequest): Promise<IamCreateRoleResponse> {
+        const response: CreateRoleCommandOutput = await this.makeRequest(CreateRoleCommand, request)
+        if (!response.Role || !hasRequiredFields(response.Role)) {
+            throw new ToolkitError('Failed to create IAM role')
+        }
+        return response as IamCreateRoleResponse // Safe to assume by check above.
     }
 
     public async attachRolePolicy(request: AttachRolePolicyRequest): Promise<AttachRolePolicyCommand> {
@@ -108,7 +118,11 @@ export class IamClient extends ClientWrapper<IAMClient> {
         return response.InstanceProfile.Roles[0]
     }
 
-    public async putRolePolicy(roleArn: string, policyName: string, policyDocument: string): Promise<void> {
+    public async putRolePolicy(
+        roleArn: string,
+        policyName: string,
+        policyDocument: string
+    ): Promise<PutRolePolicyCommandOutput> {
         return await this.makeRequest(PutRolePolicyCommand, {
             RoleName: this.getFriendlyName(roleArn),
             PolicyName: policyName,