Escaping block character for file match (#11791)

* Escaping block character for file match * Addressed review comments * Updated task version
microsoft · Nov 28, 2019 · aeabd3a · aeabd3a
1 parent 3546d7d
commit aeabd3a
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 10 deletions.
diff --git a/Tasks/AzureResourceGroupDeploymentV2/operations/ResourceGroup.ts b/Tasks/AzureResourceGroupDeploymentV2/operations/ResourceGroup.ts
@@ -278,7 +278,7 @@ export class ResourceGroup {
     private createDeploymentName(): string {
         var name: string;
         if (this.taskParameters.templateLocation == "Linked artifact") {
-            name = tl.findMatch(tl.getVariable("System.DefaultWorkingDirectory"), this.taskParameters.csmFile)[0];
+            name = tl.findMatch(tl.getVariable("System.DefaultWorkingDirectory"), this.escapeBlockCharacters(this.taskParameters.csmFile))[0];
         } else {
             name = this.taskParameters.csmFileLink;
         }
@@ -382,7 +382,7 @@ export class ResourceGroup {
 
     private getDeploymentDataForLinkedArtifact(): Deployment {
         var template: TemplateObject;
-        var fileMatches = tl.findMatch(tl.getVariable("System.DefaultWorkingDirectory"), this.taskParameters.csmFile);
+        var fileMatches = tl.findMatch(tl.getVariable("System.DefaultWorkingDirectory"), this.escapeBlockCharacters(this.taskParameters.csmFile));
         if (fileMatches.length > 1) {
             throw new Error(tl.loc("TemplateFilePatternMatchingMoreThanOneFile", fileMatches));
         }
@@ -405,7 +405,7 @@ export class ResourceGroup {
 
         var parameters: Map<string, ParameterValue> = {} as Map<string, ParameterValue>;
         if (utils.isNonEmpty(this.taskParameters.csmParametersFile)) {
-            var fileMatches = tl.findMatch(tl.getVariable("System.DefaultWorkingDirectory"), this.taskParameters.csmParametersFile);
+            var fileMatches = tl.findMatch(tl.getVariable("System.DefaultWorkingDirectory"), this.escapeBlockCharacters(this.taskParameters.csmParametersFile));
             if (fileMatches.length > 1) {
                 throw new Error(tl.loc("TemplateParameterFilePatternMatchingMoreThanOneFile", fileMatches));
             }
@@ -569,6 +569,10 @@ export class ResourceGroup {
         await this.performAzureDeployment(armClient, deployment, 3);
     }
 
+    private escapeBlockCharacters(str: string): string {
+        return str.replace(/[\[]/g, '$&[]');
+    }
+
     private enablePrereqDG = "ConfigureVMWithDGAgent";
     private enablePrereqWinRM = "ConfigureVMwithWinRM";
     private enablePrereqNone = "None";

diff --git a/Tasks/AzureResourceGroupDeploymentV2/task.json b/Tasks/AzureResourceGroupDeploymentV2/task.json
@@ -15,7 +15,7 @@
     "version": {
         "Major": 2,
         "Minor": 157,
-        "Patch": 7
+        "Patch": 8
     },
     "demands": [],
     "minimumAgentVersion": "2.119.1",

diff --git a/Tasks/AzureResourceGroupDeploymentV2/task.loc.json b/Tasks/AzureResourceGroupDeploymentV2/task.loc.json
@@ -15,7 +15,7 @@
   "version": {
     "Major": 2,
     "Minor": 157,
-    "Patch": 7
+    "Patch": 8
   },
   "demands": [],
   "minimumAgentVersion": "2.119.1",

diff --git a/Tasks/AzureResourceManagerTemplateDeploymentV3/operations/Utils.ts b/Tasks/AzureResourceManagerTemplateDeploymentV3/operations/Utils.ts
@@ -200,7 +200,7 @@ class Utils {
     public static createDeploymentName(taskParameters: armDeployTaskParameters.TaskParameters): string {
         var name: string;
         if (taskParameters.templateLocation == "Linked artifact") {
-            name = tl.findMatch(tl.getVariable("System.DefaultWorkingDirectory"), taskParameters.csmFile)[0];
+            name = tl.findMatch(tl.getVariable("System.DefaultWorkingDirectory"), this.escapeBlockCharacters(taskParameters.csmFile))[0];
         } else {
             name = taskParameters.csmFileLink;
         }
@@ -224,7 +224,7 @@ class Utils {
 
     public static getDeploymentDataForLinkedArtifact(taskParameters: armDeployTaskParameters.TaskParameters): DeploymentParameters {
         var template: TemplateObject;
-        var fileMatches = tl.findMatch(tl.getVariable("System.DefaultWorkingDirectory"), taskParameters.csmFile);
+        var fileMatches = tl.findMatch(tl.getVariable("System.DefaultWorkingDirectory"), this.escapeBlockCharacters(taskParameters.csmFile));
         if (fileMatches.length > 1) {
             throw new Error(tl.loc("TemplateFilePatternMatchingMoreThanOneFile", fileMatches));
         }
@@ -247,7 +247,7 @@ class Utils {
 
         var parameters: Map<string, ParameterValue> = {} as Map<string, ParameterValue>;
         if (this.isNonEmpty(taskParameters.csmParametersFile)) {
-            var fileMatches = tl.findMatch(tl.getVariable("System.DefaultWorkingDirectory"), taskParameters.csmParametersFile);
+            var fileMatches = tl.findMatch(tl.getVariable("System.DefaultWorkingDirectory"), this.escapeBlockCharacters(taskParameters.csmParametersFile));
             if (fileMatches.length > 1) {
                 throw new Error(tl.loc("TemplateParameterFilePatternMatchingMoreThanOneFile", fileMatches));
             }
@@ -403,6 +403,10 @@ class Utils {
 
         return result;
     }
+
+    private static escapeBlockCharacters(str: string): string {
+        return str.replace(/[\[]/g, '$&[]');
+    }
 }
 
 export = Utils;
diff --git a/Tasks/AzureResourceManagerTemplateDeploymentV3/task.json b/Tasks/AzureResourceManagerTemplateDeploymentV3/task.json
@@ -15,7 +15,7 @@
     "version": {
         "Major": 3,
         "Minor": 1,
-        "Patch": 4
+        "Patch": 5
     },
     "preview": "true",
     "demands": [],

diff --git a/Tasks/AzureResourceManagerTemplateDeploymentV3/task.loc.json b/Tasks/AzureResourceManagerTemplateDeploymentV3/task.loc.json
@@ -15,7 +15,7 @@
   "version": {
     "Major": 3,
     "Minor": 1,
-    "Patch": 4
+    "Patch": 5
   },
   "preview": "true",
   "demands": [],