make enum params case insensitive (#77)

* make enum params case insensitive * use method from client library * removed extra param in one method for test
soos-io · Nov 8, 2023 · e951d92 · e951d92
1 parent 5a371d7
commit e951d92
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 41 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -16,7 +16,7 @@
     "check": "npm run format && npm run typecheck && npm outdated"
   },
   "dependencies": {
-    "@soos-io/api-client": "0.1.5",
+    "@soos-io/api-client": "0.1.6",
     "argparse": "^2.0.1",
     "axios": "^0.27.2",
     "tslib": "^2.6.2"

diff --git a/src/index.ts b/src/index.ts
@@ -11,6 +11,7 @@ import {
   convertStringToBase64,
   sleep,
   obfuscateProperties,
+  ensureEnumValue,
 } from "@soos-io/api-client/dist/utilities";
 import {
   ScanStatus,
@@ -94,11 +95,7 @@ class SOOSDASTAnalysis {
       help: "Target API format, OpenAPI, SOAP or GraphQL.",
       required: false,
       type: (value: string) => {
-        if (Object.values(ApiScanFormat).includes(value as ApiScanFormat)) {
-          return value as ApiScanFormat;
-        } else {
-          throw new Error(`Invalid Api Scan Format: ${value}`);
-        }
+        return ensureEnumValue(ApiScanFormat, value);
       },
     });
 
@@ -126,11 +123,7 @@ class SOOSDASTAnalysis {
       default: FormTypes.Simple,
       required: false,
       type: (value: string) => {
-        if (Object.values(FormTypes).includes(value as FormTypes)) {
-          return value as FormTypes;
-        } else {
-          throw new Error(`Invalid submit action: ${value}`);
-        }
+        return ensureEnumValue(FormTypes, value);
       },
     });
 
@@ -158,11 +151,7 @@ class SOOSDASTAnalysis {
       help: "Submit action to perform on form filled. Options: click or submit.",
       required: false,
       type: (value: string) => {
-        if (Object.values(SubmitActions).includes(value as SubmitActions)) {
-          return value as SubmitActions;
-        } else {
-          throw new Error(`Invalid submit action: ${value}`);
-        }
+        return ensureEnumValue(SubmitActions, value);
       },
     });
 
@@ -272,11 +261,7 @@ class SOOSDASTAnalysis {
       default: LogLevel.INFO,
       required: false,
       type: (value: string) => {
-        if (value in LogLevel) {
-          return LogLevel[value as keyof typeof LogLevel];
-        } else {
-          throw new Error(`Invalid log level: ${value}`);
-        }
+        return ensureEnumValue(LogLevel, value);
       },
     });
 
@@ -296,11 +281,7 @@ class SOOSDASTAnalysis {
       default: OnFailure.Continue,
       required: false,
       type: (value: string) => {
-        if (Object.values(OnFailure).includes(value as OnFailure)) {
-          return value as OnFailure;
-        } else {
-          throw new Error(`Invalid submit action: ${value}`);
-        }
+        return ensureEnumValue(OnFailure, value);
       },
     });
 
@@ -320,11 +301,7 @@ class SOOSDASTAnalysis {
       help: "Output format for vulnerabilities: only the value SARIF is available at the moment",
       required: false,
       type: (value: string) => {
-        if (value in OutputFormat) {
-          return OutputFormat[value as keyof typeof OutputFormat];
-        } else {
-          throw new Error(`Invalid output format: ${value}`);
-        }
+        return ensureEnumValue(OutputFormat, value);
       },
     });
 
@@ -356,11 +333,7 @@ class SOOSDASTAnalysis {
       default: ScanMode.Baseline,
       required: false,
       type: (value: string) => {
-        if (Object.values(ScanMode).includes(value as ScanMode)) {
-          return value as ScanMode;
-        } else {
-          throw new Error(`Invalid scan mode: ${value}`);
-        }
+        return ensureEnumValue(ScanMode, value);
       },
     });
 
@@ -447,6 +420,7 @@ class SOOSDASTAnalysis {
       }
 
       const zapCommandGenerator = new ZAPCommandGenerator(this.args);
+      soosLogger.info(`Generating ZAP command... ${this.args.scanMode}`);
       const command = zapCommandGenerator.runCommandGeneration(this.args.scanMode);
       soosLogger.info(`Running command: ${command}`);
       await SOOSDASTAnalysis.runZap(command);

diff --git a/tsconfig.json b/tsconfig.json
@@ -1,7 +1,7 @@
 /* Visit https://aka.ms/tsconfig.json to read more about this file */
 {
   "compilerOptions": {
-    "target": "ES2015", /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019', 'ES2020', or 'ESNEXT'. */
+    "target": "ES2021", /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019', 'ES2020', or 'ESNEXT'. */
     "module": "commonjs", /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', 'es2020', or 'ESNext'. */
     "outDir": "./dist",                        /* Redirect output structure to the directory. */
     "rootDir": "./src",                       /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */