Azurecr/registry management

commands/utils/quick-pick-azure.ts

@@ -9,7 +9,6 @@ import * as opn from 'opn';
 import * as vscode from "vscode";
 import { IAzureQuickPickItem, UserCancelledError } from 'vscode-azureextensionui';
 import { skus } from '../../constants'
-import { QuickPickItemWithData } from '../../explorer/deploy/wizard';
 import { ext } from '../../extensionVariables';
 import { ResourceManagementClient } from '../../node_modules/azure-arm-resource';
 import * as acrTools from '../../utils/Azure/acrTools';

explorer/models/azureRegistryNodes.ts

@@ -7,12 +7,14 @@ import * as ContainerModels from 'azure-arm-containerregistry/lib/models';
 import { SubscriptionModels } from 'azure-arm-resource';
 import * as moment from 'moment';
 import * as path from 'path';
-import * as request from 'request-promise';
 import * as vscode from 'vscode';
 import { parseError } from 'vscode-azureextensionui';
 import { MAX_CONCURRENT_REQUESTS } from '../../constants'
-import { AzureAccount, AzureSession } from '../../typings/azure-account.api';
+import { AzureAccount } from '../../typings/azure-account.api';
 import { AsyncPool } from '../../utils/asyncpool';
+import { acquireACRAccessTokenFromRegistry, getImagesByRepository, getRawImageManifest, getRepositoriesByRegistry } from '../../utils/Azure/acrTools';
+import { AzureImage } from '../../utils/Azure/models/image';
+import { Repository } from '../../utils/Azure/models/repository';
 import { NodeBase } from './nodeBase';
 import { RegistryType } from './registryType';
 
