Merge pull request #1292 from snyk/feat/refactor-project-type-validation

chore: simplify supported projects validation on test

src/lib/snyk-test/index.js

@@ -55,24 +55,26 @@ function executeTest(root, options) {
 }
 
 function run(root, options) {
+  const projectType = options.packageManager;
+  validateProjectType(options, projectType);
+  return runTest(projectType, root, options);
+}
+
+function validateProjectType(options, projectType) {
   if (options.iac) {
-    const projectType = options.packageManager;
     if (!iacProjects.TEST_SUPPORTED_IAC_PROJECTS.includes(projectType)) {
       throw new NotSupportedIacFileError(projectType);
     }
-    return runTest(projectType, root, options);
-  }
-
-  const packageManager = options.packageManager;
-  if (
-    !(
-      options.docker ||
-      options.allProjects ||
-      options.yarnWorkspaces ||
-      pm.SUPPORTED_PACKAGE_MANAGER_NAME[packageManager]
-    )
-  ) {
-    throw new UnsupportedPackageManagerError(packageManager);
+  } else {
+    if (
+      !(
+        options.docker ||
+        options.allProjects ||
+        options.yarnWorkspaces ||
+        pm.SUPPORTED_PACKAGE_MANAGER_NAME[projectType]
+      )
+    ) {
+      throw new UnsupportedPackageManagerError(projectType);
+    }
   }
-  return runTest(packageManager, root, options);
 }