refactor: migrate more pieces of the client

Author: Hweinstock

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

@@ -14,6 +14,12 @@ export interface StackSummary
     extends RequiredProps<CloudFormationV3.StackSummary, 'StackName' | 'CreationTime' | 'StackStatus'> {
     DriftInformation: RequiredProps<CloudFormationV3.StackDriftInformation, 'StackDriftStatus'>
 }
+
+export type StackResource = RequiredProps<CloudFormationV3.StackResource, 'ResourceType'>
+
+export interface DescribeStackResourcesOutput extends CloudFormationV3.DescribeStackResourcesOutput {
+    StackResources: StackResource[]
+}
 export class CloudFormationClient extends ClientWrapper<CloudFormationV3.CloudFormationClient> {
     public constructor(regionCode: string) {
         super(regionCode, CloudFormationV3.CloudFormationClient)
@@ -64,17 +70,18 @@ export class CloudFormationClient extends ClientWrapper<CloudFormationV3.CloudFo
         ).map((s) => s.filter(isStackSummary))
     }
 
-    public async *listTypes(): AsyncIterableIterator<CloudFormation.TypeSummary> {
-        const client = await this.createSdkClient()
-
-        const request: CloudFormation.ListTypesInput = {
+    public async *listTypes(): AsyncIterableIterator<CloudFormationV3.TypeSummary> {
+        const request: CloudFormationV3.ListTypesInput = {
             DeprecatedStatus: 'LIVE',
             Type: 'RESOURCE',
             Visibility: 'PUBLIC',
         }
 
         do {
-            const response: CloudFormation.ListTypesOutput = await client.listTypes(request).promise()
+            const response: CloudFormationV3.ListTypesOutput = await this.makeRequest(
+                CloudFormationV3.ListTypesCommand,
+                request
+            )
 
             if (response.TypeSummaries) {
                 yield* response.TypeSummaries
@@ -84,14 +91,8 @@ export class CloudFormationClient extends ClientWrapper<CloudFormationV3.CloudFo
         } while (request.NextToken)
     }
 
-    public async describeStackResources(name: string): Promise<CloudFormation.DescribeStackResourcesOutput> {
-        const client = await this.createSdkClient()
-
-        return await client
-            .describeStackResources({
-                StackName: name,
-            })
-            .promise()
+    public async describeStackResources(name: string): Promise<DescribeStackResourcesOutput> {
+        return await this.makeRequest(CloudFormationV3.DescribeStackResourcesCommand, { StackName: name })
     }
 
     private async createSdkClient(): Promise<CloudFormation> {

packages/core/src/test/lambda/explorer/cloudFormationNodes.test.ts

@@ -4,15 +4,14 @@
  */
 
 import assert from 'assert'
-import { CloudFormation } from 'aws-sdk'
 import * as os from 'os'
 import {
     CloudFormationNode,
     CloudFormationStackNode,
     contextValueCloudformationLambdaFunction,
 } from '../../../lambda/explorer/cloudFormationNodes'
 import { LambdaFunctionNode } from '../../../lambda/explorer/lambdaFunctionNode'
-import { CloudFormationClient, StackSummary } from '../../../shared/clients/cloudFormation'
+import { CloudFormationClient, StackResource, StackSummary } from '../../../shared/clients/cloudFormation'
 import { DefaultLambdaClient } from '../../../shared/clients/lambdaClient'
 import globals from '../../../shared/extensionGlobals'
 import { TestAWSTreeNode } from '../../shared/treeview/nodes/testAWSTreeNode'
@@ -78,11 +77,11 @@ describe('CloudFormationStackNode', function () {
         return new CloudFormationStackNode(parentNode, regionCode, summary, lambdaClient, cloudFormationClient)
     }
 
-    function generateStackResources(...functionNames: string[]): CloudFormation.StackResource[] {
+    function generateStackResources(...functionNames: string[]): StackResource[] {
         return functionNames.map((name) => ({
             PhysicalResourceId: name,
             LogicalResourceId: name,
-            ResourceStatus: 'CREATED',
+            ResourceStatus: 'CREATE_COMPLETE',
             ResourceType: 'Lambda::Function',
             Timestamp: new globals.clock.Date(),
         }))