Adding inline argument to PowerShell script (#11503) (#11550)

* Adding inline argument to powershell script

* Resolving PR comments

Author: jalajmsft

Tasks/AzureCLIV2/src/Utility.ts

@@ -14,9 +14,9 @@ export class Utility {
             }
             throw new Error(tl.loc('JS_InvalidFilePath', filePath));
         }
-        let tmpDir = tl.getVariable('Agent.TempDirectory') || os.tmpdir();
+        let tempDirectory = tl.getVariable('Agent.TempDirectory') || os.tmpdir();
         let inlineScript: string = tl.getInput("inlineScript", true);
-        let scriptPath: string = path.join(tmpDir, `azureclitaskscript${new Date().getTime()}.${fileExtensions[0]}`);
+        let scriptPath: string = path.join(tempDirectory, `azureclitaskscript${new Date().getTime()}.${fileExtensions[0]}`);
         await Utility.createFile(scriptPath, inlineScript);
         return scriptPath;
     }
@@ -32,26 +32,30 @@ export class Utility {
                 throw new Error(tl.loc('JS_InvalidErrorActionPreference', powerShellErrorActionPreference));
         }
 
+        // Write the script to disk.
+        tl.assertAgent('2.115.0');
+        let tempDirectory = tl.getVariable('Agent.TempDirectory') || os.tmpdir();
+
         let contents: string[] = [];
         contents.push(`$ErrorActionPreference = '${powerShellErrorActionPreference}'`);
-
-        if (scriptLocation === "scriptPath") {
-            let filePath: string = tl.getPathInput("scriptPath", true, true);
-            if (Utility.checkIfFileExists(filePath, fileExtensions)) {
-                let content: string = `. '${filePath.replace("'", "''")}' `;
-                if (scriptArguments) {
-                    content += scriptArguments;
-                }
-                contents.push(content.trim());
-            }
-            else {
+        let filePath: string = tl.getPathInput("scriptPath", false, true);;
+        if (scriptLocation === "inlineScript") {
+            let inlineScript: string = tl.getInput("inlineScript", true);
+            filePath = path.join(tempDirectory, `azureclitaskscript${new Date().getTime()}_inlinescript.${fileExtensions[0]}`);
+            await Utility.createFile(filePath, inlineScript);
+        }
+        else{
+            if (!Utility.checkIfFileExists(filePath, fileExtensions)) {
                 throw new Error(tl.loc('JS_InvalidFilePath', filePath));
             }
         }
-        else {
-            let inlineScript: string = tl.getInput("inlineScript", true);
-            contents.push(inlineScript);
+
+        let content: string = `. '${filePath.replace("'", "''")}' `;
+        if (scriptArguments) {
+            content += scriptArguments;
         }
+        contents.push(content.trim());
+
         let powerShellIgnoreLASTEXITCODE: string = tl.getInput('powerShellIgnoreLASTEXITCODE', false);
         if (!powerShellIgnoreLASTEXITCODE) {
             contents.push(`if (!(Test-Path -LiteralPath variable:\LASTEXITCODE)) {`);
@@ -62,12 +66,7 @@ export class Utility {
             contents.push(`}`);
         }
 
-        // Write the script to disk.
-        tl.assertAgent('2.115.0');
-        let tempDirectory = tl.getVariable('agent.tempDirectory');
-        tl.checkPath(tempDirectory, `${tempDirectory} (agent.tempDirectory)`);
         let scriptPath: string = path.join(tempDirectory, `azureclitaskscript${new Date().getTime()}.${fileExtensions[0]}`);
-
         await Utility.createFile(scriptPath, '\ufeff' + contents.join(os.EOL), { encoding: 'utf8' });
         return scriptPath;
     }

Tasks/AzureCLIV2/task.json

@@ -21,7 +21,7 @@
     "version": {
         "Major": 2,
         "Minor": 0,
-        "Patch": 2
+        "Patch": 3
     },
     "minimumAgentVersion": "2.0.0",
     "instanceNameFormat": "Azure CLI $(scriptPath)",

Tasks/AzureCLIV2/task.loc.json

@@ -21,7 +21,7 @@
   "version": {
     "Major": 2,
     "Minor": 0,
-    "Patch": 2
+    "Patch": 3
   },
   "minimumAgentVersion": "2.0.0",
   "instanceNameFormat": "ms-resource:loc.instanceNameFormat",