sync with master

.azure-pipelines/common/build.yml

@@ -1,4 +1,9 @@
 steps:
+- task: NodeTool@0
+  displayName: 'Use Node 8.x'
+  inputs:
+    versionSpec: 8.x
+
 - task: Npm@1
   displayName: 'npm install'
 

.azure-pipelines/common/test.yml

@@ -1,11 +1,27 @@
 steps:
-- task: Gulp@0
+- script: |
+    sudo cp .azure-pipelines/linux/xvfb.init /etc/init.d/xvfb
+    sudo chmod +x /etc/init.d/xvfb
+    sudo update-rc.d xvfb defaults
+    sudo service xvfb start
+  displayName: 'Start X Virtual Frame Buffer'
+  condition: eq(variables['Agent.OS'], 'Linux')
+
+- task: Npm@1
   displayName: 'Test'
   inputs:
-    targets: 'test'
+    command: custom
+    customCommand: test
   env:
     SERVICE_PRINCIPAL_CLIENT_ID: $(SERVICE_PRINCIPAL_CLIENT_ID)
     SERVICE_PRINCIPAL_SECRET: $(SERVICE_PRINCIPAL_SECRET)
     SERVICE_PRINCIPAL_DOMAIN: $(SERVICE_PRINCIPAL_DOMAIN)
+    DISPLAY: :10 # Only necessary for linux tests
+    DOCKER_UNAVAILABLE: ${{ parameters.dockerUnavailable }}
 
-- template: publish-test-results.yml
+- task: PublishTestResults@2
+  displayName: 'Publish Test Results'
+  inputs:
+    testResultsFiles: '*-results.xml'
+    testRunTitle: '$(Agent.OS)'
+  condition: succeededOrFailed()

.azure-pipelines/main.yml

@@ -16,13 +16,15 @@ jobs:
   - template: common/webpack-prod.yml # This will also run during vsce package, but vscep pack doesn't show STDOUT so we won't see full errors there
   - template: common/publish-vsix.yml # Only publish vsix from linux build since we use this to release and want to stay consistent
   - template: common/lint.yml
-  - template: linux/test-linux.yml
+  - template: common/test.yml
 
 - job: macOS
   pool:
     vmImage: macOS 10.13
   steps:
   - template: common/build.yml
-  # - template: common/webpack-prod.yml
+  - template: common/webpack-prod.yml
   - template: common/lint.yml
-  # - template: macOs/test.yml
+  - template: common/test.yml
+    parameters:
+      dockerUnavailable: 1 # Docker not available on MacOS agents (https://docs.microsoft.com/en-us/azure/devops/pipelines/languages/docker)

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

@@ -58,7 +58,9 @@ export async function downloadLog(content: string, title: string): Promise<void>
         filters: { 'Log': ['.log', '.txt'] },
         defaultUri: vscode.Uri.file(`${title}.log`)
     });
-    fse.writeFile(uri.fsPath, content,
+    fse.writeFile(
+        uri.fsPath,
+        content,
         (err) => {
             if (err) { throw err; }
         });

commands/azureCommands/pull-from-azure.ts

@@ -18,11 +18,11 @@ import { Repository } from "../../utils/Azure/models/repository";
 import { quickPickACRImage, quickPickACRRegistry, quickPickACRRepository } from '../utils/quick-pick-azure';
 
 export async function pullRepoFromAzure(context?: AzureRepositoryNode): Promise<void> {
-    pullFromAzure(context, true);
+    await pullFromAzure(context, true);
 }
 
 export async function pullImageFromAzure(context?: AzureImageTagNode): Promise<void> {
-    pullFromAzure(context, false);
+    await pullFromAzure(context, false);
 }
 
 /* Pulls an image from Azure. The context is the image node the user has right clicked on */

commands/docker-compose.ts

@@ -7,9 +7,7 @@ import * as path from 'path';
 import * as vscode from 'vscode';
 import { COMPOSE_FILE_GLOB_PATTERN } from '../constants';
 import { ext } from '../extensionVariables';
-import { reporter } from '../telemetry/telemetry';
 import { quickPickWorkspaceFolder } from './utils/quickPickWorkspaceFolder';
-const teleCmdId: string = 'vscode-docker.compose.'; // we append up or down when reporting telemetry
 
 async function getDockerComposeFileUris(folder: vscode.WorkspaceFolder): Promise<vscode.Uri[]> {
     return await vscode.workspace.findFiles(new vscode.RelativePattern(folder, COMPOSE_FILE_GLOB_PATTERN), null, 9999, undefined);
@@ -75,16 +73,6 @@ async function compose(commands: ('up' | 'down')[], message: string, dockerCompo
             terminal.sendText(command.toLowerCase() === 'up' ? `docker-compose -f "${item.file}" ${command} ${detached} ${build}` : `docker-compose -f "${item.file}" ${command}`);
         });
         terminal.show();
-        if (reporter) {
-            /* __GDPR__
-               "command" : {
-                  "command" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-               }
-             */
-            reporter.sendTelemetryEvent('command', {
-                command: teleCmdId + command
-            });
-        }
     }
 
 }

