Skip to content

Commit 75d3537

Browse files
justinmk3justinmk3
authored
refactor: eliminate commands.ts #3980
Problem: `commands.ts` is unnecessary and deprecated. Solution: Replace use of `commands.ts`
1 parent 4077c07 commit 75d3537

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+423
-608
lines changed

‎src/ec2/explorer/ec2ParentNode.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import { PlaceholderNode } from '../../shared/treeview/nodes/placeholderNode'
99
import { Ec2InstanceNode } from './ec2InstanceNode'
1010
import { Ec2Client } from '../../shared/clients/ec2Client'
1111
import { updateInPlace } from '../../shared/utilities/collectionUtils'
12-
import { Commands } from '../../shared/vscode/commands'
1312

1413
export const parentContextValue = 'awsEc2ParentNode'
1514
export type Ec2Node = Ec2InstanceNode | Ec2ParentNode
@@ -56,6 +55,6 @@ export class Ec2ParentNode extends AWSTreeNodeBase {
5655

5756
public async refreshNode(): Promise<void> {
5857
this.clearChildren()
59-
Commands.vscode().execute('aws.refreshAwsExplorerNode', this)
58+
vscode.commands.executeCommand('aws.refreshAwsExplorerNode', this)
6059
}
6160
}

‎src/ecr/commands/createRepository.ts‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,12 @@
66
import * as vscode from 'vscode'
77
import { getLogger } from '../../shared/logger'
88
import { EcrNode } from '../explorer/ecrNode'
9-
import { Commands } from '../../shared/vscode/commands'
109
import { localize } from '../../shared/utilities/vsCodeUtils'
1110
import { showViewLogsMessage } from '../../shared/utilities/messages'
1211
import { validateRepositoryName } from '../utils'
1312
import { telemetry } from '../../shared/telemetry/telemetry'
1413

