refactor: remove final imports

Author: Hweinstock

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

@@ -11,10 +11,10 @@ import { PlaceholderNode } from '../../../shared/treeview/nodes/placeholderNode'
 import { makeChildrenNodes } from '../../../shared/treeview/utils'
 import { toArrayAsync, updateInPlace } from '../../../shared/utilities/collectionUtils'
 import { ResourceTypeNode } from './resourceTypeNode'
-import { CloudFormation } from 'aws-sdk'
 import { CloudControlClient, DefaultCloudControlClient } from '../../../shared/clients/cloudControlClient'
 import { memoizedGetResourceTypes, ResourceTypeMetadata } from '../../model/resources'
 import { ResourcesSettings } from '../../commands/configure'
+import { TypeSummary } from '@aws-sdk/client-cloudformation'
 
 const localize = nls.loadMessageBundle()
 
@@ -62,7 +62,7 @@ export class ResourcesNode extends AWSTreeNodeBase {
         const types = await toArrayAsync(this.cloudFormation.listTypes())
         types.sort((a, b) => (a.LastUpdated?.getTime() ?? 0) - (b.LastUpdated?.getTime() ?? 0))
 
-        const availableTypes: Map<string, CloudFormation.TypeSummary> = new Map()
+        const availableTypes: Map<string, TypeSummary> = new Map()
         for (const type of types) {
             if (type.TypeName) {
                 availableTypes.set(type.TypeName!, type)

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

@@ -3,9 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { CloudFormation } from 'aws-sdk'
 import * as CloudFormationV3 from '@aws-sdk/client-cloudformation'
-import globals from '../extensionGlobals'
 import { AsyncCollection } from '../utilities/asyncCollection'
 import { hasProps, isNonNullable, RequiredProps } from '../utilities/tsUtils'
 import { ClientWrapper } from './clientWrapper'
@@ -29,21 +27,14 @@ export class CloudFormationClient extends ClientWrapper<CloudFormationV3.CloudFo
         return await this.makeRequest(CloudFormationV3.DeleteStackCommand, { StackName: name })
     }
 
-    public async describeType(typeName: string): Promise<CloudFormation.DescribeTypeOutput> {
-        const client = await this.createSdkClient()
-
-        return await client
-            .describeType({
-                Type: 'RESOURCE',
-                TypeName: typeName,
-            })
-            .promise()
+    public async describeType(typeName: string): Promise<CloudFormationV3.DescribeTypeOutput> {
+        return await this.makeRequest(CloudFormationV3.DescribeTypeCommand, { TypeName: typeName })
     }
 
     public async *listStacks(
-        statusFilter: string[] = ['CREATE_COMPLETE', 'UPDATE_COMPLETE']
+        statusFilter: CloudFormationV3.StackStatus[] = ['CREATE_COMPLETE', 'UPDATE_COMPLETE']
     ): AsyncIterableIterator<StackSummary> {
-        const request: CloudFormation.ListStacksInput = {
+        const request: CloudFormationV3.ListStacksInput = {
             StackStatusFilter: statusFilter,
         }
 
@@ -94,10 +85,6 @@ export class CloudFormationClient extends ClientWrapper<CloudFormationV3.CloudFo
     public async describeStackResources(name: string): Promise<DescribeStackResourcesOutput> {
         return await this.makeRequest(CloudFormationV3.DescribeStackResourcesCommand, { StackName: name })
     }
-
-    private async createSdkClient(): Promise<CloudFormation> {
-        return await globals.sdkClientBuilder.createAwsService(CloudFormation, undefined, this.regionCode)
-    }
 }
 
 function isStackSummary(s: CloudFormationV3.StackSummary | undefined): s is StackSummary {

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

@@ -20,8 +20,9 @@ import { existsSync } from 'fs' // eslint-disable-line no-restricted-imports
 import { ResourceTypeMetadata } from '../../dynamicResources/model/resources'
 import globals from '../../shared/extensionGlobals'
 import { Stub, stub } from '../utilities/stubber'
-import { CloudControl, CloudFormation } from 'aws-sdk'
+import { CloudControl } from 'aws-sdk'
 import { fs } from '../../shared'
+import { DescribeTypeOutput } from '@aws-sdk/client-cloudformation'
 
 describe('ResourceManager', function () {
     let sandbox: sinon.SinonSandbox
@@ -237,7 +238,7 @@ describe('ResourceManager', function () {
         })
         cloudFormation.describeType.callsFake(async (name: string) => {
             if (name === fakeTypeName) {
-                return { Schema: '{}' } as any as CloudFormation.DescribeTypeOutput
+                return { Schema: '{}' } as any as DescribeTypeOutput
             }
             throw new Error()
         })

packages/core/src/test/dynamicResources/explorer/moreResourcesNode.test.ts

@@ -10,11 +10,11 @@ import { ResourceTypeNode } from '../../../dynamicResources/explorer/nodes/resou
 import { CloudFormationClient } from '../../../shared/clients/cloudFormation'
 import { assertNodeListOnlyHasPlaceholderNode } from '../../utilities/explorerNodeAssertions'
 import { asyncGenerator } from '../../../shared/utilities/collectionUtils'
-import { CloudFormation } from 'aws-sdk'
 import { CloudControlClient } from '../../../shared/clients/cloudControlClient'
 import { Settings } from '../../../shared/settings'
 import { ResourcesSettings } from '../../../dynamicResources/commands/configure'
 import sinon from 'sinon'
+import { TypeSummary } from '@aws-sdk/client-cloudformation'
 
 const unsortedText = ['zebra', 'Antelope', 'aardvark', 'elephant']
 const sortedText = ['aardvark', 'Antelope', 'elephant', 'zebra']
@@ -101,8 +101,8 @@ describe('ResourcesNode', function () {
 
     function prepareMock(resourceTypes: string[]) {
         const listStub = sinon.stub().returns(
-            asyncGenerator<CloudFormation.TypeSummary>(
-                resourceTypes.map<CloudFormation.TypeSummary>((resourceType) => {
+            asyncGenerator<TypeSummary>(
+                resourceTypes.map<TypeSummary>((resourceType) => {
                     return {
                         TypeName: resourceType,
                     }