commands/inspect-image.ts

@@ -6,7 +6,6 @@
 import { IActionContext } from "vscode-azureextensionui";
 import DockerInspectDocumentContentProvider from "../documentContentProviders/dockerInspect";
 import { ImageNode } from "../explorer/models/imageNode";
-import { reporter } from "../telemetry/telemetry";
 import { quickPickImage } from "./utils/quick-pick-image";
 
 export default async function inspectImage(actionContext: IActionContext, context: ImageNode | undefined): Promise<void> {
@@ -24,14 +23,5 @@ export default async function inspectImage(actionContext: IActionContext, contex
 
     if (imageToInspect) {
         await DockerInspectDocumentContentProvider.openImageInspectDocument(imageToInspect);
-
-        if (reporter) {
-            /* __GDPR__
-            "command" : {
-                "command" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-            }
-            */
-            reporter.sendTelemetryEvent("command", { command: "vscode-docker.image.inspect" });
-        }
     }
 }

commands/push-image.ts

@@ -9,11 +9,8 @@ import { configurationKeys } from '../constants';
 import { ImageNode } from '../explorer/models/imageNode';
 import { RootNode } from '../explorer/models/rootNode';
 import { ext } from '../extensionVariables';
-import { reporter } from '../telemetry/telemetry';
 import { askToSaveRegistryPath } from './registrySettings';
 import { addImageTaggingTelemetry, getOrAskForImageAndTag, IHasImageDescriptorAndLabel, tagImage } from './tag-image';
-const teleCmdId: string = 'vscode-docker.image.push';
-const teleAzureId: string = 'vscode-docker.image.push.azureContainerRegistry';
 
 export async function pushImage(actionContext: IActionContext, context: ImageNode | RootNode | undefined): Promise<void> {
     let properties: {
@@ -53,27 +50,5 @@ export async function pushImage(actionContext: IActionContext, context: ImageNod
         const terminal = ext.terminalProvider.createTerminal(imageName);
         terminal.sendText(`docker push ${imageName}`);
         terminal.show();
-        if (reporter) {
-            /* __GDPR__
-               "command" : {
-                  "command" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-               }
-             */
-            reporter.sendTelemetryEvent('command', {
-                command: teleCmdId
-            });
-
-            if (imageName.toLowerCase().includes('azurecr.io')) {
-                /* __GDPR__
-                   "command" : {
-                      "command" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-                   }
-                 */
-                reporter.sendTelemetryEvent('command', {
-                    command: teleAzureId
-                });
-
-            }
-        }
     }
 }

commands/remove-container.ts

@@ -8,7 +8,6 @@ import { IActionContext } from 'vscode-azureextensionui';
 import { dockerExplorerProvider } from '../dockerExtension';
 import { ContainerNode } from '../explorer/models/containerNode';
 import { RootNode } from '../explorer/models/rootNode';
-import { reporter } from '../telemetry/telemetry';
 import { docker } from './utils/docker-endpoint';
 import { ContainerItem, quickPickContainer } from './utils/quick-pick-container';
 
@@ -60,14 +59,4 @@ export async function removeContainer(actionContext: IActionContext, context: Ro
             });
         }));
     }
-
-    if (reporter) {
-        /* __GDPR__
-        "command" : {
-            "command" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-        }
-        */
-        reporter.sendTelemetryEvent("command", { command: teleCmdId });
-    }
-
 }

commands/remove-image.ts

@@ -5,15 +5,11 @@
 
 import vscode = require('vscode');
 import { IActionContext } from 'vscode-azureextensionui';
-import { dockerExplorerProvider } from '../dockerExtension';
 import { ImageNode } from "../explorer/models/imageNode";
 import { RootNode } from '../explorer/models/rootNode';
-import { reporter } from '../telemetry/telemetry';
 import { docker } from './utils/docker-endpoint';
 import { ImageItem, quickPickImage } from './utils/quick-pick-image';
 
-const teleCmdId: string = 'vscode-docker.image.remove';
-
 export async function removeImage(actionContext: IActionContext, context: ImageNode | RootNode | undefined): Promise<void> {
 
     let imagesToRemove: Docker.ImageDesc[];
@@ -52,15 +48,4 @@ export async function removeImage(actionContext: IActionContext, context: ImageN
             });
         }));
     }
-
-    if (reporter) {
-        /* __GDPR__
-           "command" : {
-              "command" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-           }
-         */
-        reporter.sendTelemetryEvent('command', {
-            command: teleCmdId
-        });
-    }
 }

commands/restart-container.ts

