Add backward compatibility to API in support of the new managed identity features

package.json

@@ -378,7 +378,7 @@
                 },
                 {
                     "command": "containerApps.deployContainerApp",
-                    "when": "view =~ /(azureResourceGroups|azureFocusView)/ && viewItem =~ /containerAppItem/i",
+                    "when": "view =~ /(azureResourceGroups|azureFocusView)/ && viewItem =~ /containerAppItem(.*)revisionMode:single/i",
                     "group": "2@1"
                 },
                 {

src/commands/api/CHANGELOG.md

@@ -1,14 +1,17 @@
 # Change Log
 
-### 0.0.2
+### 0.0.3
 
 ### Changed
+* [[816]](https://github.com/microsoft/vscode-azurecontainerapps/pull/816) Added backward compatibility to ensure existing functionality remains unaffected by new managed identity features.
+
+### 0.0.2
 
+### Changed
 * [[615]](https://github.com/microsoft/vscode-azurecontainerapps/pull/615) Removed ability to set option `ignoreExistingDeploySettings`. This will now happen automatically by default.
 
 ## 0.0.1
 * Initial release
 
 ### Added
-
 * [[578]](https://github.com/microsoft/vscode-azurecontainerapps/pull/578) Added an API entry-point to the `deployWorkspaceProject` command

src/commands/api/deployWorkspaceProjectApi.ts

@@ -15,11 +15,21 @@ import { type DeployWorkspaceProjectContext } from "../deployWorkspaceProject/De
 import { getDeployWorkspaceProjectResults, type DeployWorkspaceProjectResults } from "../deployWorkspaceProject/getDeployWorkspaceProjectResults";
 import { type DeployWorkspaceProjectInternalContext } from "../deployWorkspaceProject/internal/DeployWorkspaceProjectInternalContext";
 import { deployWorkspaceProjectInternal } from "../deployWorkspaceProject/internal/deployWorkspaceProjectInternal";
+import { RegistryCredentialType } from "../registryCredentials/RegistryCredentialsAddConfigurationListStep";
 import type * as api from "./vscode-azurecontainerapps.api";
 
 export async function deployWorkspaceProjectApi(deployWorkspaceProjectOptions: api.DeployWorkspaceProjectOptionsContract): Promise<DeployWorkspaceProjectResults> {
     return await callWithTelemetryAndErrorHandling('containerApps.api.deployWorkspaceProject', async (context: IActionContext): Promise<DeployWorkspaceProjectResults> => {
-        const { resourceGroupId, rootPath, dockerfilePath, srcPath, suppressConfirmation, suppressContainerAppCreation, shouldSaveDeploySettings } = deployWorkspaceProjectOptions;
+        const {
+            resourceGroupId,
+            rootPath,
+            dockerfilePath,
+            srcPath,
+            suppressRegistryPrompt,
+            suppressConfirmation,
+            suppressContainerAppCreation,
+            shouldSaveDeploySettings
+        } = deployWorkspaceProjectOptions;
 
         const subscription: AzureSubscription = await subscriptionExperience(context, ext.rgApiV2.resources.azureResourceTreeDataProvider, {
             selectBySubscriptionId: getSubscriptionIdFromOptions(deployWorkspaceProjectOptions),
@@ -38,12 +48,14 @@ export async function deployWorkspaceProjectApi(deployWorkspaceProjectOptions: a
             rootFolder,
             srcPath: srcPath ? Uri.file(srcPath).fsPath : undefined,
             dockerfilePath: dockerfilePath ? Uri.file(dockerfilePath).fsPath : undefined,
+            newRegistryCredentialType: RegistryCredentialType.DockerLogin,
             shouldSaveDeploySettings: !!shouldSaveDeploySettings,
         });
 
         const deployWorkspaceProjectContext: DeployWorkspaceProjectContext = await deployWorkspaceProjectInternal(deployWorkspaceProjectInternalContext, {
             suppressActivity: true,
             suppressConfirmation,
+            suppressRegistryPrompt: suppressRegistryPrompt ?? true,
             suppressContainerAppCreation,
             suppressProgress: true,
             suppressWizardTitle: true,

src/commands/api/getAzureContainerAppsApiProvider.ts

@@ -9,7 +9,7 @@ import type * as api from "./vscode-azurecontainerapps.api";
 
 export function getAzureContainerAppsApiProvider(): apiUtils.AzureExtensionApiProvider {
     return createApiProvider([<api.AzureContainerAppsExtensionApi>{
-        // Todo: Change this to 0.0.2 later.  0.0.2 is backwards compatible anyway so this change should be fine either way.
+        // Todo: Change this to 0.0.3 later.  0.0.3 is backwards compatible anyway so this change should be fine either way.
         // For some reason it's causing a block on Function side, so just keep it at 0.0.1 until we figure out why
         apiVersion: '0.0.1',
         deployWorkspaceProject: deployWorkspaceProjectApi

src/commands/api/vscode-azurecontainerapps.api.d.ts

@@ -19,6 +19,7 @@ export interface DeployWorkspaceProjectOptionsContract {
     dockerfilePath?: string;
 
     // Options
+    suppressRegistryPrompt?: boolean;
     suppressConfirmation?: boolean;  // Suppress any [resource] confirmation prompts
     suppressContainerAppCreation?: boolean;
     shouldSaveDeploySettings?: boolean;

src/commands/deployContainerApp/deployContainerApp.ts

@@ -3,6 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { KnownActiveRevisionsMode } from "@azure/arm-appcontainers";
 import { type ResourceGroup } from "@azure/arm-resources";
 import { LocationListStep, ResourceGroupListStep } from "@microsoft/vscode-azext-azureutils";
 import { activityInfoIcon, activitySuccessContext, AzureWizard, createSubscriptionContext, createUniversallyUniqueContextValue, GenericTreeItem, nonNullProp, nonNullValue, type IActionContext, type ISubscriptionActionContext, type ISubscriptionContext } from "@microsoft/vscode-azext-utils";
@@ -25,6 +26,13 @@ export async function deployContainerApp(context: IActionContext, node?: Contain
     const subscriptionContext: ISubscriptionContext = createSubscriptionContext(item.subscription);
     const subscriptionActionContext: ISubscriptionActionContext = { ...context, ...subscriptionContext };
 
+    if (item.containerApp.revisionsMode === KnownActiveRevisionsMode.Multiple) {
+        throw new Error(localize('multipleRevisionsNotSupported', 'The container app "{0}" cannot be updated using "Deploy to Container App..." while in multiple revisions mode.', item.containerApp.name));
+    }
+    if ((item.containerApp.template?.containers?.length ?? 0) > 1) {
+        throw new Error(localize('multipleContainersNotSupported', 'The container app "{0}" cannot be updated using "Deploy to Container App..." while having more than one active container.', item.containerApp.name));
+    }
+
     // Prompt for image source before initializing the wizard in case we need to redirect the call to 'deployWorkspaceProject' instead
     const imageSource: ImageSource = await promptImageSource(subscriptionActionContext);
     if (imageSource === ImageSource.RemoteAcrBuild) {
@@ -40,6 +48,7 @@ export async function deployContainerApp(context: IActionContext, node?: Contain
         managedEnvironment: await getManagedEnvironmentFromContainerApp(subscriptionActionContext, item.containerApp),
         imageSource,
     };
+    wizardContext.telemetry.properties.revisionMode = item.containerApp.revisionsMode;
 
     if (isAzdExtensionInstalled()) {
         wizardContext.telemetry.properties.isAzdExtensionInstalled = 'true';

src/commands/deployWorkspaceProject/deploymentConfiguration/getTreeItemDeploymentConfiguration.ts

@@ -9,7 +9,6 @@ import { ManagedEnvironmentItem } from "../../../tree/ManagedEnvironmentItem";
 import { type IContainerAppContext } from "../../IContainerAppContext";
 import { RootFolderStep } from "../../image/imageSource/buildImageInAzure/RootFolderStep";
 import { type DeploymentConfiguration } from "./DeploymentConfiguration";
-import { TryUseExistingWorkspaceRegistryStep } from "./workspace/azureResources/TryUseExistingWorkspaceRegistryStep";
 
 type TreeItemDeploymentConfigurationContext = IContainerAppContext & DeploymentConfiguration;
 
@@ -18,7 +17,6 @@ export async function getTreeItemDeploymentConfiguration(context: IContainerAppC
 
     const wizard: AzureWizard<TreeItemDeploymentConfigurationContext> = new AzureWizard(wizardContext, {
         promptSteps: [new RootFolderStep()],
-        executeSteps: [new TryUseExistingWorkspaceRegistryStep()]
     });
 
     await wizard.prompt();

src/commands/deployWorkspaceProject/deploymentConfiguration/workspace/getWorkspaceDeploymentConfiguration.ts

@@ -12,7 +12,6 @@ import { RootFolderStep } from "../../../image/imageSource/buildImageInAzure/Roo
 import { type DeploymentConfiguration } from "../DeploymentConfiguration";
 import { DeploymentConfigurationListStep } from "./DeploymentConfigurationListStep";
 import { type WorkspaceDeploymentConfigurationContext } from "./WorkspaceDeploymentConfigurationContext";
-import { TryUseExistingWorkspaceRegistryStep } from "./azureResources/TryUseExistingWorkspaceRegistryStep";
 
 export async function getWorkspaceDeploymentConfiguration(context: IContainerAppContext & { rootFolder?: WorkspaceFolder }): Promise<DeploymentConfiguration> {
     const wizardContext: WorkspaceDeploymentConfigurationContext = Object.assign(context, {
@@ -25,9 +24,6 @@ export async function getWorkspaceDeploymentConfiguration(context: IContainerApp
             new RootFolderStep(),
             new DeploymentConfigurationListStep(),
         ],
-        executeSteps: [
-            new TryUseExistingWorkspaceRegistryStep()
-        ]
     });
 
     await wizard.prompt();

src/commands/deployWorkspaceProject/internal/ShouldSaveDeploySettingsPromptStep.ts

@@ -20,15 +20,22 @@ export class ShouldSaveDeploySettingsPromptStep extends AzureWizardPromptStep<De
             const settings: DeploymentConfigurationSettings[] | undefined = await dwpSettingUtilsV2.getWorkspaceDeploymentConfigurations(rootFolder);
             const setting: DeploymentConfigurationSettings | undefined = settings?.[context.configurationIdx];
 
+            const hasNewResourceGroupSetting: boolean = (!!context.newResourceGroupName && setting?.resourceGroup !== context.newResourceGroupName) ||
+                (!!context.resourceGroup && setting?.resourceGroup !== context.resourceGroup.name);
+            const hasNewContainerAppSetting: boolean = (!!context.newContainerAppName && setting?.containerApp !== context.newContainerAppName) ||
+                (!!context.containerApp && setting?.containerApp !== context.containerApp.name);
+            const hasNewRegistrySetting: boolean = (!!context.newRegistryName && setting?.containerRegistry !== context.newRegistryName) ||
+                (!!context.registry && setting?.containerRegistry !== context.registry.name);
+
             const hasNewSettings: boolean =
                 !setting?.label ||
                 setting?.type !== 'AcrDockerBuildRequest' ||
                 (context.dockerfilePath && convertRelativeToAbsolutePath(rootPath, setting?.dockerfilePath) !== context.dockerfilePath) ||
                 (context.envPath && convertRelativeToAbsolutePath(rootPath, setting?.envPath) !== context.envPath) ||
                 (context.srcPath && convertRelativeToAbsolutePath(rootPath, setting?.srcPath) !== context.srcPath) ||
-                (!!context.resourceGroup && setting?.resourceGroup !== context.resourceGroup.name) ||
-                (!!context.containerApp && setting?.containerApp !== context.containerApp.name) ||
-                (!!context.registry && setting?.containerRegistry !== context.registry.name);
+                hasNewResourceGroupSetting ||
+                hasNewContainerAppSetting ||
+                hasNewRegistrySetting;
 
             if (!hasNewSettings) {
                 context.telemetry.properties.hasNewSettings = 'false';

src/commands/deployWorkspaceProject/internal/deployWorkspaceProjectInternal.ts

@@ -3,6 +3,7 @@
 *  Licensed under the MIT License. See License.md in the project root for license information.
 *--------------------------------------------------------------------------------------------*/
 
+import { KnownActiveRevisionsMode } from "@azure/arm-appcontainers";
 import { LocationListStep, ResourceGroupCreateStep } from "@microsoft/vscode-azext-azureutils";
 import { AzureWizard, GenericTreeItem, activityInfoIcon, activitySuccessContext, createUniversallyUniqueContextValue, nonNullValueAndProp, type AzureWizardExecuteStep, type AzureWizardPromptStep, type ExecuteActivityContext } from "@microsoft/vscode-azext-utils";
 import { ProgressLocation, window } from "vscode";
@@ -31,6 +32,10 @@ export interface DeployWorkspaceProjectInternalOptions {
      * Suppress showing the wizard execution through the activity log
      */
     suppressActivity?: boolean;
+    /**
+     * Suppress registry selection prompt
+     */
+    suppressRegistryPrompt?: boolean;
     /**
      * Suppress any [resource] confirmation prompts
      */
@@ -75,9 +80,16 @@ export async function deployWorkspaceProjectInternal(
             undefined :
             localize('loadingWorkspaceTitle', 'Loading workspace project starting configurations...')
     }, async () => {
-        startingConfiguration = await getStartingConfiguration({ ...context });
+        startingConfiguration = await getStartingConfiguration({ ...context }, options);
     });
 
+    if (startingConfiguration?.containerApp?.revisionsMode === KnownActiveRevisionsMode.Multiple) {
+        throw new Error(localize('multipleRevisionsNotSupported', 'The container app "{0}" cannot be updated using "Deploy Project from Workspace..." while in multiple revisions mode.', startingConfiguration?.containerApp?.name));
+    }
+    if ((startingConfiguration?.containerApp?.template?.containers?.length ?? 0) > 1) {
+        throw new Error(localize('multipleContainersNotSupported', 'The container app "{0}" cannot be updated using "Deploy Project from Workspace..." while having more than one active container.', startingConfiguration?.containerApp?.name));
+    }
+
     const wizardContext: DeployWorkspaceProjectInternalContext = {
         ...context,
         ...activityContext,

src/commands/deployWorkspaceProject/internal/startingConfiguration/DwpAcrListStep.ts

@@ -0,0 +1,39 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { type Registry } from "@azure/arm-containerregistry";
+import { AzureWizardPromptStep, type IAzureQuickPickItem } from "@microsoft/vscode-azext-utils";
+import { localize } from "../../../../utils/localize";
+import { isRecommendedPick } from "../../../../utils/pickUtils";
+import { acrCreatePick, AcrListStep } from "../../../image/imageSource/containerRegistry/acr/AcrListStep";
+import { type DeployWorkspaceProjectInternalContext } from "../DeployWorkspaceProjectInternalContext";
+
+export class DwpAcrListStep<T extends DeployWorkspaceProjectInternalContext> extends AzureWizardPromptStep<T> {
+    public async prompt(context: T): Promise<void> {
+        const picks: IAzureQuickPickItem<Registry | undefined>[] = await this.getPicks(context);
+        if (!picks.length) {
+            // No container registries to choose from
+            return;
+        }
+
+        const placeHolder: string = localize('selectContainerRegistry', 'Select an Azure Container Registry to store your image');
+        const pick: IAzureQuickPickItem<Registry | undefined> = await context.ui.showQuickPick(picks, { placeHolder, suppressPersistence: true });
+
+        context.telemetry.properties.usedRecommendedRegistry = isRecommendedPick(pick) ? 'true' : 'false';
+        context.registry = pick.data;
+    }
+
+    public shouldPrompt(context: T): boolean {
+        return !context.registry;
+    }
+
+    public async getPicks(context: T): Promise<IAzureQuickPickItem<Registry | undefined>[]> {
+        return [
+            acrCreatePick,
+            ...await AcrListStep.getSortedAndRecommendedPicks(context),
+        ];
+    }
+}
+