Cleanup code

Author: Seth Rait

lib/main.js

@@ -35,11 +35,28 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const core = __importStar(require("@actions/core"));
 const msdo_1 = require("./msdo");
 const msdo_interface_1 = require("./msdo-interface");
+const common = __importStar(require("@microsoft/security-devops-actions-toolkit/msdo-common"));
+const msdo_helpers_1 = require("./msdo-helpers");
 function runMain() {
     return __awaiter(this, void 0, void 0, function* () {
-        yield (0, msdo_interface_1.getExecutor)(msdo_1.MicrosoftSecurityDevOps).runMain();
+        if (shouldRunMain()) {
+            yield (0, msdo_interface_1.getExecutor)(msdo_1.MicrosoftSecurityDevOps).runMain();
+        }
+        else {
+            console.log("Scanning is not enabled. Skipping...");
+        }
     });
 }
 runMain().catch(error => {
     core.setFailed(error);
 });
+function shouldRunMain() {
+    let toolsString = core.getInput('tools');
+    if (!common.isNullOrWhiteSpace(toolsString)) {
+        let tools = toolsString.split(',');
+        if (tools.length == 1 && tools[0].trim() == msdo_helpers_1.Tools.ContainerMapping) {
+            return false;
+        }
+        return true;
+    }
+}

src/main.ts

@@ -1,11 +1,34 @@
 import * as core from '@actions/core';
 import { MicrosoftSecurityDevOps } from './msdo';
 import { getExecutor } from './msdo-interface';
+import * as common from '@microsoft/security-devops-actions-toolkit/msdo-common';
+import { Tools } from './msdo-helpers';
 
 async function runMain() {
-    await getExecutor(MicrosoftSecurityDevOps).runMain();
+    if (shouldRunMain())
+    {
+        await getExecutor(MicrosoftSecurityDevOps).runMain();
+    }
+    else {
+        console.log("Scanning is not enabled. Skipping...");
+    }
 }
 
 runMain().catch(error => {
     core.setFailed(error);
-});
+});
+
+/**
+ * Returns false if the 'tools' input is specified and the only tool on the list is 'container-mapping'.
+ * This is because the MicrosoftSecurityDevOps executer does not have a workload for the container-mapping tool.
+*/
+function shouldRunMain() {
+   let toolsString: string = core.getInput('tools');
+   if (!common.isNullOrWhiteSpace(toolsString)) {
+        let tools = toolsString.split(',');
+        if (tools.length == 1 && tools[0].trim() == Tools.ContainerMapping) {
+            return false;
+        }
+        return true;
+   }
+}

src/msdo-helpers.ts

@@ -1,6 +1,5 @@
 import os from 'os';
 import { Writable } from "stream";
-import { IMicrosoftSecurityDevOps, IMicrosoftSecurityDevOpsFactory } from './msdo-interface';
 
 /**
  * Enum for the possible inputs for the task (specified in action.yml)

src/msdo.ts

@@ -73,7 +73,7 @@ export class MicrosoftSecurityDevOps implements IMicrosoftSecurityDevOps {
                 let tool = tools[i];
                 let toolTrimmed = tool.trim();
                 if (!common.isNullOrWhiteSpace(tool)
-                    && tool != Tools.ContainerMapping
+                    && tool != Tools.ContainerMapping // This tool is not handled by this executor
                     && includedTools.indexOf(toolTrimmed) == -1) {
                     if (includedTools.length == 0) {
                         args.push('--tool');