Update AzureContainerAppsV0 with latest changes (#17776)

* Update AzureContainerAppsV0 with latest changes

* Update package-lock.json using node 10.x and npm 6.x

* Resolve review feedback

* Add missing reference to 'os'

Author: cormacpayne

Tasks/AzureContainerAppsV0/README.md

@@ -13,9 +13,9 @@
   "loc.input.label.acrName": "Azure Container Registry name",
   "loc.input.help.acrName": "The name of the Azure Container Registry that the runnable application image will be pushed to.",
   "loc.input.label.acrUsername": "Azure Container Registry username",
-  "loc.input.help.acrUsername": "The username used to authenticate push requests to the provided Azure Contrainer Registry. If not provided, an access token will be generated via 'az acr login' and provided to 'docker login' to authenticate the requests.",
+  "loc.input.help.acrUsername": "The username used to authenticate push requests to the provided Azure Container Registry. If not provided, an access token will be generated via 'az acr login' and provided to 'docker login' to authenticate the requests.",
   "loc.input.label.acrPassword": "Azure Container Registry password",
-  "loc.input.help.acrPassword": "The password used to authenticate push requests to the provided Azure Contrainer Registry. If not provided, an access token will be generated via 'az acr login' and provided to 'docker login' to authenticate the requests.",
+  "loc.input.help.acrPassword": "The password used to authenticate push requests to the provided Azure Container Registry. If not provided, an access token will be generated via 'az acr login' and provided to 'docker login' to authenticate the requests.",
   "loc.input.label.dockerfilePath": "Dockerfile path",
   "loc.input.help.dockerfilePath": "Relative path to the Dockerfile in the provided application source that should be used to build the image that is then pushed to ACR and deployed to the Container App. If not provided, this task will check if there is a file named 'Dockerfile' at the root of the provided application source and use that to build the image. Otherwise, the Oryx++ Builder will be used to create the image.",
   "loc.input.label.imageToBuild": "Docker image to build",
@@ -32,6 +32,12 @@
   "loc.input.help.runtimeStack": "The platform version stack that the application runs in when deployed to the Azure Container App. This should be provided in the form of <platform>:<version>. If not provided, this value is determined by Oryx based on the contents of the provided application. Please view the following document for more information on the supported runtime stacks for Oryx: https://github.com/microsoft/Oryx/blob/main/doc/supportedRuntimeVersions.md",
   "loc.input.label.targetPort": "Application target port",
   "loc.input.help.targetPort": "The designated port for the application to run on. If not provided, this value is 80 for Python applications, and 8080 for all other supposed platforms.",
+  "loc.input.label.location": "Location of the Container App",
+  "loc.input.help.location": "The location that the Container App (and other created resources) will be deployed to.",
+  "loc.input.label.environmentVariables": "Environment variables",
+  "loc.input.help.environmentVariables": "A list of environment variable(s) for the container. Space-separated values in 'key=value' format. Empty string to clear existing values. Prefix value with 'secretref:' to reference a secret.",
+  "loc.input.label.disableTelemetry": "Disable telemetry",
+  "loc.input.help.disableTelemetry": "If set to 'true', no telemetry will be collected by this Azure DevOps Task. If set to 'false', or if this argument is not provided, telemetry will be sent to Microsoft about the Container App build and deploy scenario targeted by this Azure DevOps Task.",
   "loc.messages.AcrAccessTokenAuthFailed": "Unable to authenticate against ACR instance '%s.azurecr.io' with access token.",
   "loc.messages.AcrAccessTokenLoginMessage": "Logging in to Azure Container Registry using access token to be generated via Azure CLI.",
   "loc.messages.AcrUsernamePasswordAuthFailed": "Unable to authenticate against ACR instance '%s.azurecr.io' with username/password.",
@@ -54,7 +60,8 @@
   "loc.messages.ErrorCodeFormat": "Error Code: [%s]",
   "loc.messages.ErrorMessageFormat": "Error: %s",
   "loc.messages.FoundAppSourceDockerfileMessage": "Found existing Dockerfile in provided application source at path '%s'; image will be built from this Dockerfile.",
-  "loc.messages.InvalidArgumentsMessage": "Either appSourcePath or imageToDeploy must be provided, but not both.",
+  "loc.messages.MissingAcrNameMessage": "The acrName argument must also be provided if the appSourcePath argument is provided.",
+  "loc.messages.MissingImageToDeployMessage": "The argument imageToDeploy must be provided if neither appSourcePath nor acrName are provided.",
   "loc.messages.PackCliInstallFailed": "Unable to install pack CLI.",
   "loc.messages.PushImageToAcrFailed": "Unable to push image '%s' to ACR.",
   "loc.messages.SetDefaultBuilderFailed": "Unable to set the Oryx++ Builder as the default builder."

Tasks/AzureContainerAppsV0/Strings/resources.resjson/en-US/resources.resjson

@@ -27,21 +27,21 @@ describe('AzureContainerAppsV0 Suite', function () {
 
         runValidations(() => {
             assert(tr.failed, 'AzureContainerAppsV0 task should have failed when neither appSourcePath or imageToDeploy arguments are provided.');
-            assert(tr.stdout.includes('InvalidArgumentsMessage'), 'AzureContainerAppsV0 task should have failed when neither appSourcePath or imageToDeploy arguments are provided.');
+            assert(tr.stdout.includes('MissingImageToDeployMessage'), 'AzureContainerAppsV0 task should have failed when neither appSourcePath or imageToDeploy arguments are provided.');
         }, tr, done);
     });
 
-    it('Fails for both appSourcePath and imageToDeploy arguments', (done: Done) => {
+    it('Fails for appSourcePath provided without acrName', (done: Done) => {
         this.timeout(5000);
 
-        const tp: string = path.join(__dirname, 'L0FailsForBothAppSourcePathAndImageToDeploy.js');
+        const tp: string = path.join(__dirname, 'L0FailsForAppSourcePathWithoutAcrName.js');
         const tr: ttm.MockTestRunner = new ttm.MockTestRunner(tp);
 
         tr.run();
 
         runValidations(() => {
-            assert(tr.failed, 'AzureContainerAppsV0 task should have failed when both appSourcePath and imageToDeploy arguments are provided.');
-            assert(tr.stdout.includes('InvalidArgumentsMessage'), 'AzureContainerAppsV0 task should have failed when both appSourcePath and imageToDeploy arguments are provided.');
+            assert(tr.failed, 'AzureContainerAppsV0 task should have failed when appSourcePath is provided without acrName.');
+            assert(tr.stdout.includes('MissingAcrNameMessage'), 'AzureContainerAppsV0 task should have failed when appSourcePath is provided without acrName.');
         }, tr, done);
     });
 
@@ -59,20 +59,6 @@ describe('AzureContainerAppsV0 Suite', function () {
         }, tr, done);
     });
 
-    it('Fails for no ACR name argument', (done: Done) => {
-        this.timeout(5000);
-
-        const tp: string = path.join(__dirname, 'L0FailsForNoAcrNameArgument.js');
-        const tr: ttm.MockTestRunner = new ttm.MockTestRunner(tp);
-
-        tr.run();
-
-        runValidations(() => {
-            assert(tr.failed, 'AzureContainerAppsV0 task should have failed when no ACR name argument is provided.');
-            assert(tr.stdout.includes('Input required: acrName'), 'AzureContainerAppsV0 task should have failed when no ACR name argument is provided.');
-        }, tr, done);
-    });
-
     it('Succeeds for appSourcePath with bare minimum arguments', (done: Done) => {
         this.timeout(5000);
 
@@ -105,11 +91,9 @@ describe('AzureContainerAppsV0 Suite', function () {
 
         runValidations(() => {
             assert(tr.succeeded, 'AzureContainerAppsV0 task should have succeeded when the minimum required arguments are provided.');
-            assert(tr.stdout.includes('AcrAccessTokenLoginMessage'), 'AzureContainerAppsV0 task should use ACR access token for minimum imageToDeploy run.');
             assert(tr.stdout.includes('DefaultImageToBuildMessage'), 'AzureContainerAppsV0 task should set the default build image for minimum imageToDeploy run.');
             assert(tr.stdout.includes('DefaultContainerAppNameMessage'), 'AzureContainerAppsV0 task should set the default Container App name for minimum imageToDeploy run.');
             assert(tr.stdout.includes('DefaultResourceGroupMessage'), 'AzureContainerAppsV0 task should set the default resource group for minimum imageToDeploy run.');
-            assert(tr.stdout.includes('DefaultTargetPortMessage'), 'AzureContainerAppsV0 task should set the default target port for minimum imageToDeploy run.');
         }, tr, done);
     });
 

Tasks/AzureContainerAppsV0/Tests/L0.ts

@@ -7,7 +7,7 @@ const tmr: tmrm.TaskMockRunner = new tmrm.TaskMockRunner(taskPath);
 // Set required arguments for the test
 tmr.setInput('cwd', '/fakecwd');
 tmr.setInput('appSourcePath', '/samplepath');
-tmr.setInput('imageToDeploy', 'imagetodeploy');
+tmr.setInput('disableTelemetry', 'true');
 
 const tl = require('azure-pipelines-task-lib/mock-task');
 const tlClone = Object.assign({}, tl);

Tasks/AzureContainerAppsV0/Tests/L0FailsForBothAppSourcePathAndImageToDeploy.ts renamed to Tasks/AzureContainerAppsV0/Tests/L0FailsForAppSourcePathWithoutAcrName.ts

@@ -6,6 +6,7 @@ const tmr: tmrm.TaskMockRunner = new tmrm.TaskMockRunner(taskPath);
 
 // Set required arguments for the test
 tmr.setInput('cwd', '/fakecwd');
+tmr.setInput('disableTelemetry', 'true');
 
 const tl = require('azure-pipelines-task-lib/mock-task');
 const tlClone = Object.assign({}, tl);

Tasks/AzureContainerAppsV0/Tests/L0FailsForNeitherAppSourcePathOrImageToDeploy.ts

@@ -7,7 +7,8 @@ const tmr: tmrm.TaskMockRunner = new tmrm.TaskMockRunner(taskPath);
 
 // Set required arguments for the test
 tmr.setInput('cwd', '/fakecwd');
-tmr.setInput('appSourcePath', '/samplepath');
+tmr.setInput('imageToDeploy', 'imageToDeploy');
+tmr.setInput('disableTelemetry', 'true');
 
 const tl = require('azure-pipelines-task-lib/mock-task');
 const tlClone = Object.assign({}, tl);
@@ -32,6 +33,9 @@ tmr.registerMock('./src/Utility', {
         return {
             setAzureCliDynamicInstall: function() {
                 return;
+            },
+            isNullOrEmpty(str: string): boolean {
+                return str === null || str === undefined || str === "";
             }
         };
     }

Tasks/AzureContainerAppsV0/Tests/L0FailsForNoAcrNameArgument.ts

@@ -12,6 +12,7 @@ tmr.setInput('acrName', 'sampletestacr');
 tmr.setInput('acrUsername', 'acrtestusername');
 tmr.setInput('acrPassword', 'acrtestpassword');
 tmr.setInput('appSourcePath', '/samplepath');
+tmr.setInput('disableTelemetry', 'true');
 
 const tl = require('azure-pipelines-task-lib/mock-task');
 const tlClone = Object.assign({}, tl);
@@ -36,6 +37,9 @@ tmr.registerMock('./src/Utility', {
         return {
             setAzureCliDynamicInstall: function() {
                 return;
+            },
+            isNullOrEmpty(str: string): boolean {
+                return str === null || str === undefined || str === "";
             }
         };
     }

Tasks/AzureContainerAppsV0/Tests/L0FailsForNoServiceConnectionArgument.ts

@@ -10,6 +10,7 @@ tmr.setInput('cwd', '/fakecwd');
 tmr.setInput('connectedServiceNameARM', 'test-connectedServiceNameARM');
 tmr.setInput('acrName', 'sampletestacr');
 tmr.setInput('appSourcePath', '/samplepath');
+tmr.setInput('disableTelemetry', 'true');
 
 const tl = require('azure-pipelines-task-lib/mock-task');
 const tlClone = Object.assign({}, tl);
@@ -34,6 +35,9 @@ tmr.registerMock('./src/Utility', {
         return {
             setAzureCliDynamicInstall: function() {
                 return;
+            },
+            isNullOrEmpty(str: string): boolean {
+                return str === null || str === undefined || str === "";
             }
         };
     }

Tasks/AzureContainerAppsV0/Tests/L0SucceedsForAcrCredentials.ts

@@ -8,8 +8,8 @@ const tmr: tmrm.TaskMockRunner = new tmrm.TaskMockRunner(taskPath);
 // Set required arguments for the test
 tmr.setInput('cwd', '/fakecwd');
 tmr.setInput('connectedServiceNameARM', 'test-connectedServiceNameARM');
-tmr.setInput('acrName', 'sampletestacr');
 tmr.setInput('imageToDeploy', 'imagetodeploy');
+tmr.setInput('disableTelemetry', 'true');
 
 const tl = require('azure-pipelines-task-lib/mock-task');
 const tlClone = Object.assign({}, tl);
@@ -34,6 +34,9 @@ tmr.registerMock('./src/Utility', {
         return {
             setAzureCliDynamicInstall: function() {
                 return;
+            },
+            isNullOrEmpty(str: string): boolean {
+                return str === null || str === undefined || str === "";
             }
         };
     }