@@ -44,71 +46,20 @@ export class AzureRegistryNode extends NodeBase {
 
     public async getChildren(element: AzureRegistryNode): Promise<AzureRepositoryNode[]> {
         const repoNodes: AzureRepositoryNode[] = [];
-        let node: AzureRepositoryNode;
 
-        const tenantId: string = element.subscription.tenantId;
         if (!this._azureAccount) {
             return [];
         }
 
-        const session: AzureSession = this._azureAccount.sessions.find((s, i, array) => s.tenantId.toLowerCase() === tenantId.toLowerCase());
-        const { accessToken, refreshToken } = await acquireToken(session);
-
-        if (accessToken && refreshToken) {
-            let refreshTokenARC;
-            let accessTokenARC;
-
-            await request.post('https://' + element.label + '/oauth2/exchange', {
-                form: {
-                    grant_type: 'access_token_refresh_token',
-                    service: element.label,
-                    tenant: tenantId,
-                    refresh_token: refreshToken,
-                    access_token: accessToken
-                }
-            }, (err, httpResponse, body) => {
-                if (body.length > 0) {
-                    refreshTokenARC = JSON.parse(body).refresh_token;
-                } else {
-                    return [];
-                }
-            });
-
-            await request.post('https://' + element.label + '/oauth2/token', {
-                form: {
-                    grant_type: 'refresh_token',
-                    service: element.label,
-                    scope: 'registry:catalog:*',
-                    refresh_token: refreshTokenARC
-                }
-            }, (err, httpResponse, body) => {
-                if (body.length > 0) {
-                    accessTokenARC = JSON.parse(body).access_token;
-                } else {
-                    return [];
-                }
-            });
-            await request.get('https://' + element.label + '/v2/_catalog', {
-                auth: {
-                    bearer: accessTokenARC
-                }
-            }, (err, httpResponse, body) => {
-                if (body.length > 0) {
-                    const repositories = JSON.parse(body).repositories;
-                    // tslint:disable-next-line:prefer-for-of // Grandfathered in
-                    for (let i = 0; i < repositories.length; i++) {
-                        node = new AzureRepositoryNode(repositories[i], "azureRepositoryNode");
-                        node.accessTokenARC = accessTokenARC;
-                        node.azureAccount = element.azureAccount;
-                        node.refreshTokenARC = refreshTokenARC;
-                        node.registry = element.registry;
-                        node.repository = element.label;
-                        node.subscription = element.subscription;
-                        repoNodes.push(node);
-                    }
-                }
-            });
+        const repositories: Repository[] = await getRepositoriesByRegistry(element.registry);
+        for (let repo of repositories) {
+            let node = new AzureRepositoryNode(repo.name, "azureRepositoryNode");
+            node.azureAccount = element.azureAccount;
+            node.registry = element.registry;
+            node.subscription = element.subscription;
+            repoNodes.push(node);
         }
+
         //Note these are ordered by default in alphabetical order
         return repoNodes;
     }
@@ -126,11 +77,8 @@ export class AzureRepositoryNode extends NodeBase {
         super(label);
     }
 
-    public accessTokenARC: string;
     public azureAccount: AzureAccount
-    public refreshTokenARC: string;
     public registry: ContainerModels.Registry;
-    public repository: string;
     public subscription: SubscriptionModels.Subscription;
     public parent: NodeBase;
 
@@ -146,94 +94,38 @@ export class AzureRepositoryNode extends NodeBase {
     public async getChildren(element: AzureRepositoryNode): Promise<AzureImageNode[]> {
         const imageNodes: AzureImageNode[] = [];
         let node: AzureImageNode;
-        let created: string = '';
-        let refreshTokenARC;
-        let accessTokenARC;
-        let tags;
-
-        const tenantId: string = element.subscription.tenantId;
-        const session: AzureSession = element.azureAccount.sessions.find((s, i, array) => s.tenantId.toLowerCase() === tenantId.toLowerCase());
-        const { accessToken, refreshToken } = await acquireToken(session);
-
-        if (accessToken && refreshToken) {
-            await request.post('https://' + element.repository + '/oauth2/exchange', {
-                form: {
-                    grant_type: 'access_token_refresh_token',
-                    service: element.repository,
-                    tenant: tenantId,
-                    refresh_token: refreshToken,
-                    access_token: accessToken
-                }
-            }, (err, httpResponse, body) => {
-                if (body.length > 0) {
-                    refreshTokenARC = JSON.parse(body).refresh_token;
-                } else {
-                    return [];
+        let repo = new Repository(element.registry, element.label);
+        let images: AzureImage[] = await getImagesByRepository(repo);
+        let { acrAccessToken } = await acquireACRAccessTokenFromRegistry(element.registry, `repository:${element.label}:pull`)
+        const pool = new AsyncPool(MAX_CONCURRENT_REQUESTS);
+        for (let image of images) {
+            pool.addTask(async () => {
+                let data: string;
+                try {
+                    data = await getRawImageManifest(image, acrAccessToken);
+                } catch (error) {
+                    vscode.window.showErrorMessage(parseError(error).message);
                 }
-            });
 
-            await request.post('https://' + element.repository + '/oauth2/token', {
-                form: {
-                    grant_type: 'refresh_token',
-                    service: element.repository,
-                    scope: 'repository:' + element.label + ':pull',
-                    refresh_token: refreshTokenARC
-                }
-            }, (err, httpResponse, body) => {
-                if (body.length > 0) {
-                    accessTokenARC = JSON.parse(body).access_token;
-                } else {
-                    return [];
+                if (data) {
+                    //Acquires each image's manifest to acquire build time.
+                    let manifest = JSON.parse(data);
+                    node = new AzureImageNode(`${element.label}:${image.tag}`, 'azureImageNode');
+                    node.azureAccount = element.azureAccount;
+                    node.registry = element.registry;
+                    node.serverUrl = element.registry.loginServer;
+                    node.subscription = element.subscription;
+                    node.parent = element;
+                    node.created = moment(new Date(JSON.parse(manifest.history[0].v1Compatibility).created)).fromNow();
+                    imageNodes.push(node);
                 }
             });
-
-            await request.get('https://' + element.repository + '/v2/' + element.label + '/tags/list', {
-                auth: {
-                    bearer: accessTokenARC
-                }
-            }, (err, httpResponse, body) => {
-                if (err) { return []; }
-                if (body.length > 0) {
-                    tags = JSON.parse(body).tags;
-                }
-            });
-
-            const pool = new AsyncPool(MAX_CONCURRENT_REQUESTS);
-            // tslint:disable-next-line:prefer-for-of // Grandfathered in
-            for (let i = 0; i < tags.length; i++) {
-                pool.addTask(async () => {
-                    let data: string;
-                    try {
-                        data = await request.get('https://' + element.repository + '/v2/' + element.label + `/manifests/${tags[i]}`, {
-                            auth: {
-                                bearer: accessTokenARC
-                            }
-                        });
-                    } catch (error) {
-                        vscode.window.showErrorMessage(parseError(error).message);
-                    }
-
-                    if (data) {
-                        //Acquires each image's manifest to acquire build time.
-                        let manifest = JSON.parse(data);
-                        node = new AzureImageNode(`${element.label}:${tags[i]}`, 'azureImageNode');
-                        node.azureAccount = element.azureAccount;
-                        node.registry = element.registry;
-                        node.serverUrl = element.repository;
-                        node.subscription = element.subscription;
-                        node.parent = element;
-                        node.created = moment(new Date(JSON.parse(manifest.history[0].v1Compatibility).created)).fromNow();
-                        imageNodes.push(node);
-                    }
-                });
-            }
-            await pool.runAll();
-
         }
-        function sortFunction(a: AzureImageNode, b: AzureImageNode): number {
+        await pool.runAll();
+        function compareFn(a: AzureImageNode, b: AzureImageNode): number {
             return a.created.localeCompare(b.created);
         }
-        imageNodes.sort(sortFunction);
+        imageNodes.sort(compareFn);
         return imageNodes;
     }
 }
@@ -295,21 +187,3 @@ export class AzureLoadingNode extends NodeBase {
         }
     }
 }
-
-async function acquireToken(session: AzureSession): Promise<{ accessToken: string; refreshToken: string; }> {
-    return new Promise<{ accessToken: string; refreshToken: string; }>((resolve, reject) => {
-        const credentials: any = session.credentials;
-        const environment: any = session.environment;
-        // tslint:disable-next-line:no-function-expression // Grandfathered in
-        credentials.context.acquireToken(environment.activeDirectoryResourceId, credentials.username, credentials.clientId, function (err: any, result: { accessToken: string; refreshToken: string; }): void {
-            if (err) {
-                reject(err);
-            } else {
-                resolve({
-                    accessToken: result.accessToken,
-                    refreshToken: result.refreshToken
-                });
-            }
-        });
-    });
-}

explorer/models/registryRootNode.ts

@@ -13,6 +13,7 @@ import { parseError } from 'vscode-azureextensionui';
 import { keytarConstants, MAX_CONCURRENT_REQUESTS, MAX_CONCURRENT_SUBSCRIPTON_REQUESTS } from '../../constants';
 import { AzureAccount } from '../../typings/azure-account.api';
 import { AsyncPool } from '../../utils/asyncpool';
+import { AzureUtilityManager } from '../../utils/azureUtilityManager';
 import * as dockerHub from '../utils/dockerHubUtils'
 import { getCoreNodeModule } from '../utils/utils';
 import { AzureLoadingNode, AzureNotSignedInNode, AzureRegistryNode } from './azureRegistryNodes';
@@ -133,19 +134,18 @@ export class RegistryRootNode extends NodeBase {
         }
 
         if (loggedIntoAzure) {
-            const subs: SubscriptionModels.Subscription[] = this.getFilteredSubscriptions();
+            const subscriptions: SubscriptionModels.Subscription[] = AzureUtilityManager.getInstance().getFilteredSubscriptionList();
 
             const subPool = new AsyncPool(MAX_CONCURRENT_SUBSCRIPTON_REQUESTS);
             let subsAndRegistries: { 'subscription': SubscriptionModels.Subscription, 'registries': ContainerModels.RegistryListResult }[] = [];
             //Acquire each subscription's data simultaneously
-            // tslint:disable-next-line:prefer-for-of // Grandfathered in
-            for (let i = 0; i < subs.length; i++) {
+            for (let sub of subscriptions) {
                 subPool.addTask(async () => {
-                    const client = new ContainerRegistryManagement(this.getCredentialByTenantId(subs[i].tenantId), subs[i].subscriptionId);
+                    const client = AzureUtilityManager.getInstance().getContainerRegistryManagementClient(sub);
                     try {
                         let regs: ContainerModels.Registry[] = await client.registries.list();
                         subsAndRegistries.push({
-                            'subscription': subs[i],
+                            'subscription': sub,
                             'registries': regs
                         });
                     } catch (error) {
@@ -181,42 +181,11 @@ export class RegistryRootNode extends NodeBase {
             }
             await regPool.runAll();
 
-            function sortFunction(a: AzureRegistryNode, b: AzureRegistryNode): number {
+            function compareFn(a: AzureRegistryNode, b: AzureRegistryNode): number {
                 return a.registry.loginServer.localeCompare(b.registry.loginServer);
             }
-            azureRegistryNodes.sort(sortFunction);
+            azureRegistryNodes.sort(compareFn);
             return azureRegistryNodes;
         }
     }
-
-    private getCredentialByTenantId(tenantId: string): ServiceClientCredentials {
-
-        const session = this._azureAccount.sessions.find((s, i, array) => s.tenantId.toLowerCase() === tenantId.toLowerCase());
-
-        if (session) {
-            return session.credentials;
-        }
-
-        throw new Error(`Failed to get credentials, tenant ${tenantId} not found.`);
-    }
-
-    private getFilteredSubscriptions(): SubscriptionModels.Subscription[] {
-
-        if (this._azureAccount) {
-            return this._azureAccount.filters.map<SubscriptionModels.Subscription>(filter => {
-                return {
-                    id: filter.subscription.id,
-                    session: filter.session,
-                    subscriptionId: filter.subscription.subscriptionId,
-                    tenantId: filter.session.tenantId,
-                    displayName: filter.subscription.displayName,
-                    state: filter.subscription.state,
-                    subscriptionPolicies: filter.subscription.subscriptionPolicies,
-                    authorizationSource: filter.subscription.authorizationSource
-                };
-            });
-        } else {
-            return [];
-        }
-    }
 }

utils/Azure/acrTools.ts

@@ -13,8 +13,7 @@ import { AzureImage } from "./models/image";
 import { Repository } from "./models/repository";
 
 //General helpers
-/**
- * @param registry gets the subscription for a given registry
+/** Gets the subscription for a given registry
  * @returns a subscription object
  */
 export function getSubscriptionFromRegistry(registry: Registry): SubscriptionModels.Subscription {
@@ -26,7 +25,7 @@ export function getSubscriptionFromRegistry(registry: Registry): SubscriptionMod
     return subscription;
 }
 
-export function getResourceGroupName(registry: Registry): any {
+export function getResourceGroupName(registry: Registry): string {
     return registry.id.slice(registry.id.search('resourceGroups/') + 'resourceGroups/'.length, registry.id.search('/providers/'));
 }
 
@@ -55,6 +54,20 @@ export async function getImagesByRepository(element: Repository): Promise<AzureI
     return allImages;
 }
 
+/** Returns the textual manifest for an ACR Image
+ * @param acrAccessToken If the token is not provided one will be created for the particular image, if doing multiple requests this should be provided
+ */
+export async function getRawImageManifest(image: AzureImage, acrAccessToken?: string): Promise<string> {
+    if (!acrAccessToken) {
+        acrAccessToken = (await acquireACRAccessTokenFromRegistry(image.registry, `repository:${image.repository}:pull`)).acrAccessToken;
+    }
+    return await request.get('https://' + image.registry.loginServer + '/v2/' + image.repository.name + `/manifests/${image.tag}`, {
+        auth: {
+            bearer: acrAccessToken
+        }
+    });
+}
+
 /** List repositories on a given Registry. */
 export async function getRepositoriesByRegistry(registry: Registry): Promise<Repository[]> {
     const allRepos: Repository[] = [];