@@ -3,18 +3,14 @@
  *  Licensed under the MIT License. See LICENSE.md in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import vscode = require('vscode');
+import { IActionContext } from 'vscode-azureextensionui';
 import { dockerExplorerProvider } from '../dockerExtension';
 import { ContainerNode } from '../explorer/models/containerNode';
-import { reporter } from '../telemetry/telemetry';
+import { RootNode } from '../explorer/models/rootNode';
 import { docker } from './utils/docker-endpoint';
 import { ContainerItem, quickPickContainer } from './utils/quick-pick-container';
 
-import vscode = require('vscode');
-import { IActionContext } from 'vscode-azureextensionui';
-import { RootNode } from '../explorer/models/rootNode';
-
-const teleCmdId: string = 'vscode-docker.container.restart';
-
 export async function restartContainer(actionContext: IActionContext, context: RootNode | ContainerNode | undefined): Promise<void> {
 
     let containersToRestart: Docker.ContainerDesc[];
@@ -59,16 +55,5 @@ export async function restartContainer(actionContext: IActionContext, context: R
                 });
             });
         }));
-
-        if (reporter) {
-            /* __GDPR__
-                "command" : {
-                    "command" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-                }
-            */
-            reporter.sendTelemetryEvent('command', {
-                command: teleCmdId
-            });
-        }
     }
 }

commands/showlogs-container.ts

@@ -8,9 +8,7 @@ import { IActionContext } from 'vscode-azureextensionui';
 import { ContainerNode } from '../explorer/models/containerNode';
 import { RootNode } from '../explorer/models/rootNode';
 import { ext } from '../extensionVariables';
-import { reporter } from '../telemetry/telemetry';
 import { ContainerItem, quickPickContainer } from './utils/quick-pick-container';
-const teleCmdId: string = 'vscode-docker.container.show-logs';
 
 export async function showLogsContainer(actionContext: IActionContext, context: RootNode | ContainerNode | undefined): Promise<void> {
 
@@ -34,15 +32,5 @@ export async function showLogsContainer(actionContext: IActionContext, context:
         const terminal = ext.terminalProvider.createTerminal(containerToLog.Image);
         terminal.sendText(`docker logs -f ${containerToLog.Id}`);
         terminal.show();
-        if (reporter) {
-            /* __GDPR__
-               "command" : {
-                  "command" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-               }
-             */
-            reporter.sendTelemetryEvent('command', {
-                command: teleCmdId
-            });
-        }
     }
 }

commands/start-container.ts

@@ -72,7 +72,8 @@ export async function startAzureCLI(actionContext: IActionContext): Promise<cp.C
     actionContext.properties.engineType = DockerEngineType[engineType];
 
     if (engineType === DockerEngineType.Windows) {
-        const selected = await vscode.window.showErrorMessage<vscode.MessageItem>('Currently, you can only run the Azure CLI when running Linux based containers.',
+        const selected = await vscode.window.showErrorMessage<vscode.MessageItem>(
+            'Currently, you can only run the Azure CLI when running Linux based containers.',
             {
                 title: 'More Information',
             },

commands/stop-container.ts

@@ -5,16 +5,13 @@
 
 import { dockerExplorerProvider } from '../dockerExtension';
 import { ContainerNode } from '../explorer/models/containerNode';
-import { reporter } from '../telemetry/telemetry';
 import { docker } from './utils/docker-endpoint';
 import { ContainerItem, quickPickContainer } from './utils/quick-pick-container';
 
 import vscode = require('vscode');
 import { IActionContext } from 'vscode-azureextensionui';
 import { RootNode } from '../explorer/models/rootNode';
 
-const teleCmdId: string = 'vscode-docker.container.stop';
-
 export async function stopContainer(actionContext: IActionContext, context: RootNode | ContainerNode | undefined): Promise<void> {
     let containersToStop: Docker.ContainerDesc[];
 
@@ -58,16 +55,5 @@ export async function stopContainer(actionContext: IActionContext, context: Root
                 });
             });
         }));
-
-        if (reporter) {
-            /* __GDPR__
-               "command" : {
-                  "command" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-               }
-             */
-            reporter.sendTelemetryEvent('command', {
-                command: teleCmdId
-            });
-        }
     }
 }

commands/system-prune.ts

@@ -19,7 +19,8 @@ export async function systemPrune(actionContext: IActionContext): Promise<void>
 
     try {
         if (configOptions.get('promptOnSystemPrune', true)) {
-            let res = await vscode.window.showWarningMessage<vscode.MessageItem>('Remove all unused containers, volumes, networks and images (both dangling and unreferenced)?',
+            let res = await vscode.window.showWarningMessage<vscode.MessageItem>(
+                'Remove all unused containers, volumes, networks and images (both dangling and unreferenced)?',
                 { title: 'Yes' },
                 { title: 'Cancel', isCloseAffordance: true }
             );