Merge pull request #37 from Mystery00/master

fix: force specific project name cause scan failed
murphysecurity · Jun 13, 2022 · b8389a0 · b8389a0
2 parents e33f280 + 2055962
commit b8389a0
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/cmd/scan.go b/cmd/scan.go
@@ -16,7 +16,6 @@ var CliJsonOutput bool
 
 var DeepScan bool
 var ProjectId string
-var SpecificProjectName string
 
 func scanCmd() *cobra.Command {
 	c := &cobra.Command{
@@ -39,10 +38,8 @@ func scanCmd() *cobra.Command {
 				tt = model.TaskTypeJenkins
 			}
 			task := model.CreateScanTask(projectDir, model.TaskKindNormal, tt)
-			if SpecificProjectName != "" {
-				task.ProjectName = SpecificProjectName
-				// force set project dir, in order to create new project
-				task.ProjectDir = fmt.Sprintf(`/%s`, SpecificProjectName)
+			if env.SpecificProjectName != "" {
+				task.ProjectName = env.SpecificProjectName
 			}
 			task.EnableDeepScan = DeepScan
 			ctx = model.WithScanTask(ctx, task)
@@ -58,7 +55,7 @@ func scanCmd() *cobra.Command {
 		c.Flags().BoolVar(&DeepScan, "deep", false, "deep scan, will upload the source code")
 	}
 	c.Flags().StringVar(&ProjectId, "project-id", "", "team id")
-	c.Flags().StringVar(&SpecificProjectName, "project-name", "", "force specific project name")
+	c.Flags().StringVar(&env.SpecificProjectName, "project-name", "", "force specific project name")
 	c.Flags().BoolVar(&env.DisableGit, "skip-git", false, "force ignore git info")
 	c.Args = cobra.ExactArgs(1)
 	return c

diff --git a/env/common.go b/env/common.go
@@ -15,4 +15,5 @@ func envi(name string, defaultValue int) int {
 	}
 }
 
+var SpecificProjectName = ""
 var DisableGit = false
diff --git a/inspector/task_api.go b/inspector/task_api.go
@@ -2,6 +2,7 @@ package inspector
 
 import (
 	"context"
+	"fmt"
 	"github.com/google/uuid"
 	"github.com/murphysecurity/murphysec/api"
 	"github.com/murphysecurity/murphysec/conf"
@@ -39,6 +40,10 @@ func createTask(ctx context.Context) error {
 		}
 		req.GitInfo = v
 	}
+	if env.SpecificProjectName != "" {
+		// force set project dir, in order to create new project
+		req.TargetAbsPath = fmt.Sprintf(`/%s`, env.SpecificProjectName)
+	}
 	if res, e := api.CreateTask(req); e == nil {
 		c.TaskId = res.TaskInfo
 		c.TotalContributors = res.TotalContributors
-Original file line number
+Diff line change
@@ Expand Up / @@ -15,4 +15,5 @@ func envi(name string, defaultValue int) int { @@
     	}
     }
+    var SpecificProjectName = ""
     var DisableGit = false