Invert the --tools ordering

davidknise · davidknise · commit 22220696eecc · 2023-11-14T14:09:14.000-08:00
diff --git a/lib/msdo.js b/lib/msdo.js
@@ -96,10 +96,10 @@ class MicrosoftSecurityDevOps {
                     if (!common.isNullOrWhiteSpace(tool)
                         && tool != msdo_helpers_1.Tools.ContainerMapping
                         && includedTools.indexOf(toolTrimmed) == -1) {
-                        args.push(toolTrimmed);
                         if (includedTools.length == 0) {
                             args.push('--tool');
                         }
+                        args.push(toolTrimmed);
                         includedTools.push(toolTrimmed);
                     }
                 }
@@ -113,10 +113,10 @@ class MicrosoftSecurityDevOps {
                     if (!common.isNullOrWhiteSpace(includeTool)
                         && includeTool != msdo_helpers_1.Tools.ContainerMapping
                         && includedTools.indexOf(toolTrimmed) == -1) {
-                        args.push(toolTrimmed);
                         if (includedTools.length == 0) {
                             args.push('--tool');
                         }
+                        args.push(toolTrimmed);
                         includedTools.push(toolTrimmed);
                     }
                 }
diff --git a/src/msdo.ts b/src/msdo.ts
@@ -75,10 +75,10 @@ export class MicrosoftSecurityDevOps implements IMicrosoftSecurityDevOps {
                 if (!common.isNullOrWhiteSpace(tool)
                     && tool != Tools.ContainerMapping
                     && includedTools.indexOf(toolTrimmed) == -1) {
-                    args.push(toolTrimmed);
                     if (includedTools.length == 0) {
                         args.push('--tool');
                     }
+                    args.push(toolTrimmed);
                     includedTools.push(toolTrimmed);
                 }
             }
@@ -93,10 +93,10 @@ export class MicrosoftSecurityDevOps implements IMicrosoftSecurityDevOps {
                 if (!common.isNullOrWhiteSpace(includeTool)
                     && includeTool != Tools.ContainerMapping
                     && includedTools.indexOf(toolTrimmed) == -1) {
-                    args.push(toolTrimmed);
                     if (includedTools.length == 0) {
                         args.push('--tool');
                     }
+                    args.push(toolTrimmed);
                     includedTools.push(toolTrimmed);
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -96,10 +96,10 @@ class MicrosoftSecurityDevOps {`
`96`	`96`	`if (!common.isNullOrWhiteSpace(tool)`
`97`	`97`	`&& tool != msdo_helpers_1.Tools.ContainerMapping`
`98`	`98`	`&& includedTools.indexOf(toolTrimmed) == -1) {`
`99`		`- args.push(toolTrimmed);`
`100`	`99`	`if (includedTools.length == 0) {`
`101`	`100`	`args.push('--tool');`
`102`	`101`	`}`
	`102`	`+ args.push(toolTrimmed);`
`103`	`103`	`includedTools.push(toolTrimmed);`
`104`	`104`	`}`
`105`	`105`	`}`
`@@ -113,10 +113,10 @@ class MicrosoftSecurityDevOps {`
`113`	`113`	`if (!common.isNullOrWhiteSpace(includeTool)`
`114`	`114`	`&& includeTool != msdo_helpers_1.Tools.ContainerMapping`
`115`	`115`	`&& includedTools.indexOf(toolTrimmed) == -1) {`
`116`		`- args.push(toolTrimmed);`
`117`	`116`	`if (includedTools.length == 0) {`
`118`	`117`	`args.push('--tool');`
`119`	`118`	`}`
	`119`	`+ args.push(toolTrimmed);`
`120`	`120`	`includedTools.push(toolTrimmed);`
`121`	`121`	`}`
`122`	`122`	`}`
Original file line number	Diff line number	Diff line change
`@@ -75,10 +75,10 @@ export class MicrosoftSecurityDevOps implements IMicrosoftSecurityDevOps {`
`75`	`75`	`if (!common.isNullOrWhiteSpace(tool)`
`76`	`76`	`&& tool != Tools.ContainerMapping`
`77`	`77`	`&& includedTools.indexOf(toolTrimmed) == -1) {`
`78`		`- args.push(toolTrimmed);`
`79`	`78`	`if (includedTools.length == 0) {`
`80`	`79`	`args.push('--tool');`
`81`	`80`	`}`
	`81`	`+ args.push(toolTrimmed);`
`82`	`82`	`includedTools.push(toolTrimmed);`
`83`	`83`	`}`
`84`	`84`	`}`
`@@ -93,10 +93,10 @@ export class MicrosoftSecurityDevOps implements IMicrosoftSecurityDevOps {`
`93`	`93`	`if (!common.isNullOrWhiteSpace(includeTool)`
`94`	`94`	`&& includeTool != Tools.ContainerMapping`
`95`	`95`	`&& includedTools.indexOf(toolTrimmed) == -1) {`
`96`		`- args.push(toolTrimmed);`
`97`	`96`	`if (includedTools.length == 0) {`
`98`	`97`	`args.push('--tool');`
`99`	`98`	`}`
	`99`	`+ args.push(toolTrimmed);`
`100`	`100`	`includedTools.push(toolTrimmed);`
`101`	`101`	`}`
`102`	`102`	`}`