diff --git a/checker/check_request.go b/checker/check_request.go index 611e1e37..cc8fe7c0 100644 --- a/checker/check_request.go +++ b/checker/check_request.go @@ -27,6 +27,6 @@ type CheckRequest struct { Client *github.Client GraphClient *githubv4.Client HTTPClient *http.Client - Owner, Repo string Logf func(s string, f ...interface{}) + Owner, Repo string } diff --git a/checker/check_result.go b/checker/check_result.go index 5af2c7ab..48ec7061 100644 --- a/checker/check_result.go +++ b/checker/check_result.go @@ -17,12 +17,12 @@ package checker const MaxResultConfidence = 10 type CheckResult struct { + Error error `json:"-"` Name string - Pass bool + Details []string Confidence int - Details []string `json:omitempty` - ShouldRetry bool `json:"-"` - Error error `json:"-"` + Pass bool + ShouldRetry bool `json:"-"` } func MakeInconclusiveResult(name string) CheckResult { diff --git a/e2e/executable_test.go b/e2e/executable_test.go index aef4ae8f..a3158d0b 100644 --- a/e2e/executable_test.go +++ b/e2e/executable_test.go @@ -27,9 +27,9 @@ type scorecard struct { Date string `json:"Date"` Checks []struct { CheckName string `json:"CheckName"` - Pass bool `json:"Pass"` - Confidence int `json:"Confidence"` Details []string `json:"Details"` + Confidence int `json:"Confidence"` + Pass bool `json:"Pass"` } `json:"Checks"` MetaData []string `json:"MetaData"` } diff --git a/roundtripper/roundtripper.go b/roundtripper/roundtripper.go index 0bc9da08..b278f5bd 100644 --- a/roundtripper/roundtripper.go +++ b/roundtripper/roundtripper.go @@ -53,8 +53,8 @@ type RateLimitRoundTripper struct { } type RoundRobinTokenSource struct { - AccessTokens []string log *zap.SugaredLogger + AccessTokens []string } func (r *RoundRobinTokenSource) Token() (*oauth2.Token, error) {