Skip to content

Commit 35c438f

Browse files
HweinstockHweinstock
committed
refactor: rename client
1 parent 8b02b85 commit 35c438f

File tree

12 files changed

+29
-36
lines changed

12 files changed

+29
-36
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
import * as vscode from 'vscode'
77
import * as nls from 'vscode-nls'
8-
import { CloudFormationClient, DefaultCloudFormationClient } from '../../../shared/clients/cloudFormationClient'
8+
import { CloudFormationClient, CloudFormationClient } from '../../../shared/clients/cloudFormationClient'
99
import { AWSTreeNodeBase } from '../../../shared/treeview/nodes/awsTreeNodeBase'
1010
import { PlaceholderNode } from '../../../shared/treeview/nodes/placeholderNode'
1111
import { makeChildrenNodes } from '../../../shared/treeview/utils'
@@ -23,7 +23,7 @@ export class ResourcesNode extends AWSTreeNodeBase {
2323

2424
public constructor(
2525
public readonly region: string,
26-
public readonly cloudFormation: CloudFormationClient = new DefaultCloudFormationClient(region),
26+
public readonly cloudFormation: CloudFormationClient = new CloudFormationClient(region),
2727
private readonly cloudControl: CloudControlClient = new DefaultCloudControlClient(region),
2828
private readonly settings = new ResourcesSettings()
2929
) {

‎packages/core/src/lambda/commands/deleteCloudFormation.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import * as nls from 'vscode-nls'
77
const localize = nls.loadMessageBundle()
88

99
import * as vscode from 'vscode'
10-
import { DefaultCloudFormationClient } from '../../shared/clients/cloudFormationClient'
10+
import { CloudFormationClient } from '../../shared/clients/cloudFormationClient'
1111

1212
import * as localizedText from '../../shared/localizedText'
1313
import { getLogger, Logger } from '../../shared/logger/logger'
@@ -45,7 +45,7 @@ export async function deleteCloudFormation(refresh: () => void, node?: CloudForm
4545
})
4646

4747
if (userResponse) {
48-
const client = new DefaultCloudFormationClient(node.regionCode)
48+
const client = new CloudFormationClient(node.regionCode)
4949

5050
await client.deleteStack(stackName)
5151

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ const localize = nls.loadMessageBundle()
99
import { CloudFormation, Lambda } from 'aws-sdk'
1010
import * as os from 'os'
1111
import * as vscode from 'vscode'
12-
import { DefaultCloudFormationClient } from '../../shared/clients/cloudFormationClient'
12+
import { CloudFormationClient } from '../../shared/clients/cloudFormationClient'
1313
import { DefaultLambdaClient } from '../../shared/clients/lambdaClient'
1414

1515
import { AWSResourceNode } from '../../shared/treeview/nodes/awsResourceNode'
@@ -28,7 +28,7 @@ export class CloudFormationNode extends AWSTreeNodeBase {
2828

2929
public constructor(
3030
public override readonly regionCode: string,
31-
private readonly client = new DefaultCloudFormationClient(regionCode)
31+
private readonly client = new CloudFormationClient(regionCode)
3232
) {
3333
super('CloudFormation', vscode.TreeItemCollapsibleState.Collapsed)
3434
this.stackNodes = new Map<string, CloudFormationStackNode>()
@@ -68,7 +68,7 @@ export class CloudFormationStackNode extends AWSTreeNodeBase implements AWSResou
6868
public override readonly regionCode: string,
6969
private stackSummary: CloudFormation.StackSummary,
7070
private readonly lambdaClient = new DefaultLambdaClient(regionCode),
71-
private readonly cloudformationClient = new DefaultCloudFormationClient(regionCode)
71+
private readonly cloudformationClient = new CloudFormationClient(regionCode)
7272
) {
7373
super('', vscode.TreeItemCollapsibleState.Collapsed)
7474

‎packages/core/src/shared/clients/cloudFormationClient.ts‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,9 @@ import { CloudFormation } from 'aws-sdk'
77
import globals from '../extensionGlobals'
88
import { AsyncCollection } from '../utilities/asyncCollection'
99
import { pageableToCollection } from '../utilities/collectionUtils'
10-
import { ClassToInterfaceType, isNonNullable } from '../utilities/tsUtils'
10+
import { isNonNullable } from '../utilities/tsUtils'
1111

12-
export type CloudFormationClient = ClassToInterfaceType<DefaultCloudFormationClient>
13-
export class DefaultCloudFormationClient {
12+
export class CloudFormationClient {
1413
public constructor(public readonly regionCode: string) {}
1514

1615
public async deleteStack(name: string): Promise<void> {

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import { AWSTreeNodeBase } from '../treeview/nodes/awsTreeNodeBase'
88
import { TreeNode, isTreeNode } from '../treeview/resourceTreeDataProvider'
99
import globals from '../../shared/extensionGlobals'
1010
import { ToolkitError } from '../../shared/errors'
11-
import { DefaultCloudFormationClient } from '../clients/cloudFormationClient'
11+
import { CloudFormationClient } from '../clients/cloudFormationClient'
1212
import { S3Client } from '../clients/s3'
1313
import { samDeployUrl } from '../constants'
1414
import { getSpawnEnv } from '../env/resolveEnv'
@@ -115,8 +115,7 @@ export class DeployWizard extends CompositeWizard<DeployParams> {
115115
paramsSource === ParamsSource.Specify || paramsSource === ParamsSource.SpecifyAndSave,
116116
})
117117
this.form.stackName.bindPrompter(
118-
({ region }) =>
119-
createStackPrompter(new DefaultCloudFormationClient(region!), deployMementoRootKey, samDeployUrl),
118+
({ region }) => createStackPrompter(new CloudFormationClient(region!), deployMementoRootKey, samDeployUrl),
120119
{
121120
showWhen: ({ paramsSource }) =>
122121
paramsSource === ParamsSource.Specify || paramsSource === ParamsSource.SpecifyAndSave,

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import * as path from 'path'
1010
import * as localizedText from '../localizedText'
1111
import { S3Client } from '../clients/s3'
1212
import { DataQuickPickItem, createMultiPick, createQuickPick } from '../ui/pickerPrompter'
13-
import { DefaultCloudFormationClient } from '../clients/cloudFormationClient'
13+
import { CloudFormationClient } from '../clients/cloudFormationClient'
1414
import * as CloudFormation from '../cloudformation/cloudformation'
1515
import { DefaultEcrClient } from '../clients/ecrClient'
1616
import { createRegionPrompter } from '../ui/common/region'
@@ -217,8 +217,7 @@ export class SyncWizard extends CompositeWizard<SyncParams> {
217217
})
218218

219219
this.form.stackName.bindPrompter(
220-
({ region }) =>
221-
createStackPrompter(new DefaultCloudFormationClient(region!), syncMementoRootKey, samSyncUrl),
220+
({ region }) => createStackPrompter(new CloudFormationClient(region!), syncMementoRootKey, samSyncUrl),
222221
{
223222
showWhen: ({ paramsSource }) =>
224223
paramsSource === ParamsSource.Specify || paramsSource === ParamsSource.SpecifyAndSave,

‎packages/core/src/shared/ui/sam/stackPrompter.ts‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*/
55
import { StackSummary } from 'aws-sdk/clients/cloudformation'
66
import { getAwsConsoleUrl } from '../../awsConsole'
7-
import { DefaultCloudFormationClient } from '../../clients/cloudFormationClient'
7+
import { CloudFormationClient } from '../../clients/cloudFormationClient'
88
import * as vscode from 'vscode'
99
import { createCommonButtons } from '../buttons'
1010
import { createQuickPick } from '../pickerPrompter'
@@ -27,11 +27,7 @@ const canShowStack = (s: StackSummary) =>
2727
* @returns A quick pick prompter configured for stack selection
2828
*
2929
*/
30-
export function createStackPrompter(
31-
client: DefaultCloudFormationClient,
32-
mementoRootKey: string,
33-
samCommandUrl: vscode.Uri
34-
) {
30+
export function createStackPrompter(client: CloudFormationClient, mementoRootKey: string, samCommandUrl: vscode.Uri) {
3531
const recentStack = getRecentResponse(mementoRootKey, client.regionCode, 'stackName')
3632
const consoleUrl = getAwsConsoleUrl('cloudformation', client.regionCode)
3733
const items = client.listAllStacks().map((stacks) =>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import { ResourceNode } from '../../dynamicResources/explorer/nodes/resourceNode
1313
import { ResourceTypeNode } from '../../dynamicResources/explorer/nodes/resourceTypeNode'
1414
import { formatResourceModel, AwsResourceManager } from '../../dynamicResources/awsResourceManager'
1515
import { CloudControlClient, DefaultCloudControlClient } from '../../shared/clients/cloudControlClient'
16-
import { CloudFormationClient, DefaultCloudFormationClient } from '../../shared/clients/cloudFormationClient'
16+
import { CloudFormationClient, CloudFormationClient } from '../../shared/clients/cloudFormationClient'
1717
import { makeTemporaryToolkitFolder, readFileAsString } from '../../shared/filesystemUtilities'
1818
import { FakeExtensionContext } from '../fakeExtensionContext'
1919
import { existsSync } from 'fs' // eslint-disable-line no-restricted-imports
@@ -51,7 +51,7 @@ describe('ResourceManager', function () {
5151
cloudControl = stub(DefaultCloudControlClient, {
5252
regionCode: '',
5353
})
54-
cloudFormation = stub(DefaultCloudFormationClient, {
54+
cloudFormation = stub(CloudFormationClient, {
5555
regionCode: '',
5656
})
5757
sandbox = sinon.createSandbox()

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import {
1212
contextValueCloudformationLambdaFunction,
1313
} from '../../../lambda/explorer/cloudFormationNodes'
1414
import { LambdaFunctionNode } from '../../../lambda/explorer/lambdaFunctionNode'
15-
import { DefaultCloudFormationClient } from '../../../shared/clients/cloudFormationClient'
15+
import { CloudFormationClient } from '../../../shared/clients/cloudFormationClient'
1616
import { DefaultLambdaClient } from '../../../shared/clients/lambdaClient'
1717
import globals from '../../../shared/extensionGlobals'
1818
import { TestAWSTreeNode } from '../../shared/treeview/nodes/testAWSTreeNode'
@@ -34,7 +34,7 @@ function createLambdaClient(...functionNames: string[]) {
3434
}
3535

3636
function createCloudFormationClient(...stackNames: string[]) {
37-
const client = stub(DefaultCloudFormationClient, { regionCode })
37+
const client = stub(CloudFormationClient, { regionCode })
3838
client.describeStackResources.resolves({ StackResources: [] })
3939
client.listStacks.returns(
4040
asyncGenerator(

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import { samconfigCompleteData, samconfigInvalidData, validTemplateData } from '
1313
import * as SamUtilsModule from '../../../shared/sam/utils'
1414
import assert from 'assert'
1515
import { getTestWindow } from '../vscode/window'
16-
import { DefaultCloudFormationClient } from '../../../shared/clients/cloudFormationClient'
16+
import { CloudFormationClient } from '../../../shared/clients/cloudFormationClient'
1717
import { intoCollection } from '../../../shared/utilities/collectionUtils'
1818
import { clickBackButton, createPromptHandler, PrompterTester } from '../wizards/prompterTester'
1919
import { RegionNode } from '../../../awsexplorer/regionNode'
@@ -42,7 +42,7 @@ describe('SAM DeployWizard', async function () {
4242
let workspaceFolder: vscode.WorkspaceFolder
4343
let templateFile: vscode.Uri
4444

45-
let mockDefaultCFNClient: sinon.SinonStubbedInstance<DefaultCloudFormationClient>
45+
let mockDefaultCFNClient: sinon.SinonStubbedInstance<CloudFormationClient>
4646
let mockDefaultS3Client: sinon.SinonStubbedInstance<S3Client>
4747

4848
beforeEach(async () => {
@@ -52,7 +52,7 @@ describe('SAM DeployWizard', async function () {
5252
sandbox = sinon.createSandbox()
5353

5454
// Simulate return of deployed stacks
55-
mockDefaultCFNClient = sandbox.createStubInstance(CloudFormationClientModule.DefaultCloudFormationClient)
55+
mockDefaultCFNClient = sandbox.createStubInstance(CloudFormationClientModule.CloudFormationClient)
5656
sandbox.stub(CloudFormationClientModule, 'DefaultCloudFormationClient').returns(mockDefaultCFNClient)
5757
mockDefaultCFNClient.listAllStacks.returns(intoCollection(stackSummaries))
5858

0 commit comments

Comments
 (0)