azure-pipelines-tasks-webdeployment-common 4.247.0 → 4.253.0

package/fileTransformationsUtility.js

@@ -154,14 +154,18 @@ function enhancedFileTransformations(isFolderBasedDeployment, xmlTransformation,
         }
     }
     isSubstitutionApplied = true;
+    let InputErrors = tl.getBoolInput('errorOnInvalidSubstitution', false);
     if (jsonTargetFiles.length > 0) {
         isSubstitutionApplied = jsonSubstitutionUtility.jsonVariableSubstitution(folderPath, jsonTargetFiles, true);
         if (isSubstitutionApplied) {
             console.log(tl.loc('JSONvariablesubstitutionappliedsuccessfully'));
         }
-        else {
+        else if (InputErrors) {
             throw Error(tl.loc('FailedToApplyJSONvariablesubstitutionReason1'));
         }
+        else {
+            tl.error(tl.loc('FailedToApplyJSONvariablesubstitutionReason1'));
+        }
     }
 }
 exports.enhancedFileTransformations = enhancedFileTransformations;

package/jsonvariablesubstitutionutility.js

@@ -167,6 +167,7 @@ exports.stripJsonComments = stripJsonComments;
 function jsonVariableSubstitution(absolutePath, jsonSubFiles, substituteAllTypes) {
     var envVarObject = createEnvTree(tl.getVariables());
     let isSubstitutionApplied = false;
+    let emptyFiles = [];
     for (let jsonSubFile of jsonSubFiles) {
         console.log(tl.loc('JSONvariableSubstitution', jsonSubFile));
         var matchFiles = utility.findfiles(path.join(absolutePath, jsonSubFile));
@@ -174,29 +175,38 @@ function jsonVariableSubstitution(absolutePath, jsonSubFiles, substituteAllTypes
             throw new Error(tl.loc('NOJSONfilematchedwithspecificpattern', jsonSubFile));
         }
         for (let file of matchFiles) {
+            console.log("Processing file: " + file);
             var fileBuffer = fs.readFileSync(file);
-            var fileEncodeType = fileEncoding.detectFileEncoding(file, fileBuffer);
-            var fileContent = fileBuffer.toString(fileEncodeType[0]);
-            if (fileEncodeType[1]) {
-                fileContent = fileContent.slice(1);
-            }
-            try {
-                fileContent = stripJsonComments(fileContent);
-                var jsonObject = JSON.parse(fileContent);
-            }
-            catch (exception) {
-                throw Error(tl.loc('JSONParseError', file, exception));
-            }
-            console.log(tl.loc('JSONvariableSubstitution', file));
-            if (substituteAllTypes) {
-                isSubstitutionApplied = substituteJsonVariableV2(jsonObject, envVarObject) || isSubstitutionApplied;
+            if (fileBuffer.length > 4) {
+                var fileEncodeType = fileEncoding.detectFileEncoding(file, fileBuffer);
+                var fileContent = fileBuffer.toString(fileEncodeType[0]);
+                if (fileEncodeType[1]) {
+                    fileContent = fileContent.slice(1);
+                }
+                try {
+                    fileContent = stripJsonComments(fileContent);
+                    var jsonObject = JSON.parse(fileContent);
+                }
+                catch (exception) {
+                    throw Error(tl.loc('JSONParseError', file, exception));
+                }
+                console.log(tl.loc('JSONvariableSubstitution', file));
+                if (substituteAllTypes) {
+                    isSubstitutionApplied = substituteJsonVariableV2(jsonObject, envVarObject) || isSubstitutionApplied;
+                }
+                else {
+                    isSubstitutionApplied = substituteJsonVariable(jsonObject, envVarObject) || isSubstitutionApplied;
+                }
+                tl.writeFile(file, (fileEncodeType[1] ? '\uFEFF' : '') + JSON.stringify(jsonObject, null, 4), fileEncodeType[0]);
             }
             else {
-                isSubstitutionApplied = substituteJsonVariable(jsonObject, envVarObject) || isSubstitutionApplied;
+                emptyFiles.push(file);
             }
-            tl.writeFile(file, (fileEncodeType[1] ? '\uFEFF' : '') + JSON.stringify(jsonObject, null, 4), fileEncodeType[0]);
         }
     }
+    if (emptyFiles.length > 0) {
+        console.log(`The following input files either empty: ${emptyFiles.join(', ')}. No substitution was performed.`);
+    }
     return isSubstitutionApplied;
 }
 exports.jsonVariableSubstitution = jsonVariableSubstitution;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "azure-pipelines-tasks-webdeployment-common",
-    "version": "4.247.0",
+    "version": "4.253.0",
     "description": "Common Lib for MSDeploy Utility",
     "repository": {
         "type": "git",