Fixes a boolean check on the OS Type option (#24)

Fixing options bool check for OS Type
Azure · Nov 24, 2020 · 91a439f · 91a439f
1 parent 7f33cb7
commit 91a439f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/.prettierignore b/.prettierignore
@@ -0,0 +1 @@
+*
diff --git a/lib/taskparameters.js b/lib/taskparameters.js
@@ -55,8 +55,8 @@ class TaskParameters {
         this._memory = parseFloat(core.getInput('memory'));
         this._containerName = core.getInput('name', { required: true });
         let osType = core.getInput('os-type');
-        if (osType != 'Linux' && 'Windows') {
-            throw Error('The Value of OS Type must be either Linux or Windows only!');
+        if (["Linux", "Windows"].includes(osType) == false) {
+            throw Error(`The Value of OS Type must be either Linux or Windows only - got ${osType}!`);
         }
         else {
             this._osType = (osType == 'Linux') ? 'Linux' : 'Windows';
@@ -120,8 +120,8 @@ class TaskParameters {
             keyValuePairs.forEach((pair) => {
                 // value is either wrapped in quotes or not
                 let pairList = pair.split(/=(?:"(.+)"|(.+))/);
-                let obj = { 
-                    "name": pairList[0], 
+                let obj = {
+                    "name": pairList[0],
                     "value": pairList[1] || pairList[2]
                 };
                 this._environmentVariables.push(obj);
@@ -133,8 +133,8 @@ class TaskParameters {
             keyValuePairs.forEach((pair) => {
                 // value is either wrapped in quotes or not
                 let pairList = pair.split(/=(?:"(.+)"|(.+))/);
-                let obj = { 
-                    "name": pairList[0], 
+                let obj = {
+                    "name": pairList[0],
                     "value": pairList[1] || pairList[2]
                 };
                 this._environmentVariables.push(obj);

diff --git a/src/taskparameters.ts b/src/taskparameters.ts
@@ -76,12 +76,14 @@ export class TaskParameters {
         this._location = core.getInput('location', { required: true });
         this._memory = parseFloat(core.getInput('memory'));
         this._containerName = core.getInput('name', { required: true });
+
         let osType = core.getInput('os-type');
-        if(osType != 'Linux' && 'Windows') {
-            throw Error('The Value of OS Type must be either Linux or Windows only!')
+        if (["Linux", "Windows"].includes(osType) == false) {
+            throw Error(`The Value of OS Type must be either Linux or Windows only - got ${osType}!`);
         } else {
             this._osType = (osType == 'Linux') ? 'Linux' : 'Windows';
         }
+
         let ports = core.getInput('ports');
         this._ports = [];
         this._getPorts(ports);