Skip to content

Commit 12e7711

Browse files
committed
fix(cloudformation): refresh stacks after changeset is deleted
1 parent 3de7d27 commit 12e7711

File tree

3 files changed

+10
-26
lines changed

3 files changed

+10
-26
lines changed

packages/core/src/awsService/cloudformation/commands/cfnCommands.ts

Lines changed: 2 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ import {
3131
shouldImportResources,
3232
getResourcesToImport,
3333
getEnvironmentName,
34-
getChangeSetName,
3534
chooseOptionalFlagSuggestion as chooseOptionalFlagMode,
3635
getTags,
3736
getOnStackFailure,
@@ -111,14 +110,8 @@ export function executeChangeSetCommand(client: LanguageClient, coordinator: Sta
111110
}
112111

113112
export function deleteChangeSetCommand(client: LanguageClient) {
114-
return commands.registerCommand(commandKey('stacks.deleteChangeSet'), async (params?: ChangeSetReference) => {
113+
return commands.registerCommand(commandKey('stacks.deleteChangeSet'), async (params: ChangeSetReference) => {
115114
try {
116-
params = params ?? (await promptForChangeSetReference())
117-
118-
if (!params) {
119-
return
120-
}
121-
122115
const changeSetDeletion = new ChangeSetDeletion(params.stackName, params.changeSetName, client)
123116

124117
await changeSetDeletion.delete()
@@ -129,14 +122,8 @@ export function deleteChangeSetCommand(client: LanguageClient) {
129122
}
130123

131124
export function viewChangeSetCommand(client: LanguageClient, diffProvider: DiffWebviewProvider) {
132-
return commands.registerCommand(commandKey('stacks.viewChangeSet'), async (params?: ChangeSetReference) => {
125+
return commands.registerCommand(commandKey('stacks.viewChangeSet'), async (params: ChangeSetReference) => {
133126
try {
134-
params = params ?? (await promptForChangeSetReference())
135-
136-
if (!params) {
137-
return
138-
}
139-
140127
const describeChangeSetResult = await describeChangeSet(client, {
141128
changeSetName: params.changeSetName,
142129
stackName: params.stackName,
@@ -157,16 +144,6 @@ export function viewChangeSetCommand(client: LanguageClient, diffProvider: DiffW
157144
})
158145
}
159146

160-
async function promptForChangeSetReference(): Promise<ChangeSetReference | undefined> {
161-
const stackName = await getStackName()
162-
const changeSetName = await getChangeSetName()
163-
if (!stackName || !changeSetName) {
164-
return undefined
165-
}
166-
167-
return { stackName: stackName, changeSetName: changeSetName }
168-
}
169-
170147
export function deployTemplateCommand(
171148
client: LanguageClient,
172149
diffProvider: DiffWebviewProvider,

packages/core/src/awsService/cloudformation/stacks/actions/changeSetDeletionWorkflow.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ import {
1515
import { deleteChangeSet, describeChangeSetDeletionStatus, getChangeSetDeletionStatus } from './stackActionApi'
1616
import { createChangeSetDeletionParams } from './stackActionUtil'
1717
import { getLogger } from '../../../../shared/logger/logger'
18-
import { extractErrorMessage } from '../../utils'
18+
import { commandKey, extractErrorMessage } from '../../utils'
19+
import { commands } from 'vscode'
1920

2021
export class ChangeSetDeletion {
2122
private readonly id: string
@@ -66,6 +67,7 @@ export class ChangeSetDeletion {
6667
describeDeplomentStatusResult.FailureReason ?? 'No failure reason provided'
6768
)
6869
}
70+
void commands.executeCommand(commandKey('stacks.refresh'))
6971
clearInterval(interval)
7072
break
7173
case StackActionPhase.DELETION_FAILED: {
@@ -77,6 +79,7 @@ export class ChangeSetDeletion {
7779
this.stackName,
7880
describeDeplomentStatusResult.FailureReason ?? 'No failure reason provided'
7981
)
82+
void commands.executeCommand(commandKey('stacks.refresh'))
8083
clearInterval(interval)
8184
break
8285
}
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"type": "Bug Fix",
3+
"description": "Refresh stacks after change set deletion"
4+
}

0 commit comments

Comments
 (0)