Added WIF suport to DockerV0 and DockerV1

Tasks/DockerV0/Tests/TestSetup.ts

@@ -34,6 +34,7 @@ process.env["RELEASE_RELEASENAME"] = "Release-1";
 process.env["SYSTEM_DEFAULTWORKINGDIRECTORY"] =  DefaultWorkingDirectory;
 process.env["SYSTEM_TEAMFOUNDATIONCOLLECTIONURI"] = shared.teamFoundationCollectionURI;
 process.env["SYSTEM_SERVERTYPE"] = "hosted";
+process.env['AGENT_TEMPDIRECTORY'] = '.';
 process.env["ENDPOINT_AUTH_dockerhubendpoint"] = "{\"parameters\":{\"username\":\"test\", \"password\":\"regpassword\", \"email\":\"test@microsoft.com\",\"registry\":\"https://index.docker.io/v1/\"},\"scheme\":\"UsernamePassword\"}";
 process.env["ENDPOINT_AUTH_SCHEME_AzureRMSpn"] = "ServicePrincipal";
 process.env["ENDPOINT_AUTH_PARAMETER_AzureRMSpn_SERVICEPRINCIPALID"] = "spId";

Tasks/DockerV0/container.ts

@@ -12,23 +12,20 @@ tl.setResourcePath(path.join(__dirname, 'task.json'));
 // Change to any specified working directory
 tl.cd(tl.getInput("cwd"));
 
-// get the registry server authentication provider 
+// get the registry server authentication provider
 var containerRegistryType = tl.getInput("containerregistrytype", true);
 const environmentVariableMaximumSize = 32766;
 
 var registryAuthenticationToken;
 if (containerRegistryType == "Azure Container Registry") {
-    registryAuthenticationToken = new ACRAuthenticationTokenProvider(tl.getInput("azureSubscriptionEndpoint"), tl.getInput("azureContainerRegistry")).getAuthenticationToken();
+    const tokenProvider = new ACRAuthenticationTokenProvider(tl.getInput("azureSubscriptionEndpoint"), tl.getInput("azureContainerRegistry"));
+    registryAuthenticationToken = tokenProvider.getToken();
 }
 else {
     let endpointId = tl.getInput("dockerRegistryEndpoint");
     registryAuthenticationToken = getDockerRegistryEndpointAuthenticationToken(endpointId);
 }
 
-// Connect to any specified container host and/or registry 
-var connection = new ContainerConnection();
-connection.open(tl.getInput("dockerHostEndpoint"), registryAuthenticationToken);
-
 // Run the specified action
 var action = tl.getInput("action", true).toLowerCase();
 let command = "";
@@ -70,29 +67,35 @@ console.log("##vso[telemetry.publish area=%s;feature=%s]%s",
     "DockerV0",
     JSON.stringify(telemetry));
 
-/* tslint:disable:no-var-requires */
-require({
-    "build an image": "./containerbuild",
-    "tag images": "./containertag",
-    "push an image": "./containerpush",
-    "push images": "./containerpush",
-    "run an image": "./containerrun",
-    "run a docker command": "./containercommand"
-}[action]).run(connection, (data) => result += data)
-/* tslint:enable:no-var-requires */
-.fin(function cleanup() {
-    connection.close();
-})
-.then(function success() {
-    var commandOutputLength = result.length;
-    if (commandOutputLength > environmentVariableMaximumSize) {
-        tl.warning(tl.loc('OutputVariableDataSizeExceeded', commandOutputLength, environmentVariableMaximumSize));
-    } else {
-        tl.setVariable("DockerOutput", result);
-    }
+registryAuthenticationToken
+.then(function success(authToken) {
+    // Connect to any specified container host and/or registry
+    var connection = new ContainerConnection();
+    connection.open(tl.getInput("dockerHostEndpoint"), authToken);
+    /* tslint:disable:no-var-requires */
+    require({
+        "build an image": "./containerbuild",
+        "tag images": "./containertag",
+        "push an image": "./containerpush",
+        "push images": "./containerpush",
+        "run an image": "./containerrun",
+        "run a docker command": "./containercommand"
+    }[action]).run(connection, (data) => result += data)
+    /* tslint:enable:no-var-requires */
+    .fin(function cleanup() {
+        connection.close();
+    })
+    .then(function success() {
+        var commandOutputLength = result.length;
+        if (commandOutputLength > environmentVariableMaximumSize) {
+            tl.warning(tl.loc('OutputVariableDataSizeExceeded', commandOutputLength, environmentVariableMaximumSize));
+        } else {
+            tl.setVariable("DockerOutput", result);
+        }
 
-    tl.setResult(tl.TaskResult.Succeeded, "");
-}, function failure(err) {
-    tl.setResult(tl.TaskResult.Failed, err.message);
-})
-.done();
+        tl.setResult(tl.TaskResult.Succeeded, "");
+    }, function failure(err) {
+        tl.setResult(tl.TaskResult.Failed, err.message);
+    })
+    .done();
+});

Tasks/DockerV0/make.json

@@ -5,6 +5,12 @@
                 "node_modules/azure-pipelines-tasks-docker-common/node_modules/azure-pipelines-task-lib"
             ],
             "options": "-Rf"
+        },
+        {
+            "items": [
+                "node_modules/azure-pipelines-tasks-azure-arm-rest-v2/node_modules/azure-pipelines-task-lib"
+            ],
+            "options": "-Rf"
         }
     ]
 }