Add Microsoft.ContainerRegistry provider to the verify providers list (#558)

MicroFish91 · web-flow · commit 18be7d5ccd06 · 2023-11-05T20:27:23.000-08:00
diff --git a/src/commands/createContainerApp/createContainerApp.ts b/src/commands/createContainerApp/createContainerApp.ts
@@ -4,14 +4,14 @@
  *--------------------------------------------------------------------------------------------*/
 
 import type { ResourceGroup } from "@azure/arm-resources";
-import { LocationListStep, ResourceGroupListStep, VerifyProvidersStep } from "@microsoft/vscode-azext-azureutils";
+import { LocationListStep, ResourceGroupListStep } from "@microsoft/vscode-azext-azureutils";
 import { AzureWizard, AzureWizardExecuteStep, AzureWizardPromptStep, IActionContext, createSubscriptionContext, nonNullProp, nonNullValue, nonNullValueAndProp } from "@microsoft/vscode-azext-utils";
-import { webProvider } from "../../constants";
 import { ext } from "../../extensionVariables";
 import { ContainerAppItem } from "../../tree/ContainerAppItem";
 import type { ManagedEnvironmentItem } from "../../tree/ManagedEnvironmentItem";
 import { createActivityContext } from "../../utils/activity/activityUtils";
 import { isAzdExtensionInstalled } from "../../utils/azdUtils";
+import { getVerifyProvidersStep } from "../../utils/getVerifyProvidersStep";
 import { localize } from "../../utils/localize";
 import { pickEnvironment } from "../../utils/pickItem/pickEnvironment";
 import { ImageSourceListStep } from "../image/imageSource/ImageSourceListStep";
@@ -42,7 +42,7 @@ export async function createContainerApp(context: IActionContext, node?: Managed
     ];
 
     const executeSteps: AzureWizardExecuteStep<CreateContainerAppContext>[] = [
-        new VerifyProvidersStep([webProvider]),
+        getVerifyProvidersStep<CreateContainerAppContext>(),
         new ContainerAppCreateStep(),
     ];
 
diff --git a/src/commands/createManagedEnvironment/createManagedEnvironment.ts b/src/commands/createManagedEnvironment/createManagedEnvironment.ts
@@ -3,12 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { LocationListStep, ResourceGroupCreateStep, VerifyProvidersStep } from "@microsoft/vscode-azext-azureutils";
+import { LocationListStep, ResourceGroupCreateStep } from "@microsoft/vscode-azext-azureutils";
 import { AzureWizard, AzureWizardExecuteStep, AzureWizardPromptStep, IActionContext, createSubscriptionContext, nonNullProp, subscriptionExperience } from "@microsoft/vscode-azext-utils";
 import { AzureSubscription } from "@microsoft/vscode-azureresources-api";
-import { appProvider, managedEnvironmentsId, operationalInsightsProvider } from "../../constants";
+import { appProvider, managedEnvironmentsId } from "../../constants";
 import { ext } from "../../extensionVariables";
 import { createActivityContext } from "../../utils/activity/activityUtils";
+import { getVerifyProvidersStep } from "../../utils/getVerifyProvidersStep";
 import { localize } from "../../utils/localize";
 import { IManagedEnvironmentContext } from "./IManagedEnvironmentContext";
 import { LogAnalyticsCreateStep } from "./LogAnalyticsCreateStep";
@@ -30,7 +31,12 @@ export async function createManagedEnvironment(context: IActionContext, node?: {
     const executeSteps: AzureWizardExecuteStep<IManagedEnvironmentContext>[] = [];
 
     promptSteps.push(new ManagedEnvironmentNameStep());
-    executeSteps.push(new VerifyProvidersStep([appProvider, operationalInsightsProvider]), new ResourceGroupCreateStep(), new LogAnalyticsCreateStep(), new ManagedEnvironmentCreateStep());
+    executeSteps.push(
+        getVerifyProvidersStep<IManagedEnvironmentContext>(),
+        new ResourceGroupCreateStep(),
+        new LogAnalyticsCreateStep(),
+        new ManagedEnvironmentCreateStep()
+    );
     LocationListStep.addProviderForFiltering(wizardContext, appProvider, managedEnvironmentsId);
     LocationListStep.addStep(wizardContext, promptSteps);
 
diff --git a/src/commands/deployWorkspaceProject/deployWorkspaceProject.ts b/src/commands/deployWorkspaceProject/deployWorkspaceProject.ts
@@ -3,17 +3,18 @@
 *  Licensed under the MIT License. See License.md in the project root for license information.
 *--------------------------------------------------------------------------------------------*/
 
-import { LocationListStep, ResourceGroupCreateStep, VerifyProvidersStep } from "@microsoft/vscode-azext-azureutils";
+import { LocationListStep, ResourceGroupCreateStep } from "@microsoft/vscode-azext-azureutils";
 import { AzureWizard, AzureWizardExecuteStep, AzureWizardPromptStep, GenericTreeItem, IActionContext, ISubscriptionContext, callWithTelemetryAndErrorHandling, createSubscriptionContext, nonNullProp, nonNullValueAndProp, subscriptionExperience } from "@microsoft/vscode-azext-utils";
 import type { AzureSubscription } from "@microsoft/vscode-azureresources-api";
 import { ProgressLocation, window } from "vscode";
-import { activityInfoIcon, activitySuccessContext, appProvider, managedEnvironmentsId, operationalInsightsProvider, webProvider } from "../../constants";
+import { activityInfoIcon, activitySuccessContext, appProvider, managedEnvironmentsId } from "../../constants";
 import { ext } from "../../extensionVariables";
 import { SetTelemetryProps } from "../../telemetry/SetTelemetryProps";
 import { DeployWorkspaceProjectNotificationTelemetryProps as NotificationTelemetryProps } from "../../telemetry/commandTelemetryProps";
 import { ContainerAppItem, ContainerAppModel, isIngressEnabled } from "../../tree/ContainerAppItem";
 import { ManagedEnvironmentItem } from "../../tree/ManagedEnvironmentItem";
 import { createActivityChildContext, createActivityContext } from "../../utils/activity/activityUtils";
+import { getVerifyProvidersStep } from "../../utils/getVerifyProvidersStep";
 import { localize } from "../../utils/localize";
 import { browseContainerApp } from "../browseContainerApp";
 import { ContainerAppCreateStep } from "../createContainerApp/ContainerAppCreateStep";
@@ -63,8 +64,6 @@ export async function deployWorkspaceProject(context: IActionContext, item?: Con
         new DeployWorkspaceProjectSaveSettingsStep()
     ];
 
-    const providers: string[] = [];
-
     // Resource group
     if (wizardContext.resourceGroup) {
         wizardContext.telemetry.properties.existingResourceGroup = 'true';
@@ -112,11 +111,6 @@ export async function deployWorkspaceProject(context: IActionContext, item?: Con
             new LogAnalyticsCreateStep(),
             new ManagedEnvironmentCreateStep()
         );
-
-        providers.push(
-            appProvider,
-            operationalInsightsProvider
-        );
     }
 
     // Azure Container Registry
@@ -135,8 +129,8 @@ export async function deployWorkspaceProject(context: IActionContext, item?: Con
 
         ext.outputChannel.appendLog(localize('usingAcr', 'Using Azure Container Registry "{0}".', registryName));
     } else {
-        wizardContext.telemetry.properties.existingRegistry = 'false';
         // ImageSourceListStep can already handle this creation logic
+        wizardContext.telemetry.properties.existingRegistry = 'false';
     }
 
     // Container app
@@ -170,10 +164,8 @@ export async function deployWorkspaceProject(context: IActionContext, item?: Con
         new IngressPromptStep(),
     );
 
-    providers.push(webProvider);
-
     // Verify providers
-    executeSteps.push(new VerifyProvidersStep(providers));
+    executeSteps.push(getVerifyProvidersStep<DeployWorkspaceProjectContext>());
 
     // Location
     if (LocationListStep.hasLocation(wizardContext)) {
diff --git a/src/commands/image/deployImageApi/deployImage.ts b/src/commands/image/deployImageApi/deployImage.ts
@@ -3,11 +3,10 @@
 *  Licensed under the MIT License. See License.md in the project root for license information.
 *--------------------------------------------------------------------------------------------*/
 
-import { VerifyProvidersStep } from "@microsoft/vscode-azext-azureutils";
 import { AzureWizard, AzureWizardExecuteStep, AzureWizardPromptStep, IActionContext, createSubscriptionContext } from "@microsoft/vscode-azext-utils";
-import { webProvider } from "../../../constants";
 import type { ContainerAppItem } from "../../../tree/ContainerAppItem";
 import { createActivityContext } from "../../../utils/activity/activityUtils";
+import { getVerifyProvidersStep } from "../../../utils/getVerifyProvidersStep";
 import { localize } from "../../../utils/localize";
 import { ContainerAppOverwriteConfirmStep } from "../../ContainerAppOverwriteConfirmStep";
 import { showContainerAppNotification } from "../../createContainerApp/showContainerAppNotification";
@@ -35,7 +34,7 @@ export async function deployImage(context: IActionContext & Partial<ContainerReg
     ];
 
     const executeSteps: AzureWizardExecuteStep<DeployImageApiContext>[] = [
-        new VerifyProvidersStep([webProvider]),
+        getVerifyProvidersStep<DeployImageApiContext>(),
         new ContainerAppUpdateStep()
     ];
 
diff --git a/src/commands/image/imageSource/containerRegistry/acr/createAcr/createAcr.ts b/src/commands/image/imageSource/containerRegistry/acr/createAcr/createAcr.ts
@@ -8,6 +8,7 @@ import { AzureWizard, AzureWizardExecuteStep, AzureWizardPromptStep, IActionCont
 import { AzureSubscription } from "@microsoft/vscode-azureresources-api";
 import { ext } from "../../../../../../extensionVariables";
 import { createActivityContext } from "../../../../../../utils/activity/activityUtils";
+import { getVerifyProvidersStep } from "../../../../../../utils/getVerifyProvidersStep";
 import { localize } from "../../../../../../utils/localize";
 import { CreateAcrContext } from "./CreateAcrContext";
 import { RegistryCreateStep } from "./RegistryCreateStep";
@@ -31,6 +32,7 @@ export async function createAcr(context: IActionContext, node?: { subscription:
     ];
 
     const executeSteps: AzureWizardExecuteStep<CreateAcrContext>[] = [
+        getVerifyProvidersStep<CreateAcrContext>(),
         new ResourceGroupCreateStep(),
         new RegistryCreateStep(),
     ];
diff --git a/src/commands/image/updateImage/updateImage.ts b/src/commands/image/updateImage/updateImage.ts
@@ -4,16 +4,15 @@
 *--------------------------------------------------------------------------------------------*/
 
 import { KnownActiveRevisionsMode, Revision } from "@azure/arm-appcontainers";
-import { VerifyProvidersStep } from "@microsoft/vscode-azext-azureutils";
 import { AzureWizard, AzureWizardExecuteStep, AzureWizardPromptStep, ExecuteActivityContext, IActionContext, createSubscriptionContext } from "@microsoft/vscode-azext-utils";
-import { webProvider } from "../../../constants";
 import { ext } from "../../../extensionVariables";
 import { SetTelemetryProps } from "../../../telemetry/SetTelemetryProps";
 import { UpdateImageTelemetryProps as TelemetryProps } from "../../../telemetry/commandTelemetryProps";
 import type { ContainerAppItem, ContainerAppModel } from "../../../tree/ContainerAppItem";
 import type { RevisionDraftItem } from "../../../tree/revisionManagement/RevisionDraftItem";
 import type { RevisionItem } from "../../../tree/revisionManagement/RevisionItem";
 import { createActivityContext } from "../../../utils/activity/activityUtils";
+import { getVerifyProvidersStep } from "../../../utils/getVerifyProvidersStep";
 import { localize } from "../../../utils/localize";
 import { pickContainerApp } from "../../../utils/pickItem/pickContainerApp";
 import { pickRevision, pickRevisionDraft } from "../../../utils/pickItem/pickRevision";
@@ -62,7 +61,7 @@ export async function updateImage(context: IActionContext, node?: ContainerAppIt
     ];
 
     const executeSteps: AzureWizardExecuteStep<UpdateImageContext>[] = [
-        new VerifyProvidersStep([webProvider]),
+        getVerifyProvidersStep<UpdateImageContext>(),
         new UpdateRegistryAndSecretsStep(),
         new UpdateImageDraftStep(item)
     ];
diff --git a/src/constants.ts b/src/constants.ts
@@ -11,6 +11,7 @@ export const managedEnvironmentsId = 'managedEnvironments';
 export const containerAppsId = 'containerApps';
 export const appProvider: string = 'Microsoft.App';
 export const webProvider: string = 'Microsoft.Web';
+export const registryProvider: string = 'Microsoft.ContainerRegistry';
 export const operationalInsightsProvider: string = 'Microsoft.OperationalInsights';
 
 export const containerAppsWebProvider: string = `${webProvider}/${containerAppsId}`;
diff --git a/src/utils/getVerifyProvidersStep.ts b/src/utils/getVerifyProvidersStep.ts
@@ -0,0 +1,20 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.md in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { VerifyProvidersStep } from "@microsoft/vscode-azext-azureutils";
+import type { ISubscriptionActionContext } from "@microsoft/vscode-azext-utils";
+import { appProvider, operationalInsightsProvider, registryProvider, webProvider } from "../constants";
+
+/**
+ * Use to obtain a `VerifyProvidersStep` that registers all known container app providers to the user's subscription
+ */
+export function getVerifyProvidersStep<T extends ISubscriptionActionContext>(): VerifyProvidersStep<T> {
+    return new VerifyProvidersStep<T>([
+        appProvider,
+        operationalInsightsProvider,
+        webProvider,
+        registryProvider
+    ]);
+}
