Fix errors related to updating "@azure/arm-containerregistry" dependency (#284)

* Fix errors from updating dependency

* Suggested changes

Author: motm32

package-lock.json

@@ -321,7 +321,7 @@
     },
     "dependencies": {
         "@azure/arm-appcontainers": "^1.1.0",
-        "@azure/arm-containerregistry": "^8.1.1",
+        "@azure/arm-containerregistry": "^10.0.0",
         "@azure/arm-operationalinsights": "^8.0.0",
         "@azure/arm-resources": "^4.2.2",
         "@azure/container-registry": "1.0.0-beta.5",

package.json

@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import type { ContainerRegistryManagementModels } from '@azure/arm-containerregistry';
+import type { Registry } from '@azure/arm-containerregistry';
 import { SupportedRegistries } from '../../../constants';
 import { IDeployBaseContext } from "../IDeployBaseContext";
 
 export interface IDeployFromRegistryContext extends IDeployBaseContext {
     registryDomain?: SupportedRegistries;
-    registry?: ContainerRegistryManagementModels.Registry;
+    registry?: Registry;
     dockerHubNamespace?: string;
 
     repositoryName?: string;

src/commands/deploy/deployFromRegistry/IDeployFromRegistryContext.ts

@@ -3,7 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ContainerRegistryManagementClient, ContainerRegistryManagementModels } from "@azure/arm-containerregistry";
+import type { ContainerRegistryManagementClient, Registry } from "@azure/arm-containerregistry";
+import { uiUtils } from "@microsoft/vscode-azext-azureutils";
 import { AzureWizardPromptStep, IAzureQuickPickItem, IWizardOptions } from "@microsoft/vscode-azext-utils";
 import { createContainerRegistryManagementClient } from "../../../../utils/azureClients";
 import { localize } from "../../../../utils/localize";
@@ -29,9 +30,9 @@ export class AcrListStep extends AzureWizardPromptStep<IDeployFromRegistryContex
         return undefined;
     }
 
-    public async getPicks(context: IDeployFromRegistryContext): Promise<IAzureQuickPickItem<ContainerRegistryManagementModels.Registry>[]> {
+    public async getPicks(context: IDeployFromRegistryContext): Promise<IAzureQuickPickItem<Registry>[]> {
         const client: ContainerRegistryManagementClient = await createContainerRegistryManagementClient(context);
-        const registries = await client.registries.list();
+        const registries = await uiUtils.listAllIterator(client.registries.list());
         return registries.map((r) => { return { label: nonNullProp(r, 'name'), data: r, description: r.loginServer } });
     }
 }

src/commands/deploy/deployFromRegistry/acr/AcrListStep.ts

@@ -23,7 +23,7 @@ export class RegistryEnableAdminUserStep extends AzureWizardPromptStep<IDeployFr
         registry.adminUserEnabled = true;
 
         const client: ContainerRegistryManagementClient = await createContainerRegistryManagementClient(context);
-        const updatedRegistry = await client.registries.update(getResourceGroupFromId(nonNullProp(registry, 'id')), nonNullProp(registry, 'name'), registry);
+        const updatedRegistry = await client.registries.beginUpdateAndWait(getResourceGroupFromId(nonNullProp(registry, 'id')), nonNullProp(registry, 'name'), registry);
 
         if (!updatedRegistry.adminUserEnabled) {
             throw new Error(localize('failedToUpdate', 'Failed to enable admin user for registry "{0}". Go to the portal to manually update.', registry.name));

src/commands/deploy/deployFromRegistry/acr/RegistryEnableAdminUserStep.ts

@@ -3,14 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ContainerRegistryManagementClient, ContainerRegistryManagementModels } from "@azure/arm-containerregistry";
+import type { ContainerRegistryManagementClient, Registry, RegistryPassword } from "@azure/arm-containerregistry";
 import { getResourceGroupFromId } from "@microsoft/vscode-azext-azureutils";
 import { createContainerRegistryManagementClient } from "../../../../utils/azureClients";
 import { nonNullProp, nonNullValue } from "../../../../utils/nonNull";
 import { IDeployFromRegistryContext } from "../IDeployFromRegistryContext";
 
-export async function listCredentialsFromRegistry(context: IDeployFromRegistryContext, registry: ContainerRegistryManagementModels.Registry):
-    Promise<{ username: string, password: ContainerRegistryManagementModels.RegistryPassword }> {
+export async function listCredentialsFromRegistry(context: IDeployFromRegistryContext, registry: Registry):
+    Promise<{ username: string, password: RegistryPassword }> {
 
     const containerClient: ContainerRegistryManagementClient = await createContainerRegistryManagementClient(context);
     const credentials = await containerClient.registries.listCredentials(getResourceGroupFromId(nonNullProp(registry, 'id')), nonNullProp(registry, 'name'));

src/commands/deploy/deployFromRegistry/acr/listCredentialsFromRegistry.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { ContainerAppsAPIClient } from "@azure/arm-appcontainers";
-import { ContainerRegistryManagementClient, ContainerRegistryManagementModels } from '@azure/arm-containerregistry';
+import type { ContainerRegistryManagementClient, Registry } from '@azure/arm-containerregistry';
 import { OperationalInsightsManagementClient } from '@azure/arm-operationalinsights';
 import { ContainerRegistryClient, KnownContainerRegistryAudience } from '@azure/container-registry';
 import { AzExtClientContext, createAzureClient, parseClientContext } from '@microsoft/vscode-azext-azureutils';
@@ -26,7 +26,7 @@ export async function createContainerRegistryManagementClient(context: AzExtClie
     return createAzureClient(context, (await import('@azure/arm-containerregistry')).ContainerRegistryManagementClient);
 }
 
-export function createContainerRegistryClient(context: AzExtClientContext, registry: ContainerRegistryManagementModels.Registry): ContainerRegistryClient {
+export function createContainerRegistryClient(context: AzExtClientContext, registry: Registry): ContainerRegistryClient {
     const clientContext = parseClientContext(context);
     // @azure/container-registry doesn't support ADAL tokens at all.  If it sees `signRequest` is defined
     // it errors, but we don't actually need `signRequest` because this is a T2 package

src/utils/azureClients.ts

@@ -3,7 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import type { ContainerRegistryManagementClient, ContainerRegistryManagementModels } from "@azure/arm-containerregistry";
+import type { ContainerRegistryManagementClient, Registry } from "@azure/arm-containerregistry";
+import { uiUtils } from "@microsoft/vscode-azext-azureutils";
 import { ISubscriptionActionContext } from "@microsoft/vscode-azext-utils";
 import { acrDomain, dockerHubDomain, SupportedRegistries } from "../constants";
 import { createContainerRegistryManagementClient } from "./azureClients";
@@ -24,8 +25,8 @@ export function detectRegistryDomain(registryName: string): SupportedRegistries
 /**
  * @param acrName When parsed from a full ACR image name, everything before the first slash
  */
-export async function getRegistryFromAcrName(context: ISubscriptionActionContext, acrName: string): Promise<ContainerRegistryManagementModels.Registry> {
+export async function getRegistryFromAcrName(context: ISubscriptionActionContext, acrName: string): Promise<Registry> {
     const client: ContainerRegistryManagementClient = await createContainerRegistryManagementClient(context);
-    const registries = await client.registries.list();
-    return registries.find(r => r.loginServer === acrName) as ContainerRegistryManagementModels.Registry;
+    const registries = await uiUtils.listAllIterator(client.registries.list());
+    return registries.find(r => r.loginServer === acrName) as Registry;
 }