ACR-3.0.0 API upgrade

commands/azureCommands/acr-logs-utils/tableDataManager.ts

@@ -1,5 +1,6 @@
 import ContainerRegistryManagementClient from "azure-arm-containerregistry";
 import { Registry, Run, RunGetLogResult, RunListResult } from "azure-arm-containerregistry/lib/models";
+import vscode = require('vscode');
 import { parseError } from "vscode-azureextensionui";
 import { ext } from "../../../extensionVariables";
 import { acquireACRAccessTokenFromRegistry } from "../../../utils/Azure/acrTools";
@@ -50,7 +51,7 @@ export class LogData {
      * the next page of logs will be saved and all preexisting data will be deleted.
      * @param filter Specifies a filter for log items, if run Id is specified this will take precedence
      */
-    public async loadLogs(loadNext: boolean, removeOld?: boolean, filter?: Filter): Promise<void> {
+    public async loadLogs(webViewEvent: boolean, loadNext: boolean, removeOld?: boolean, filter?: Filter): Promise<void> {
         let runListResult: RunListResult;
         let options: {
             filter?: string,
@@ -66,19 +67,23 @@ export class LogData {
                 runListResult = await this.client.runs.list(this.resourceGroup, this.registry.name, options);
             } else {
                 runListResult = [];
-                // Temporal fix. Issue documented: runId must exist in the registry.
                 try {
                     runListResult.push(await this.client.runs.get(this.resourceGroup, this.registry.name, filter.runId));
                 } catch (err) {
-                    if (parseError(err).errorType !== "EntityNotFound") {
+                    const error = parseError(err);
+                    if (!webViewEvent) {
                         throw err;
+                    } else if (error.errorType !== "EntityNotFound") {
+                        vscode.window.showErrorMessage(`Error '${error.errorType}': ${error.message}`);
                     }
                 }
             }
         } else {
             if (loadNext) {
                 if (this.nextLink) {
                     runListResult = await this.client.runs.listNext(this.nextLink);
+                } else if (webViewEvent) {
+                    vscode.window.showErrorMessage("No more logs to show.");
                 } else {
                     throw new Error('No more logs to show');
                 }

commands/azureCommands/acr-logs-utils/tableViewManager.ts

@@ -3,6 +3,7 @@ import { ImageDescriptor, Run } from "azure-arm-containerregistry/lib/models";
 import * as clipboardy from 'clipboardy'
 import * as path from 'path';
 import * as vscode from "vscode";
+import { parseError } from "vscode-azureextensionui";
 import { ext } from "../../../extensionVariables";
 import { accessLog } from './logFileManager';
 import { Filter, LogData } from './tableDataManager'
@@ -30,23 +31,27 @@ export class LogTableWebview {
         this.panel.webview.onDidReceiveMessage(async (message: IMessage) => {
             if (message.logRequest) {
                 const itemNumber: number = +message.logRequest.id;
-                await this.logData.getLink(itemNumber).then(async (url) => {
-                    if (url !== 'requesting') {
-                        await accessLog(url, this.logData.logs[itemNumber].runId, message.logRequest.download);
-                    }
-                });
-
+                try {
+                    await this.logData.getLink(itemNumber).then(async (url) => {
+                        if (url !== 'requesting') {
+                            await accessLog(url, this.logData.logs[itemNumber].runId, message.logRequest.download);
+                        }
+                    });
+                } catch (err) {
+                    const error = parseError(err);
+                    vscode.window.showErrorMessage(`Error '${error.errorType}': ${error.message}`);
+                }
             } else if (message.copyRequest) {
                 // tslint:disable-next-line:no-unsafe-any
                 clipboardy.writeSync(message.copyRequest.text);
 
             } else if (message.loadMore) {
                 const alreadyLoaded = this.logData.logs.length;
-                await this.logData.loadLogs(true);
+                await this.logData.loadLogs(true, true);
                 this.addLogsToWebView(alreadyLoaded);
 
             } else if (message.loadFiltered) {
-                await this.logData.loadLogs(false, true, message.loadFiltered.filterString);
+                await this.logData.loadLogs(true, false, true, message.loadFiltered.filterString);
                 this.addLogsToWebView();
             }
         });

commands/azureCommands/acr-logs.ts

@@ -30,17 +30,17 @@ export async function viewACRLogs(context: AzureRegistryNode | AzureImageTagNode
     // Filtering provided
     if (context && context instanceof AzureImageTagNode) {
         //ACR Image Logs
-        await logData.loadLogs(false, false, { image: context.label });
+        await logData.loadLogs(false, false, false, { image: context.label });
         if (!hasValidLogContent(context, logData)) { return; }
         const url = await logData.getLink(0);
         await accessLog(url, logData.logs[0].runId, false);
     } else {
         if (context && context instanceof TaskNode) {
             //ACR Task Logs
-            await logData.loadLogs(false, false, { task: context.label });
+            await logData.loadLogs(false, false, false, { task: context.label });
         } else {
             //ACR Registry Logs
-            await logData.loadLogs(false);
+            await logData.loadLogs(false, false);
         }
         if (!hasValidLogContent(context, logData)) { return; }
         let webViewTitle = registry.name;