Merge pull request #153 from snyk/develop

Merge develop into master for release
snyk · Nov 17, 2022 · f50264b · f50264b
2 parents 60fbca5 + 8716fff
commit f50264b
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 2 deletions.
diff --git a/snykTask/src/__tests__/test-task-args.ts b/snykTask/src/__tests__/test-task-args.ts
@@ -89,6 +89,15 @@ test('if dockerImageName is set and both targetFile and dockerfilePath are set,
   expect(fileArg).toBe('good/Dockerfile');
 });
 
+test('project name is wrapped in quotes, if project name contains space', () => {
+  const args = defaultTaskArgs();
+  args.projectName = 'my project';
+
+  const projectNameArg = args.getProjectNameParameter();
+
+  expect(projectNameArg).toBe('"my project"');
+});
+
 test('ensure that ignoreUnknownCA is false by default', () => {
   const args = defaultTaskArgs();
   expect(args.ignoreUnknownCA).toBe(false);

diff --git a/snykTask/src/index.ts b/snykTask/src/index.ts
@@ -138,6 +138,7 @@ async function runSnykTest(
   let errorMsg = '';
   let code = 0;
   const fileArg = taskArgs.getFileParameter();
+  const projectNameArg = taskArgs.getProjectNameParameter();
 
   const snykTestToolRunner = tl
     .tool(snykPath)
@@ -151,7 +152,7 @@ async function runSnykTest(
     .argIf(fileArg, `--file=${fileArg}`)
     .argIf(taskArgs.ignoreUnknownCA, `--insecure`)
     .argIf(taskArgs.organization, `--org=${taskArgs.organization}`)
-    .argIf(taskArgs.projectName, `--project-name=${taskArgs.projectName}`)
+    .argIf(taskArgs.projectName, `--project-name=${projectNameArg}`)
     .arg(`--json-file-output=${jsonReportOutputPath}`)
     .line(taskArgs.additionalArguments);
 
@@ -228,6 +229,7 @@ async function runSnykMonitor(
 ): Promise<SnykOutput> {
   let errorMsg = '';
   const fileArg = taskArgs.getFileParameter();
+  const projectNameArg = taskArgs.getProjectNameParameter();
   const options = getOptionsToExecuteSnykCLICommand(
     taskArgs,
     taskNameForAnalytics,
@@ -241,7 +243,7 @@ async function runSnykMonitor(
     .argIf(taskArgs.dockerImageName, `${taskArgs.dockerImageName}`)
     .argIf(fileArg, `--file=${fileArg}`)
     .argIf(taskArgs.organization, `--org=${taskArgs.organization}`)
-    .argIf(taskArgs.projectName, `--project-name=${taskArgs.projectName}`)
+    .argIf(taskArgs.projectName, `--project-name=${projectNameArg}`)
     .argIf(taskArgs.ignoreUnknownCA, `--insecure`)
     .line(taskArgs.additionalArguments);
 

diff --git a/snykTask/src/task-args.ts b/snykTask/src/task-args.ts
@@ -89,6 +89,19 @@ class TaskArgs {
     }
   }
 
+  getProjectNameParameter() {
+    if (!this.projectName) {
+      return undefined;
+    }
+
+    if (this.projectName.indexOf(' ') >= 0) {
+      console.log('project name contains space');
+      return `"${this.projectName}"`;
+    }
+
+    return this.projectName;
+  }
+
   public validate() {
     if (this.failOnThreshold) {
       if (this.isNotValidThreshold(this.failOnThreshold)) {