Преглед изворни кода

Merge pull request #141 from zricethezav/feature/default-all

removing branch from report
Zachary Rice пре 7 година
родитељ
комит
5f6fb388ec
2 измењених фајлова са 13 додато и 18 уклоњено
  1. 10 12
      gitleaks_test.go
  2. 3 6
      main.go

+ 10 - 12
gitleaks_test.go

@@ -329,7 +329,6 @@ func TestWriteReport(t *testing.T) {
 			Message:  "get",
 			Author:   "some",
 			File:     "sleep",
-			Branch:   "thxu",
 			Date:     time.Now(),
 		},
 	}
@@ -444,17 +443,16 @@ func TestAuditRepo(t *testing.T) {
 	}
 
 	var tests = []struct {
-		testOpts          Options
-		description       string
-		expectedErrMsg    string
-		numLeaks          int
-		repo              *RepoDescriptor
-		whiteListFiles    []*regexp.Regexp
-		whiteListCommits  map[string]bool
-		whiteListBranches []string
-		whiteListRepos    []*regexp.Regexp
-		whiteListRegexes  []*regexp.Regexp
-		configPath        string
+		testOpts         Options
+		description      string
+		expectedErrMsg   string
+		numLeaks         int
+		repo             *RepoDescriptor
+		whiteListFiles   []*regexp.Regexp
+		whiteListCommits map[string]bool
+		whiteListRepos   []*regexp.Regexp
+		whiteListRegexes []*regexp.Regexp
+		configPath       string
 	}{
 		{
 			repo:        leaksRepo,

+ 3 - 6
main.go

@@ -44,7 +44,6 @@ type Leak struct {
 	Message  string    `json:"commitMsg"`
 	Author   string    `json:"author"`
 	File     string    `json:"file"`
-	Branch   string    `json:"branch"`
 	Repo     string    `json:"repo"`
 	Date     time.Time `json:"date"`
 }
@@ -330,9 +329,9 @@ func writeReport(leaks []Leak) error {
 		}
 		defer f.Close()
 		w := csv.NewWriter(f)
-		w.Write([]string{"repo", "line", "commit", "offender", "reason", "commitMsg", "author", "file", "branch", "date"})
+		w.Write([]string{"repo", "line", "commit", "offender", "reason", "commitMsg", "author", "file", "date"})
 		for _, leak := range leaks {
-			w.Write([]string{leak.Repo, leak.Line, leak.Commit, leak.Offender, leak.Type, leak.Message, leak.Author, leak.File, leak.Branch, leak.Date.Format(time.RFC3339)})
+			w.Write([]string{leak.Repo, leak.Line, leak.Commit, leak.Offender, leak.Type, leak.Message, leak.Author, leak.File, leak.Date.Format(time.RFC3339)})
 		}
 		w.Flush()
 	} else {
@@ -396,9 +395,7 @@ func cloneRepo() (*RepoDescriptor, error) {
 	}, nil
 }
 
-// auditGitRepo beings an audit on a git repository by checking the default HEAD branch, all branches, or
-// a single branch depending on what gitleaks is configured to do. Note when I say branch I really
-// mean reference as these branches are read only.
+// auditGitRepo beings an audit on a git repository
 func auditGitRepo(repo *RepoDescriptor) ([]Leak, error) {
 	var (
 		err   error