Update deleteManagedEnvironment activity messages and general housekeeping (#431)

MicroFish91 · web-flow · commit 5ecaed708834 · 2023-08-10T13:02:59.000-07:00
diff --git a/src/commands/deleteContainerApp/DeleteAllContainerAppsStep.ts b/src/commands/deleteContainerApp/DeleteAllContainerAppsStep.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.md in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ContainerAppsAPIClient } from "@azure/arm-appcontainers";
+import type { ContainerAppsAPIClient } from "@azure/arm-appcontainers";
 import { AzureWizardExecuteStep, parseError } from "@microsoft/vscode-azext-utils";
-import { Progress, window } from "vscode";
+import type { Progress } from "vscode";
 import { ext } from "../../extensionVariables";
 import { createContainerAppsAPIClient } from "../../utils/azureClients";
 import { localize } from "../../utils/localize";
-import { IDeleteContainerAppWizardContext } from "./IDeleteContainerAppWizardContext";
+import type { IDeleteContainerAppWizardContext } from "./IDeleteContainerAppWizardContext";
 
 export class DeleteAllContainerAppsStep extends AzureWizardExecuteStep<IDeleteContainerAppWizardContext> {
     public priority: number = 100;
@@ -19,13 +19,14 @@ export class DeleteAllContainerAppsStep extends AzureWizardExecuteStep<IDeleteCo
         const webClient: ContainerAppsAPIClient = await createContainerAppsAPIClient([context, context.subscription]);
 
         for (const containerAppName of containerAppNames) {
-            const deleting: string = localize('deletingContainerApp', 'Deleting Container App "{0}"...', containerAppName);
-            const deleteSucceeded: string = localize('deletedContainerApp', 'Successfully deleted Container App "{0}".', containerAppName);
-
             try {
-                ext.outputChannel.appendLog(deleting);
+                const deleting: string = localize('deletingContainerApp', 'Deleting container app "{0}"...', containerAppName);
+                const deleted: string = localize('deletedContainerApp', 'Deleted container app "{0}".', containerAppName);
+
                 progress.report({ message: deleting });
                 await webClient.containerApps.beginDeleteAndWait(context.resourceGroupName, containerAppName);
+
+                ext.outputChannel.appendLog(deleted);
             } catch (error) {
                 const pError = parseError(error);
                 // a 204 indicates a success, but sdk is catching it as an exception
@@ -34,10 +35,6 @@ export class DeleteAllContainerAppsStep extends AzureWizardExecuteStep<IDeleteCo
                     throw error;
                 }
             }
-            if (!context.suppressNotification) {
-                void window.showInformationMessage(deleteSucceeded);
-            }
-            ext.outputChannel.appendLog(deleteSucceeded);
         }
     }
 
diff --git a/src/commands/deleteManagedEnvironment/DeleteEnvironmentConfirmationStep.ts b/src/commands/deleteManagedEnvironment/DeleteEnvironmentConfirmationStep.ts
@@ -6,33 +6,34 @@
 import { AzureWizardPromptStep, DialogResponses, nonNullValue, UserCancelledError } from '@microsoft/vscode-azext-utils';
 import { localize } from '../../utils/localize';
 import { settingUtils } from '../../utils/settingUtils';
-import { IDeleteManagedEnvironmentWizardContext } from './IDeleteManagedEnvironmentWizardContext';
+import type { IDeleteManagedEnvironmentContext } from './IDeleteManagedEnvironmentContext';
 
