diff --git a/checker/check_request.go b/checker/check_request.go index c2bd1214..611e1e37 100644 --- a/checker/check_request.go +++ b/checker/check_request.go @@ -26,7 +26,7 @@ type CheckRequest struct { Ctx context.Context Client *github.Client GraphClient *githubv4.Client - HttpClient *http.Client + HTTPClient *http.Client Owner, Repo string Logf func(s string, f ...interface{}) } diff --git a/checks/cii_best_practices.go b/checks/cii_best_practices.go index 89370da6..66e3650e 100644 --- a/checks/cii_best_practices.go +++ b/checks/cii_best_practices.go @@ -34,13 +34,13 @@ type response struct { } func CIIBestPractices(c *checker.CheckRequest) checker.CheckResult { - repoUrl := fmt.Sprintf("https://github.com/%s/%s", c.Owner, c.Repo) - url := fmt.Sprintf("https://bestpractices.coreinfrastructure.org/projects.json?url=%s", repoUrl) + repoURL := fmt.Sprintf("https://github.com/%s/%s", c.Owner, c.Repo) + url := fmt.Sprintf("https://bestpractices.coreinfrastructure.org/projects.json?url=%s", repoURL) req, err := http.NewRequestWithContext(c.Ctx, "GET", url, nil) if err != nil { return checker.MakeRetryResult(ciiBestPracticesStr, err) } - resp, err := c.HttpClient.Do(req) + resp, err := c.HTTPClient.Do(req) if err != nil { return checker.MakeRetryResult(ciiBestPracticesStr, err) } diff --git a/cmd/root.go b/cmd/root.go index 10fbcf23..4d8c7e99 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -100,7 +100,7 @@ or ./scorecard --{npm,pypi,rubgems}= [--checks=check1,...] [--show } } - if err := repo.ValidGitHubUrl(); err != nil { + if err := repo.ValidGitHubURL(); err != nil { log.Fatal(err) } diff --git a/cron/main.go b/cron/main.go index f2843fef..3e192b95 100644 --- a/cron/main.go +++ b/cron/main.go @@ -67,7 +67,7 @@ func main() { if err := repoURL.Set(r.Repo); err != nil { panic(err) } - if err := repoURL.ValidGitHubUrl(); err != nil { + if err := repoURL.ValidGitHubURL(); err != nil { panic(err) } diff --git a/e2e/active_test.go b/e2e/active_test.go index dbaad610..24b1e6a1 100644 --- a/e2e/active_test.go +++ b/e2e/active_test.go @@ -30,7 +30,7 @@ var _ = Describe("E2E TEST:Active", func() { checkRequest := checker.CheckRequest{ Ctx: context.Background(), Client: ghClient, - HttpClient: client, + HTTPClient: client, Owner: "apache", Repo: "airflow", GraphClient: graphClient, diff --git a/e2e/branchprotection_test.go b/e2e/branchprotection_test.go index 9747faf4..a4fca300 100644 --- a/e2e/branchprotection_test.go +++ b/e2e/branchprotection_test.go @@ -30,7 +30,7 @@ var _ = Describe("E2E TEST:Branch Protection", func() { checkRequest := checker.CheckRequest{ Ctx: context.Background(), Client: ghClient, - HttpClient: client, + HTTPClient: client, Owner: "apache", Repo: "airflow", GraphClient: graphClient, diff --git a/e2e/ci_tests_test.go b/e2e/ci_tests_test.go index 049b755e..65804ba9 100644 --- a/e2e/ci_tests_test.go +++ b/e2e/ci_tests_test.go @@ -30,7 +30,7 @@ var _ = Describe("E2E TEST:CITests", func() { checkRequest := checker.CheckRequest{ Ctx: context.Background(), Client: ghClient, - HttpClient: client, + HTTPClient: client, Owner: "apache", Repo: "airflow", GraphClient: graphClient, diff --git a/e2e/cii_best_practices_test.go b/e2e/cii_best_practices_test.go index c81b9118..6f72bd6c 100644 --- a/e2e/cii_best_practices_test.go +++ b/e2e/cii_best_practices_test.go @@ -30,7 +30,7 @@ var _ = Describe("E2E TEST:CIIBestPractices", func() { checkRequest := checker.CheckRequest{ Ctx: context.Background(), Client: ghClient, - HttpClient: client, + HTTPClient: client, Owner: "tensorflow", Repo: "tensorflow", GraphClient: graphClient, diff --git a/e2e/code_review_test.go b/e2e/code_review_test.go index 0117f4e3..1e00c3f9 100644 --- a/e2e/code_review_test.go +++ b/e2e/code_review_test.go @@ -30,7 +30,7 @@ var _ = Describe("E2E TEST:CodeReview", func() { checkRequest := checker.CheckRequest{ Ctx: context.Background(), Client: ghClient, - HttpClient: client, + HTTPClient: client, Owner: "apache", Repo: "airflow", GraphClient: graphClient, diff --git a/e2e/contributors_test.go b/e2e/contributors_test.go index 9f1ddbc3..5dc7a159 100644 --- a/e2e/contributors_test.go +++ b/e2e/contributors_test.go @@ -30,7 +30,7 @@ var _ = Describe("E2E TEST:CodeReview", func() { checkRequest := checker.CheckRequest{ Ctx: context.Background(), Client: ghClient, - HttpClient: client, + HTTPClient: client, Owner: "ossf", Repo: "scorecard", GraphClient: graphClient, @@ -45,7 +45,7 @@ var _ = Describe("E2E TEST:CodeReview", func() { checkRequest := checker.CheckRequest{ Ctx: context.Background(), Client: ghClient, - HttpClient: client, + HTTPClient: client, Owner: "apache", Repo: "airflow", GraphClient: graphClient, diff --git a/e2e/frozen_deps_test.go b/e2e/frozen_deps_test.go index 7d491227..e9708a7a 100644 --- a/e2e/frozen_deps_test.go +++ b/e2e/frozen_deps_test.go @@ -30,7 +30,7 @@ var _ = Describe("E2E TEST:FrozenDeps", func() { checkRequest := checker.CheckRequest{ Ctx: context.Background(), Client: ghClient, - HttpClient: client, + HTTPClient: client, Owner: "tensorflow", Repo: "tensorflow", GraphClient: graphClient, diff --git a/e2e/fuzzing_test.go b/e2e/fuzzing_test.go index e6097626..c9296d6c 100644 --- a/e2e/fuzzing_test.go +++ b/e2e/fuzzing_test.go @@ -30,7 +30,7 @@ var _ = Describe("E2E TEST:Fuzzing", func() { checkRequest := checker.CheckRequest{ Ctx: context.Background(), Client: ghClient, - HttpClient: client, + HTTPClient: client, Owner: "tensorflow", Repo: "tensorflow", GraphClient: graphClient, diff --git a/e2e/packaging_test.go b/e2e/packaging_test.go index 3a338653..771115d7 100644 --- a/e2e/packaging_test.go +++ b/e2e/packaging_test.go @@ -30,7 +30,7 @@ var _ = Describe("E2E TEST:Packaging", func() { checkRequest := checker.CheckRequest{ Ctx: context.Background(), Client: ghClient, - HttpClient: client, + HTTPClient: client, Owner: "apache", Repo: "orc", GraphClient: graphClient, @@ -45,7 +45,7 @@ var _ = Describe("E2E TEST:Packaging", func() { checkRequest := checker.CheckRequest{ Ctx: context.Background(), Client: ghClient, - HttpClient: client, + HTTPClient: client, Owner: "ossf", Repo: "scorecard", GraphClient: graphClient, diff --git a/e2e/pull_requests_test.go b/e2e/pull_requests_test.go index 467d899f..f679e167 100644 --- a/e2e/pull_requests_test.go +++ b/e2e/pull_requests_test.go @@ -30,7 +30,7 @@ var _ = Describe("E2E TEST:PullRequests", func() { checkRequest := checker.CheckRequest{ Ctx: context.Background(), Client: ghClient, - HttpClient: client, + HTTPClient: client, Owner: "apache", Repo: "airflow", GraphClient: graphClient, diff --git a/e2e/sast_test.go b/e2e/sast_test.go index 1080529a..2e57bd5f 100644 --- a/e2e/sast_test.go +++ b/e2e/sast_test.go @@ -30,7 +30,7 @@ var _ = Describe("E2E TEST:SAST", func() { checkRequest := checker.CheckRequest{ Ctx: context.Background(), Client: ghClient, - HttpClient: client, + HTTPClient: client, Owner: "apache", Repo: "airflow", GraphClient: graphClient, diff --git a/e2e/security_policy_test.go b/e2e/security_policy_test.go index a7ba848b..1f9a8a54 100644 --- a/e2e/security_policy_test.go +++ b/e2e/security_policy_test.go @@ -30,7 +30,7 @@ var _ = Describe("E2E TEST:SecurityPolicy", func() { checkRequest := checker.CheckRequest{ Ctx: context.Background(), Client: ghClient, - HttpClient: client, + HTTPClient: client, Owner: "tensorflow", Repo: "tensorflow", GraphClient: graphClient, diff --git a/e2e/signedreleases_test.go b/e2e/signedreleases_test.go index fa53bc30..664072a8 100644 --- a/e2e/signedreleases_test.go +++ b/e2e/signedreleases_test.go @@ -30,7 +30,7 @@ var _ = Describe("E2E TEST:Signedreleases", func() { checkRequest := checker.CheckRequest{ Ctx: context.Background(), Client: ghClient, - HttpClient: client, + HTTPClient: client, Owner: "apache", Repo: "airflow", GraphClient: graphClient, diff --git a/e2e/signedtags_test.go b/e2e/signedtags_test.go index 8a580ba8..784d2e9a 100644 --- a/e2e/signedtags_test.go +++ b/e2e/signedtags_test.go @@ -31,7 +31,7 @@ var _ = Describe("E2E TEST:Signedtags", func() { checkRequest := checker.CheckRequest{ Ctx: context.Background(), Client: ghClient, - HttpClient: client, + HTTPClient: client, Owner: "bitcoin", Repo: "bitcoin", GraphClient: graphClient, diff --git a/pkg/scorecard.go b/pkg/scorecard.go index 2103c051..16849759 100644 --- a/pkg/scorecard.go +++ b/pkg/scorecard.go @@ -47,7 +47,7 @@ func runEnabledChecks(ctx context.Context, logger *zap.SugaredLogger, repo repos c := checker.CheckRequest{ Ctx: ctx, Client: ghClient, - HttpClient: client, + HTTPClient: client, Owner: repo.Owner, Repo: repo.Repo, GraphClient: graphClient, @@ -64,7 +64,7 @@ func runEnabledChecks(ctx context.Context, logger *zap.SugaredLogger, repo repos func RunScorecards(ctx context.Context, logger *zap.SugaredLogger, repo repos.RepoURL, checksToRun checker.CheckNameToFnMap) repos.RepoResult { ret := repos.RepoResult{ - Repo: repo.Url(), + Repo: repo.URL(), Date: time.Now().Format("2006-01-02"), } resultsCh := make(chan checker.CheckResult) diff --git a/repos/repo_url.go b/repos/repo_url.go index d196c7f3..22394225 100644 --- a/repos/repo_url.go +++ b/repos/repo_url.go @@ -30,7 +30,7 @@ func (r *RepoURL) Type() string { return "repo" } -func (r *RepoURL) Url() string { +func (r *RepoURL) URL() string { return fmt.Sprintf("%s/%s/%s", r.Host, r.Owner, r.Repo) } @@ -59,7 +59,7 @@ func (r *RepoURL) Set(s string) error { return nil } -func (r *RepoURL) ValidGitHubUrl() error { +func (r *RepoURL) ValidGitHubURL() error { switch r.Host { case "github.com": break @@ -68,7 +68,8 @@ func (r *RepoURL) ValidGitHubUrl() error { } if len(strings.TrimSpace(r.Owner)) == 0 || len(strings.TrimSpace(r.Repo)) == 0 { - return fmt.Errorf("invalid GitHub repo url: [%s], pass the full repository URL", r.Url()) + //nolint:goerr113 // This is not passing an error as an argument. + return fmt.Errorf("invalid GitHub repo url: [%s], pass the full repository URL", r.URL()) } return nil } diff --git a/repos/repo_url_test.go b/repos/repo_url_test.go index 9eaa5709..c4d7c84f 100644 --- a/repos/repo_url_test.go +++ b/repos/repo_url_test.go @@ -78,7 +78,7 @@ func TestRepoURL_ValidGitHubUrl(t *testing.T) { if err := r.Set(tt.args.s); err != nil { t.Errorf("RepoURL.Set() error = %v", err) } - if err := r.ValidGitHubUrl(); (err != nil) != tt.wantErr { + if err := r.ValidGitHubURL(); (err != nil) != tt.wantErr { t.Errorf("RepoURL.ValidGitHubUrl() error = %v, wantErr %v", err, tt.wantErr) } if !tt.wantErr {