refactor: migrate first function

Author: Hweinstock

packages/core/src/dynamicResources/explorer/nodes/resourcesNode.ts

@@ -5,7 +5,7 @@
 
 import * as vscode from 'vscode'
 import * as nls from 'vscode-nls'
-import { CloudFormationClient, CloudFormationClient } from '../../../shared/clients/cloudFormation'
+import { CloudFormationClient } from '../../../shared/clients/cloudFormation'
 import { AWSTreeNodeBase } from '../../../shared/treeview/nodes/awsTreeNodeBase'
 import { PlaceholderNode } from '../../../shared/treeview/nodes/placeholderNode'
 import { makeChildrenNodes } from '../../../shared/treeview/utils'

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

@@ -4,22 +4,20 @@
  */
 
 import { CloudFormation } from 'aws-sdk'
+import * as CloudFormationV3 from '@aws-sdk/client-cloudformation'
 import globals from '../extensionGlobals'
 import { AsyncCollection } from '../utilities/asyncCollection'
 import { pageableToCollection } from '../utilities/collectionUtils'
 import { isNonNullable } from '../utilities/tsUtils'
+import { ClientWrapper } from './clientWrapper'
 
-export class CloudFormationClient {
-    public constructor(public readonly regionCode: string) {}
-
-    public async deleteStack(name: string): Promise<void> {
-        const client = await this.createSdkClient()
+export class CloudFormationClient extends ClientWrapper<CloudFormationV3.CloudFormationClient> {
+    public constructor(regionCode: string) {
+        super(regionCode, CloudFormationV3.CloudFormationClient)
+    }
 
-        await client
-            .deleteStack({
-                StackName: name,
-            })
-            .promise()
+    public async deleteStack(name: string): Promise<CloudFormationV3.DeleteStackCommandOutput> {
+        return await this.makeRequest(CloudFormationV3.DeleteStackCommand, { StackName: name })
     }
 
     public async describeType(typeName: string): Promise<CloudFormation.DescribeTypeOutput> {

packages/core/src/test/dynamicResources/awsResourceManager.test.ts

@@ -13,7 +13,7 @@ import { ResourceNode } from '../../dynamicResources/explorer/nodes/resourceNode
 import { ResourceTypeNode } from '../../dynamicResources/explorer/nodes/resourceTypeNode'
 import { formatResourceModel, AwsResourceManager } from '../../dynamicResources/awsResourceManager'
 import { CloudControlClient, DefaultCloudControlClient } from '../../shared/clients/cloudControlClient'
-import { CloudFormationClient, CloudFormationClient } from '../../shared/clients/cloudFormation'
+import { CloudFormationClient } from '../../shared/clients/cloudFormation'
 import { makeTemporaryToolkitFolder, readFileAsString } from '../../shared/filesystemUtilities'
 import { FakeExtensionContext } from '../fakeExtensionContext'
 import { existsSync } from 'fs' // eslint-disable-line no-restricted-imports

packages/core/src/test/shared/sam/deploy.test.ts

@@ -53,7 +53,7 @@ describe('SAM DeployWizard', async function () {
 
         // Simulate return of deployed stacks
         mockDefaultCFNClient = sandbox.createStubInstance(CloudFormationClientModule.CloudFormationClient)
-        sandbox.stub(CloudFormationClientModule, 'DefaultCloudFormationClient').returns(mockDefaultCFNClient)
+        sandbox.stub(CloudFormationClientModule, 'CloudFormationClient').returns(mockDefaultCFNClient)
         mockDefaultCFNClient.listAllStacks.returns(intoCollection(stackSummaries))
 
         // Simulate return of list bucket

packages/core/src/test/shared/sam/sync.test.ts

@@ -144,7 +144,7 @@ describe('SAM SyncWizard', async () => {
 
         // Simulate return of deployed stacks
         mockDefaultCFNClient = sandbox.createStubInstance(CloudFormationClientModule.CloudFormationClient)
-        sandbox.stub(CloudFormationClientModule, 'DefaultCloudFormationClient').returns(mockDefaultCFNClient)
+        sandbox.stub(CloudFormationClientModule, 'CloudFormationClient').returns(mockDefaultCFNClient)
         mockDefaultCFNClient.listAllStacks.returns(intoCollection(stackSummaries))
 
         // Simulate return of list bucket
@@ -1094,7 +1094,7 @@ describe('SAM runSync', () => {
 
         // Simulate return of deployed stacks
         mockDefaultCFNClient = sandbox.createStubInstance(CloudFormationClientModule.CloudFormationClient)
-        sandbox.stub(CloudFormationClientModule, 'DefaultCloudFormationClient').returns(mockDefaultCFNClient)
+        sandbox.stub(CloudFormationClientModule, 'CloudFormationClient').returns(mockDefaultCFNClient)
         mockDefaultCFNClient.listAllStacks.returns(intoCollection(stackSummaries))
 
         // Simulate return of list bucket