Skip to content

Commit b741487

Browse files
authored
Merge pull request #69 from snyk/fix/additional-arguments-as-last-parameter
fix: add additional arguments as last parameter to snyk test command
2 parents e66e549 + 5c49194 commit b741487

File tree

5 files changed

+10
-6
lines changed

5 files changed

+10
-6
lines changed

ops/deploy/test-builds.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,9 @@
66
{
77
"projectName": "goof_windows",
88
"buildDefinitionId": 10
9+
},
10+
{
11+
"projectName": "azure-maven-multimodule-goof",
12+
"buildDefinitionId": 16
913
}
1014
]

snykTask/src/__tests__/_test-mock-config-basic-smoke-test-docker.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ const answers: ma.TaskLibAnswers = {
4848
code: 0,
4949
stdout: "Snyk CLI authorized!"
5050
},
51-
"/usr/bin/snyk test --docker myImage --file=Dockerfile --someAdditionalArgs --json-file-output=report.json": {
51+
"/usr/bin/snyk test --docker myImage --file=Dockerfile --json-file-output=report.json --someAdditionalArgs": {
5252
code: 0,
5353
stdout: "No issues found"
5454
},

snykTask/src/__tests__/_test-mock-config-basic-smoke-test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ const answers: ma.TaskLibAnswers = {
5050
code: 0,
5151
stdout: "No issues found"
5252
},
53-
"/usr/bin/snyk test --someAdditionalArgs --json-file-output=report.json": {
53+
"/usr/bin/snyk test --json-file-output=report.json --someAdditionalArgs": {
5454
code: 0,
5555
stdout: "No issues found"
5656
},

snykTask/src/__tests__/test-task.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ test("basic smoke test - inputs are ok", () => {
3838
);
3939
expect(
4040
mockTestRunner.cmdlines[
41-
"/usr/bin/snyk test --someAdditionalArgs --json-file-output=report.json"
41+
"/usr/bin/snyk test --json-file-output=report.json --someAdditionalArgs"
4242
]
4343
).toBe(true);
4444
expect(mockTestRunner.cmdlines["/usr/bin/snyk-to-html -i report.json"]).toBe(
@@ -70,7 +70,7 @@ test("basic smoke test for container test - inputs are ok", () => {
7070
);
7171
expect(
7272
mockTestRunner.cmdlines[
73-
"/usr/bin/snyk test --docker myImage --file=Dockerfile --someAdditionalArgs --json-file-output=report.json"
73+
"/usr/bin/snyk test --docker myImage --file=Dockerfile --json-file-output=report.json --someAdditionalArgs"
7474
]
7575
).toBe(true);
7676
expect(mockTestRunner.cmdlines["/usr/bin/snyk-to-html -i report.json"]).toBe(

snykTask/src/index.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -183,8 +183,8 @@ async function runSnykTest(
183183
.argIf(taskArgs.dockerImageName, `--docker`)
184184
.argIf(taskArgs.dockerImageName, `${taskArgs.dockerImageName}`)
185185
.argIf(fileArg, `--file=${fileArg}`)
186-
.line(taskArgs.additionalArguments)
187-
.arg(`--json-file-output=${jsonReportOutputPath}`);
186+
.arg(`--json-file-output=${jsonReportOutputPath}`)
187+
.line(taskArgs.additionalArguments);
188188

189189
const options = getOptionsToExecuteSnykCLICommand(
190190
taskArgs,

0 commit comments

Comments
 (0)