فهرست منبع

--no-git should report relative path to --path (#519)

Zachary Rice 5 سال پیش
والد
کامیت
3932ed6baf
1فایلهای تغییر یافته به همراه12 افزوده شده و 2 حذف شده
  1. 12 2
      scan/nogit.go

+ 12 - 2
scan/nogit.go

@@ -73,7 +73,12 @@ func (ngs *NoGitScanner) Scan() (Report, error) {
 			for _, rule := range ngs.cfg.Rules {
 			for _, rule := range ngs.cfg.Rules {
 				if rule.HasFileOrPathLeakOnly(p) {
 				if rule.HasFileOrPathLeakOnly(p) {
 					leak := NewLeak("", "Filename or path offender: "+p, defaultLineNumber)
 					leak := NewLeak("", "Filename or path offender: "+p, defaultLineNumber)
-					leak.File = p
+					relPath, err := filepath.Rel(ngs.opts.Path, p)
+					if err != nil {
+						leak.File = p
+					} else {
+						leak.File = relPath
+					}
 					leak.Rule = rule.Description
 					leak.Rule = rule.Description
 					leak.Tags = strings.Join(rule.Tags, ", ")
 					leak.Tags = strings.Join(rule.Tags, ", ")
 
 
@@ -115,7 +120,12 @@ func (ngs *NoGitScanner) Scan() (Report, error) {
 					}
 					}
 
 
 					leak := NewLeak(line, offender, defaultLineNumber)
 					leak := NewLeak(line, offender, defaultLineNumber)
-					leak.File = p
+					relPath, err := filepath.Rel(ngs.opts.Path, p)
+					if err != nil {
+						leak.File = p
+					} else {
+						leak.File = relPath
+					}
 					leak.LineNumber = lineNumber
 					leak.LineNumber = lineNumber
 					leak.Rule = rule.Description
 					leak.Rule = rule.Description
 					leak.Tags = strings.Join(rule.Tags, ", ")
 					leak.Tags = strings.Join(rule.Tags, ", ")