Просмотр исходного кода

Merge pull request #152 from camaya/fix-github-pr-nilcheck

Fix Github PR checks error
Zachary Rice 7 лет назад
Родитель
Сommit
342e9f80db
2 измененных файлов с 13 добавлено и 0 удалено
  1. 4 0
      github.go
  2. 9 0
      gitleaks_test.go

+ 4 - 0
github.go

@@ -51,6 +51,10 @@ func auditGithubPR() ([]Leak, error) {
 			}
 			}
 			files := commit.Files
 			files := commit.Files
 			for _, f := range files {
 			for _, f := range files {
+				if f.Patch == nil || f.Filename == nil {
+					continue
+				}
+
 				diff := gitDiff{
 				diff := gitDiff{
 					sha:          commit.GetSHA(),
 					sha:          commit.GetSHA(),
 					content:      *f.Patch,
 					content:      *f.Patch,

+ 9 - 0
gitleaks_test.go

@@ -311,6 +311,15 @@ func TestRun(t *testing.T) {
 				regexp.MustCompile("main.go"),
 				regexp.MustCompile("main.go"),
 			},
 			},
 		},
 		},
+		{
+			testOpts: Options{
+				GithubPR: "https://github.com/gitleakstest/gronit/pull/2",
+			},
+			description:    "test github pr with commits without patch info",
+			numLeaks:       0,
+			expectedErrMsg: "",
+			commitPerPage:  1,
+		},
 	}
 	}
 	g := goblin.Goblin(t)
 	g := goblin.Goblin(t)
 	for _, test := range tests {
 	for _, test := range tests {