-export class DeleteEnvironmentConfirmationStep extends AzureWizardPromptStep<IDeleteManagedEnvironmentWizardContext> {
+export class DeleteEnvironmentConfirmationStep extends AzureWizardPromptStep<IDeleteManagedEnvironmentContext> {
     private managedEnvironmentName: string | undefined;
 
-    public async prompt(context: IDeleteManagedEnvironmentWizardContext): Promise<void> {
+    public async prompt(context: IDeleteManagedEnvironmentContext): Promise<void> {
         this.managedEnvironmentName = context.managedEnvironmentName;
 
         const numOfResources = context.containerAppNames.length;
         const hasNoResources: boolean = !numOfResources;
 
-        const deleteEnv: string = localize('confirmDeleteManagedEnv', 'Are you sure you want to delete Container Apps environment "{0}"?', context.managedEnvironmentName);
-        const deleteEnvAndApps: string = localize('confirmDeleteEnvAndApps', 'Are you sure you want to delete Container Apps environment "{0}"? Deleting this will delete {1} Container App(s) in this environment.',
+        const deleteEnv: string = localize('confirmDeleteManagedEnv', 'Are you sure you want to delete container apps environment "{0}"?', this.managedEnvironmentName);
+        const deleteEnvAndApps: string = localize('confirmDeleteEnvAndApps', 'Are you sure you want to delete container apps environment "{0}"? Deleting this will delete {1} container app(s) in this environment.',
             this.managedEnvironmentName, numOfResources);
 
         const deleteConfirmation: string | undefined = settingUtils.getWorkspaceSetting('deleteConfirmation');
         if (deleteConfirmation === 'ClickButton') {
             const message: string = hasNoResources ? deleteEnv : deleteEnvAndApps;
             await context.ui.showWarningMessage(message, { modal: true, stepName: 'confirmDelete' }, DialogResponses.deleteResponse); // no need to check result - cancel will throw error
         } else {
-            const prompt: string = localize('enterToDelete', 'Enter "{0}" to delete this Container Apps environment. Deleting this will delete {1} Container App(s) in this environment.',
+            const prompt: string = localize('enterToDelete', 'Enter "{0}" to delete this container apps environment. Deleting this will delete {1} container app(s) in this environment.',
                 this.managedEnvironmentName, numOfResources);
 
             const result: string = await context.ui.showInputBox({
                 prompt,
                 validateInput: (val: string | undefined) => this.validateInput(val, prompt)
             });
+
             if (!this.isNameEqualToEnvironment(result)) { // Check again just in case `validateInput` didn't prevent the input box from closing
                 context.telemetry.properties.cancelStep = 'mismatchDelete';
                 throw new UserCancelledError();
diff --git a/src/commands/deleteManagedEnvironment/DeleteManagedEnvironmentStep.ts b/src/commands/deleteManagedEnvironment/DeleteManagedEnvironmentStep.ts
@@ -3,24 +3,24 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ContainerAppsAPIClient } from "@azure/arm-appcontainers";
+import type { ContainerAppsAPIClient } from "@azure/arm-appcontainers";
 import { AzureWizardExecuteStep, parseError } from "@microsoft/vscode-azext-utils";
-import { Progress, window } from "vscode";
+import type { Progress } from "vscode";
 import { ext } from "../../extensionVariables";
 import { createContainerAppsAPIClient } from "../../utils/azureClients";
 import { localize } from "../../utils/localize";
-import { IDeleteManagedEnvironmentWizardContext } from "./IDeleteManagedEnvironmentWizardContext";
+import type { IDeleteManagedEnvironmentContext } from "./IDeleteManagedEnvironmentContext";
 
-export class DeleteManagedEnvironmentStep extends AzureWizardExecuteStep<IDeleteManagedEnvironmentWizardContext> {
+export class DeleteManagedEnvironmentStep extends AzureWizardExecuteStep<IDeleteManagedEnvironmentContext> {
     public priority: number = 110;
 
-    public async execute(context: IDeleteManagedEnvironmentWizardContext, progress: Progress<{ message?: string | undefined; increment?: number | undefined }>): Promise<void> {
-        const deleting: string = localize('deletingManagedEnv', 'Deleting Container Apps environment "{0}"... this may take several minutes.', context.managedEnvironmentName);
+    public async execute(context: IDeleteManagedEnvironmentContext, progress: Progress<{ message?: string | undefined; increment?: number | undefined }>): Promise<void> {
         const client: ContainerAppsAPIClient = await createContainerAppsAPIClient([context, context.subscription]);
 
+        const deleting: string = localize('deletingManagedEnv', 'This may take several minutes...');
+        progress.report({ message: deleting });
+
         try {
-            ext.outputChannel.appendLog(deleting);
-            progress.report({ message: deleting });
             await client.managedEnvironments.beginDeleteAndWait(context.resourceGroupName, context.managedEnvironmentName);
         } catch (error) {
             const pError = parseError(error);
@@ -31,14 +31,11 @@ export class DeleteManagedEnvironmentStep extends AzureWizardExecuteStep<IDelete
             }
         }
 
-        const deleteSucceeded: string = localize('deleteManagedEnvSucceeded', 'Successfully deleted Container Apps environment "{0}".', context.managedEnvironmentName);
-        if (!context.suppressNotification) {
-            void window.showInformationMessage(deleteSucceeded);
-        }
-        ext.outputChannel.appendLog(deleteSucceeded);
+        const deleted: string = localize('deletedManagedEnv', 'Deleted container apps environment "{0}".', context.managedEnvironmentName);
+        ext.outputChannel.appendLog(deleted);
     }
 
-    public shouldExecute(context: IDeleteManagedEnvironmentWizardContext): boolean {
-        return !!context.managedEnvironmentName && !!context.resourceGroupName && !!context.subscription;
+    public shouldExecute(context: IDeleteManagedEnvironmentContext): boolean {
+        return !!context.managedEnvironmentName && !!context.resourceGroupName;
     }
 }
diff --git a/src/commands/deleteManagedEnvironment/IDeleteManagedEnvironmentContext.ts b/src/commands/deleteManagedEnvironment/IDeleteManagedEnvironmentContext.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ExecuteActivityContext, IActionContext, ISubscriptionContext } from "@microsoft/vscode-azext-utils";
+import type { ExecuteActivityContext, IActionContext, ISubscriptionContext } from "@microsoft/vscode-azext-utils";
 
-export interface IDeleteManagedEnvironmentWizardContext extends IActionContext, ExecuteActivityContext {
+export interface IDeleteManagedEnvironmentContext extends IActionContext, ExecuteActivityContext {
     subscription: ISubscriptionContext;
     resourceGroupName: string;
     managedEnvironmentName: string;
diff --git a/src/commands/deleteManagedEnvironment/deleteManagedEnvironment.ts b/src/commands/deleteManagedEnvironment/deleteManagedEnvironment.ts
@@ -7,45 +7,43 @@ import { getResourceGroupFromId } from "@microsoft/vscode-azext-azureutils";
 import { AzureWizard, createSubscriptionContext, IActionContext } from "@microsoft/vscode-azext-utils";
 import { ext } from "../../extensionVariables";
 import { ContainerAppItem } from "../../tree/ContainerAppItem";
-import { ManagedEnvironmentItem } from "../../tree/ManagedEnvironmentItem";
+import type { ManagedEnvironmentItem } from "../../tree/ManagedEnvironmentItem";
 import { createActivityContext } from "../../utils/activityUtils";
 import { localize } from "../../utils/localize";
 import { pickEnvironment } from "../../utils/pickItem/pickEnvironment";
 import { DeleteAllContainerAppsStep } from "../deleteContainerApp/DeleteAllContainerAppsStep";
 import { DeleteEnvironmentConfirmationStep } from "./DeleteEnvironmentConfirmationStep";
 import { DeleteManagedEnvironmentStep } from "./DeleteManagedEnvironmentStep";
-import { IDeleteManagedEnvironmentWizardContext } from "./IDeleteManagedEnvironmentWizardContext";
+import type { IDeleteManagedEnvironmentContext } from "./IDeleteManagedEnvironmentContext";
 
-export async function deleteManagedEnvironment(context: IActionContext & { suppressPrompt?: boolean }, node?: ManagedEnvironmentItem): Promise<void> {
+export async function deleteManagedEnvironment(context: IActionContext, node?: ManagedEnvironmentItem): Promise<void> {
     const { subscription, managedEnvironment } = node ?? await pickEnvironment(context, {
         title: localize('deleteContainerAppsEnvironment', 'Delete Container Apps Environment'),
     });
 
     const containerApps = await ContainerAppItem.List(context, subscription, managedEnvironment.id);
     const resourceGroupName = getResourceGroupFromId(managedEnvironment.id);
-    const deleteManagedEnvironment: string = localize('deleteManagedEnvironment', 'Delete Container Apps Environment "{0}"', managedEnvironment.name);
 
-    const wizardContext: IDeleteManagedEnvironmentWizardContext = {
-        activityTitle: deleteManagedEnvironment,
-        containerAppNames: containerApps.map(ca => ca.name),
-        managedEnvironmentName: managedEnvironment.name,
-        resourceGroupName: resourceGroupName,
-        subscription: createSubscriptionContext(subscription),
+    const wizardContext: IDeleteManagedEnvironmentContext = {
         ...context,
-        ...(await createActivityContext())
+        ...await createActivityContext(),
+        subscription: createSubscriptionContext(subscription),
+        resourceGroupName: resourceGroupName,
+        managedEnvironmentName: managedEnvironment.name,
+        containerAppNames: containerApps.map(ca => ca.name),
     };
 
-    const wizard: AzureWizard<IDeleteManagedEnvironmentWizardContext> = new AzureWizard(wizardContext, {
+    const wizard: AzureWizard<IDeleteManagedEnvironmentContext> = new AzureWizard(wizardContext, {
+        title: localize('deleteManagedEnvironment', 'Delete container apps environment "{0}"', managedEnvironment.name),
         promptSteps: [new DeleteEnvironmentConfirmationStep()],
         executeSteps: [new DeleteAllContainerAppsStep(), new DeleteManagedEnvironmentStep()]
     });
 
-    if (!context.suppressPrompt) {
-        await wizard.prompt();
-    }
+    await wizard.prompt();
 
     await ext.state.showDeleting(managedEnvironment.id, async () => {
         await wizard.execute();
     });
+
     ext.branchDataProvider.refresh();
 }