15-
export async function createRepository(node: EcrNode, commands = Commands.vscode()): Promise<void> {
14+
export async function createRepository(node: EcrNode): Promise<void> {
1615
getLogger().debug('createRepository called for %O', node)
1716

1817
const repositoryName = await vscode.window.showInputBox({
@@ -43,6 +42,6 @@ export async function createRepository(node: EcrNode, commands = Commands.vscode
4342
)
4443
telemetry.ecr_createRepository.emit({ result: 'Failed' })
4544
} finally {
46-
await commands.execute('aws.refreshAwsExplorerNode', node)
45+
await vscode.commands.executeCommand('aws.refreshAwsExplorerNode', node)
4746
}
4847
}

‎src/ecr/commands/deleteRepository.ts‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,11 @@
66
import * as vscode from 'vscode'
77
import { getLogger } from '../../shared/logger'
88
import { EcrRepositoryNode } from '../explorer/ecrRepositoryNode'
9-
import { Commands } from '../../shared/vscode/commands'
109
import { localize } from '../../shared/utilities/vsCodeUtils'
1110
import { showViewLogsMessage } from '../../shared/utilities/messages'
1211
import { telemetry } from '../../shared/telemetry/telemetry'
1312

14-
export async function deleteRepository(node: EcrRepositoryNode, commands = Commands.vscode()): Promise<void> {
13+
export async function deleteRepository(node: EcrRepositoryNode): Promise<void> {
1514
getLogger().debug('DeleteRepository called for %O', node)
1615

1716
const repositoryName = node.repository.repositoryName
@@ -40,7 +39,7 @@ export async function deleteRepository(node: EcrRepositoryNode, commands = Comma
4039
)
4140
telemetry.ecr_deleteRepository.emit({ result: 'Failed' })
4241
} finally {
43-
await commands.execute('aws.refreshAwsExplorerNode', node.parent)
42+
await vscode.commands.executeCommand('aws.refreshAwsExplorerNode', node.parent)
4443
}
4544
}
4645

‎src/ecr/commands/deleteTag.ts‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,13 @@
44
*/
55

66
import * as vscode from 'vscode'
7-
import { Commands } from '../../shared/vscode/commands'
87
import { EcrTagNode } from '../explorer/ecrTagNode'
98
import { getLogger } from '../../shared/logger'
109
import { localize } from '../../shared/utilities/vsCodeUtils'
1110
import { showConfirmationMessage, showViewLogsMessage } from '../../shared/utilities/messages'
1211
import { telemetry } from '../../shared/telemetry/telemetry'
1312

14-
export async function deleteTag(node: EcrTagNode, commands = Commands.vscode()): Promise<void> {
13+
export async function deleteTag(node: EcrTagNode): Promise<void> {
1514
getLogger().debug('deleteTag called for %O', node)
1615
const ok = await showConfirmationMessage({
1716
prompt: localize(
@@ -54,6 +53,6 @@ export async function deleteTag(node: EcrTagNode, commands = Commands.vscode()):
5453
)
5554
telemetry.ecr_deleteTags.emit({ result: 'Failed', value: 1 })
5655
} finally {
57-
await commands.execute('aws.refreshAwsExplorerNode', node.parent)
56+
await vscode.commands.executeCommand('aws.refreshAwsExplorerNode', node.parent)
5857
}
5958
}

‎src/iot/commands/attachCertificate.ts‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import * as vscode from 'vscode'
77
import { getLogger } from '../../shared/logger'
88
import { localize } from '../../shared/utilities/vsCodeUtils'
9-
import { Commands } from '../../shared/vscode/commands'
109
import { IotThingNode } from '../explorer/iotThingNode'
1110
import { showViewLogsMessage } from '../../shared/utilities/messages'
1211
import { createQuickPick, DataQuickPickItem } from '../../shared/ui/pickerPrompter'
@@ -24,11 +23,7 @@ export type CertGen = typeof getCertList
2423
* Attaches the certificate.
2524
* Refreshes the thing node.
2625
*/
27-
export async function attachCertificateCommand(
28-
node: IotThingNode,
29-
promptFun = promptForCert,
30-
commands = Commands.vscode()
31-
): Promise<void> {
26+
export async function attachCertificateCommand(node: IotThingNode, promptFun = promptForCert): Promise<void> {
3227
getLogger().debug('AttachCertificate called for %O', node)
3328

3429
const thingName = node.thing.name
@@ -52,7 +47,7 @@ export async function attachCertificateCommand(
5247
getLogger().debug('Attached certificate %O', cert.certificateId)
5348

5449
//Refresh the Thing node
55-
await node.refreshNode(commands)
50+
await node.refreshNode()
5651
}
5752

5853
/**

‎src/iot/commands/attachPolicy.ts‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import * as vscode from 'vscode'
77
import { getLogger } from '../../shared/logger'
88
import { localize } from '../../shared/utilities/vsCodeUtils'
9-
import { Commands } from '../../shared/vscode/commands'
109
import { showViewLogsMessage } from '../../shared/utilities/messages'
1110
import { createQuickPick, DataQuickPickItem } from '../../shared/ui/pickerPrompter'
1211
import { PromptResult } from '../../shared/ui/prompter'
@@ -27,8 +26,7 @@ export type PolicyGen = typeof getPolicyList
2726
*/
2827
export async function attachPolicyCommand(
2928
node: IotThingCertNode | IotCertWithPoliciesNode,
30-
promptFun = promptForPolicy,
31-
commands = Commands.vscode()
29+
promptFun = promptForPolicy
3230
): Promise<void> {
3331
getLogger().debug('AttachPolicy called for %O', node)
3432

@@ -53,8 +51,8 @@ export async function attachPolicyCommand(
5351
/* Refresh both things and certificates nodes so the status is updated in
5452
* both trees. */
5553
const baseNode = getBaseNode(node)
56-
await baseNode.thingFolderNode?.refreshNode(commands)
57-
await baseNode.certFolderNode?.refreshNode(commands)
54+
await baseNode.thingFolderNode?.refreshNode()
55+
await baseNode.certFolderNode?.refreshNode()
5856
}
5957

6058
/**

‎src/iot/commands/createCert.ts‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import * as vscode from 'vscode'
77
import * as fs from 'fs-extra'
88
import * as path from 'path'
99
import { getLogger } from '../../shared/logger'
10-
import { Commands } from '../../shared/vscode/commands'
1110
import { localize } from '../../shared/utilities/vsCodeUtils'
1211
import { showViewLogsMessage } from '../../shared/utilities/messages'
1312
import { IotCertsFolderNode } from '../explorer/iotCertFolderNode'
@@ -25,8 +24,7 @@ const PEM_FILE_ENCODING = 'ascii'
2524
export async function createCertificateCommand(
2625
node: IotCertsFolderNode,
2726
promptFunc = promptForSaveLocation,
28-
saveFunc = saveCredentials,
29-
commands = Commands.vscode()
27+
saveFunc = saveCredentials
3028
): Promise<void> {
3129
getLogger().debug('CreateCertificate called for %O', node)
3230

@@ -75,7 +73,7 @@ export async function createCertificateCommand(
7573
}
7674

7775
//Refresh the Certificate Folder node
78-
await node.refreshNode(commands)
76+
await node.refreshNode()
7977
}
8078

8179
/**

‎src/iot/commands/createPolicy.ts‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,14 @@
66
import * as vscode from 'vscode'
77
import * as fs from 'fs-extra'
88
import { getLogger } from '../../shared/logger'
9-
import { Commands } from '../../shared/vscode/commands'
109
import { localize } from '../../shared/utilities/vsCodeUtils'
1110
import { showViewLogsMessage } from '../../shared/utilities/messages'
1211
import { IotPolicyFolderNode } from '../explorer/iotPolicyFolderNode'
1312

1413
/**
1514
* Creates a policy from a policy document.
1615
*/
17-
export async function createPolicyCommand(
18-
node: IotPolicyFolderNode,
19-
getPolicyDoc = getPolicyDocument,
20-
commands = Commands.vscode()
21-
): Promise<void> {
16+
export async function createPolicyCommand(node: IotPolicyFolderNode, getPolicyDoc = getPolicyDocument): Promise<void> {
2217
getLogger().debug('CreatePolicy called for %O', node)
2318

2419
const data = await getPolicyDoc()
@@ -49,7 +44,7 @@ export async function createPolicyCommand(
4944
}
5045

5146
//Refresh the Policy Folder node
52-
await node.refreshNode(commands)
47+
await node.refreshNode()
5348
}
5449

5550
export async function getPolicyDocument(): Promise<Buffer | undefined> {

‎src/iot/commands/createPolicyVersion.ts‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66
import * as vscode from 'vscode'
77
import { getLogger } from '../../shared/logger'
8-
import { Commands } from '../../shared/vscode/commands'
98
import { localize } from '../../shared/utilities/vsCodeUtils'
109
import { showViewLogsMessage } from '../../shared/utilities/messages'
1110
import { IotPolicyWithVersionsNode } from '../explorer/iotPolicyNode'
@@ -16,8 +15,7 @@ import { getPolicyDocument } from './createPolicy'
1615
*/
1716
export async function createPolicyVersionCommand(
1817
node: IotPolicyWithVersionsNode,
19-
getPolicyDoc = getPolicyDocument,
20-
commands = Commands.vscode()
18+
getPolicyDoc = getPolicyDocument
2119
): Promise<void> {
2220
getLogger().debug('CreatePolicyVersion called for %O', node)
2321

‎src/iot/commands/createThing.ts‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import * as vscode from 'vscode'
77
import { getLogger } from '../../shared/logger'
88
import { localize } from '../../shared/utilities/vsCodeUtils'
9-
import { Commands } from '../../shared/vscode/commands'
109
import { showViewLogsMessage } from '../../shared/utilities/messages'
1110
import { IotThingFolderNode } from '../explorer/iotThingFolderNode'
1211

@@ -17,7 +16,7 @@ import { IotThingFolderNode } from '../explorer/iotThingFolderNode'
1716
* Creates the thing.
1817
* Refreshes the node.
1918
*/
20-
export async function createThingCommand(node: IotThingFolderNode, commands = Commands.vscode()): Promise<void> {
19+
export async function createThingCommand(node: IotThingFolderNode): Promise<void> {
2120
getLogger().debug('CreateThing called for: %O', node)
2221

2322
const thingName = await vscode.window.showInputBox({
@@ -43,7 +42,7 @@ export async function createThingCommand(node: IotThingFolderNode, commands = Co
4342
}
4443

4544
//Refresh the Things Folder node
46-
await node.refreshNode(commands)
45+
await node.refreshNode()
4746
}
4847

4948
/**

0 commit comments

Comments
 (0)