Skip to content

Commit 1c270ab

Browse files
author
yubaichao
committed
propagate skip skill scan in start check
1 parent ff08bf4 commit 1c270ab

3 files changed

Lines changed: 9 additions & 5 deletions

File tree

api/start_check.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ func StartCheck(client *Client, task *model.ScanTask) error {
1111
var data = map[string]any{
1212
"subtask_id": task.SubtaskId,
1313
"package_private_name": task.MavenSourceName,
14+
"skip_skill_scan": task.SkipSkillScan,
1415
}
1516
if task.MavenSourceId != "" {
1617
data["package_private_id"] = task.MavenSourceId

cmd/murphy/internal/scan/scan.go

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -90,11 +90,12 @@ func envScan(ctx context.Context, windowsPatchScanTimeout time.Duration) (task *
9090
cv.DisplaySubtaskCreated(ctx, createTaskResp.ProjectsName, createTaskResp.SubtaskID)
9191
// create task object
9292
task = &model.ScanTask{
93-
Mode: createSubtask.ScanMode,
94-
AccessType: createSubtask.AccessType,
95-
TaskId: createTaskResp.TaskID,
96-
SubtaskId: createTaskResp.SubtaskID,
97-
SubtaskName: createSubtask.ProjectName,
93+
Mode: createSubtask.ScanMode,
94+
AccessType: createSubtask.AccessType,
95+
TaskId: createTaskResp.TaskID,
96+
SubtaskId: createTaskResp.SubtaskID,
97+
SkipSkillScan: createSubtask.SkipSkillScan,
98+
SubtaskName: createSubtask.ProjectName,
9899

99100
MaxSbomVersion: createTaskResp.MaxSbomVersion,
100101
}
@@ -240,6 +241,7 @@ func scan(ctx context.Context, dir string, accessType model.AccessType, mode mod
240241
ProjectPath: dir,
241242
TaskId: createTaskResp.TaskID,
242243
SubtaskId: createTaskResp.SubtaskID,
244+
SkipSkillScan: createSubtask.SkipSkillScan,
243245
SubtaskName: createSubtask.ProjectName,
244246
MavenSourceId: privateSourceId,
245247
MavenSourceName: privateSourceName,

model/scantask.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ type ScanTask struct {
1111
Mode ScanMode
1212
TaskId string
1313
SubtaskId string
14+
SkipSkillScan bool
1415
Modules []Module
1516
CodeFragments []ComponentCodeFragment
1617
Result *ScanResultResponse

0 commit comments

Comments
 (0)