From 6c1c789dc5b05cde492334f57b53807c786b038a Mon Sep 17 00:00:00 2001 From: Naveen <172697+naveensrinivasan@users.noreply.github.com> Date: Thu, 7 Oct 2021 19:16:01 -0400 Subject: [PATCH] :seedling: v3 upgrade changes (#1118) v3 go.mod changes --- checker/check_request.go | 2 +- checker/check_runner.go | 4 +-- checks/all_checks.go | 2 +- checks/binary_artifact.go | 4 +-- checks/branch_protection.go | 6 ++-- checks/branch_protection_test.go | 10 +++---- checks/ci_tests.go | 6 ++-- checks/cii_best_practices.go | 4 +-- checks/code_review.go | 4 +-- checks/contributors.go | 4 +-- checks/dependency_update_tool.go | 2 +- checks/file_utils.go | 6 ++-- checks/fuzzing.go | 8 ++--- checks/maintained.go | 4 +-- checks/packaging.go | 4 +-- checks/permissions.go | 4 +-- checks/permissions_test.go | 4 +-- checks/pinned_dependencies.go | 4 +-- checks/pinned_dependencies_test.go | 4 +-- checks/sast.go | 6 ++-- checks/security_policy.go | 6 ++-- checks/shell_download_validate.go | 4 +-- checks/signed_releases.go | 4 +-- checks/vulnerabilities.go | 4 +-- clients/githubrepo/branches.go | 4 +-- clients/githubrepo/checkruns.go | 4 +-- clients/githubrepo/client.go | 6 ++-- clients/githubrepo/contributors.go | 2 +- clients/githubrepo/graphql.go | 4 +-- clients/githubrepo/releases.go | 4 +-- clients/githubrepo/repo_url.go | 4 +-- clients/githubrepo/roundtripper/census.go | 4 +-- clients/githubrepo/roundtripper/rate_limit.go | 2 +- clients/githubrepo/roundtripper/transport.go | 2 +- clients/githubrepo/search.go | 2 +- clients/githubrepo/search_test.go | 2 +- clients/githubrepo/statuses.go | 4 +-- clients/githubrepo/tarball.go | 2 +- clients/githubrepo/workflows.go | 4 +-- clients/mockrepo/client.go | 2 +- clients/mockrepo/repo.go | 2 +- cmd/root.go | 16 +++++----- cmd/serve.go | 8 ++--- cmd/version.go | 2 +- cron/bq/main.go | 4 +-- cron/controller/main.go | 8 ++--- cron/data/add/main.go | 4 +-- cron/data/add/main_test.go | 4 +-- cron/data/blob.go | 2 +- cron/data/iterator.go | 2 +- cron/data/iterator_test.go | 2 +- cron/data/update/dependency.go | 4 +-- cron/data/update/main.go | 2 +- cron/data/validate/main.go | 2 +- cron/data/writer.go | 2 +- cron/data/writer_test.go | 2 +- cron/format/json.go | 6 ++-- cron/format/json_test.go | 4 +-- cron/format/mock_doc.go | 2 +- cron/monitoring/exporter.go | 2 +- cron/pubsub/publisher.go | 2 +- cron/pubsub/publisher_test.go | 2 +- cron/pubsub/subscriber.go | 2 +- cron/pubsub/subscriber_gcs.go | 2 +- cron/pubsub/subscriber_gocloud.go | 2 +- cron/pubsub/subscriber_gocloud_test.go | 2 +- cron/webhook/main.go | 2 +- cron/worker/main.go | 30 +++++++++---------- docs/checks/impl.go | 4 +-- docs/checks/internal/generate/main.go | 2 +- docs/checks/internal/validate/main.go | 4 +-- e2e/binary_artifacts_test.go | 8 ++--- e2e/branch_protection_test.go | 8 ++--- e2e/ci_tests_test.go | 8 ++--- e2e/cii_best_practices_test.go | 8 ++--- e2e/code_review_test.go | 8 ++--- e2e/contributors_test.go | 8 ++--- e2e/dependency_update_tool_test.go | 8 ++--- e2e/e2e_suite_test.go | 2 +- e2e/executable_test.go | 2 +- e2e/fuzzing_test.go | 8 ++--- e2e/maintained_test.go | 8 ++--- e2e/packaging_test.go | 8 ++--- e2e/permissions_test.go | 8 ++--- e2e/pinned_dependencies_test.go | 8 ++--- e2e/sast_test.go | 8 ++--- e2e/security_policy_test.go | 8 ++--- e2e/signedreleases_test.go | 8 ++--- e2e/vulnerabilities_test.go | 8 ++--- go.mod | 2 +- main.go | 2 +- pkg/common.go | 2 +- pkg/json.go | 4 +-- pkg/json_test.go | 2 +- pkg/mock_doc.go | 2 +- pkg/sarif.go | 8 ++--- pkg/sarif_test.go | 4 +-- pkg/scorecard.go | 12 ++++---- pkg/scorecard_result.go | 6 ++-- policy/policy.go | 4 +-- policy/policy_test.go | 2 +- repos/repo_url.go | 2 +- utests/utlib.go | 2 +- 103 files changed, 241 insertions(+), 241 deletions(-) diff --git a/checker/check_request.go b/checker/check_request.go index 87da2b7f..9a110aaf 100644 --- a/checker/check_request.go +++ b/checker/check_request.go @@ -17,7 +17,7 @@ package checker import ( "context" - "github.com/ossf/scorecard/v2/clients" + "github.com/ossf/scorecard/v3/clients" ) // CheckRequest struct encapsulates all data to be passed into a CheckFn. diff --git a/checker/check_runner.go b/checker/check_runner.go index 6a957213..52d80ef9 100644 --- a/checker/check_runner.go +++ b/checker/check_runner.go @@ -23,8 +23,8 @@ import ( opencensusstats "go.opencensus.io/stats" "go.opencensus.io/tag" - sce "github.com/ossf/scorecard/v2/errors" - "github.com/ossf/scorecard/v2/stats" + sce "github.com/ossf/scorecard/v3/errors" + "github.com/ossf/scorecard/v3/stats" ) const checkRetries = 3 diff --git a/checks/all_checks.go b/checks/all_checks.go index 1a709770..8fe51520 100644 --- a/checks/all_checks.go +++ b/checks/all_checks.go @@ -15,7 +15,7 @@ // Package checks defines all Scorecard checks. package checks -import "github.com/ossf/scorecard/v2/checker" +import "github.com/ossf/scorecard/v3/checker" // AllChecks is the list of all security checks that will be run. var AllChecks = checker.CheckNameToFnMap{} diff --git a/checks/binary_artifact.go b/checks/binary_artifact.go index ddd0d016..cf4fd1b6 100644 --- a/checks/binary_artifact.go +++ b/checks/binary_artifact.go @@ -22,8 +22,8 @@ import ( "github.com/h2non/filetype" "github.com/h2non/filetype/types" - "github.com/ossf/scorecard/v2/checker" - sce "github.com/ossf/scorecard/v2/errors" + "github.com/ossf/scorecard/v3/checker" + sce "github.com/ossf/scorecard/v3/errors" ) // CheckBinaryArtifacts is the exported name for Binary-Artifacts check. diff --git a/checks/branch_protection.go b/checks/branch_protection.go index 404a4a2c..f278bbe9 100644 --- a/checks/branch_protection.go +++ b/checks/branch_protection.go @@ -19,9 +19,9 @@ import ( "fmt" "regexp" - "github.com/ossf/scorecard/v2/checker" - "github.com/ossf/scorecard/v2/clients" - sce "github.com/ossf/scorecard/v2/errors" + "github.com/ossf/scorecard/v3/checker" + "github.com/ossf/scorecard/v3/clients" + sce "github.com/ossf/scorecard/v3/errors" ) const ( diff --git a/checks/branch_protection_test.go b/checks/branch_protection_test.go index 8d63f115..ecc5a459 100644 --- a/checks/branch_protection_test.go +++ b/checks/branch_protection_test.go @@ -19,11 +19,11 @@ import ( "github.com/golang/mock/gomock" - "github.com/ossf/scorecard/v2/checker" - "github.com/ossf/scorecard/v2/clients" - "github.com/ossf/scorecard/v2/clients/mockrepo" - sce "github.com/ossf/scorecard/v2/errors" - scut "github.com/ossf/scorecard/v2/utests" + "github.com/ossf/scorecard/v3/checker" + "github.com/ossf/scorecard/v3/clients" + "github.com/ossf/scorecard/v3/clients/mockrepo" + sce "github.com/ossf/scorecard/v3/errors" + scut "github.com/ossf/scorecard/v3/utests" ) func getBranch(branches []*clients.BranchRef, name string) *clients.BranchRef { diff --git a/checks/ci_tests.go b/checks/ci_tests.go index c451e1d0..e7096cb0 100644 --- a/checks/ci_tests.go +++ b/checks/ci_tests.go @@ -18,9 +18,9 @@ import ( "fmt" "strings" - "github.com/ossf/scorecard/v2/checker" - "github.com/ossf/scorecard/v2/clients" - sce "github.com/ossf/scorecard/v2/errors" + "github.com/ossf/scorecard/v3/checker" + "github.com/ossf/scorecard/v3/clients" + sce "github.com/ossf/scorecard/v3/errors" ) // States for which CI system is in use. diff --git a/checks/cii_best_practices.go b/checks/cii_best_practices.go index 01fcf926..d97880c7 100644 --- a/checks/cii_best_practices.go +++ b/checks/cii_best_practices.go @@ -21,8 +21,8 @@ import ( "net/http" "strings" - "github.com/ossf/scorecard/v2/checker" - sce "github.com/ossf/scorecard/v2/errors" + "github.com/ossf/scorecard/v3/checker" + sce "github.com/ossf/scorecard/v3/errors" ) // CheckCIIBestPractices is the registered name for CIIBestPractices. diff --git a/checks/code_review.go b/checks/code_review.go index 49c466a5..1f2838e9 100644 --- a/checks/code_review.go +++ b/checks/code_review.go @@ -18,8 +18,8 @@ import ( "fmt" "strings" - "github.com/ossf/scorecard/v2/checker" - sce "github.com/ossf/scorecard/v2/errors" + "github.com/ossf/scorecard/v3/checker" + sce "github.com/ossf/scorecard/v3/errors" ) // CheckCodeReview is the registered name for DoesCodeReview. diff --git a/checks/contributors.go b/checks/contributors.go index 0c2df07f..31c63b66 100644 --- a/checks/contributors.go +++ b/checks/contributors.go @@ -18,8 +18,8 @@ import ( "fmt" "strings" - "github.com/ossf/scorecard/v2/checker" - sce "github.com/ossf/scorecard/v2/errors" + "github.com/ossf/scorecard/v3/checker" + sce "github.com/ossf/scorecard/v3/errors" ) const ( diff --git a/checks/dependency_update_tool.go b/checks/dependency_update_tool.go index e1752ded..8001ac9c 100644 --- a/checks/dependency_update_tool.go +++ b/checks/dependency_update_tool.go @@ -17,7 +17,7 @@ package checks import ( "strings" - "github.com/ossf/scorecard/v2/checker" + "github.com/ossf/scorecard/v3/checker" ) // CheckDependencyUpdateTool is the exported name for Automatic-Depdendency-Update. diff --git a/checks/file_utils.go b/checks/file_utils.go index d200247e..5ea53bcd 100644 --- a/checks/file_utils.go +++ b/checks/file_utils.go @@ -20,9 +20,9 @@ import ( "path" "strings" - "github.com/ossf/scorecard/v2/checker" - "github.com/ossf/scorecard/v2/clients" - sce "github.com/ossf/scorecard/v2/errors" + "github.com/ossf/scorecard/v3/checker" + "github.com/ossf/scorecard/v3/clients" + sce "github.com/ossf/scorecard/v3/errors" ) // isMatchingPath uses 'pattern' to shell-match the 'path' and its filename diff --git a/checks/fuzzing.go b/checks/fuzzing.go index d53fb53c..b2fece8a 100644 --- a/checks/fuzzing.go +++ b/checks/fuzzing.go @@ -20,10 +20,10 @@ import ( "go.uber.org/zap" - "github.com/ossf/scorecard/v2/checker" - "github.com/ossf/scorecard/v2/clients" - "github.com/ossf/scorecard/v2/clients/githubrepo" - sce "github.com/ossf/scorecard/v2/errors" + "github.com/ossf/scorecard/v3/checker" + "github.com/ossf/scorecard/v3/clients" + "github.com/ossf/scorecard/v3/clients/githubrepo" + sce "github.com/ossf/scorecard/v3/errors" ) // CheckFuzzing is the registered name for Fuzzing. diff --git a/checks/maintained.go b/checks/maintained.go index 64e3fe56..39693386 100644 --- a/checks/maintained.go +++ b/checks/maintained.go @@ -18,8 +18,8 @@ import ( "fmt" "time" - "github.com/ossf/scorecard/v2/checker" - sce "github.com/ossf/scorecard/v2/errors" + "github.com/ossf/scorecard/v3/checker" + sce "github.com/ossf/scorecard/v3/errors" ) const ( diff --git a/checks/packaging.go b/checks/packaging.go index af35db85..793b8a50 100644 --- a/checks/packaging.go +++ b/checks/packaging.go @@ -20,8 +20,8 @@ import ( "regexp" "strings" - "github.com/ossf/scorecard/v2/checker" - sce "github.com/ossf/scorecard/v2/errors" + "github.com/ossf/scorecard/v3/checker" + sce "github.com/ossf/scorecard/v3/errors" ) // CheckPackaging is the registered name for Packaging. diff --git a/checks/permissions.go b/checks/permissions.go index dd6f7ca8..1bf9b3fc 100644 --- a/checks/permissions.go +++ b/checks/permissions.go @@ -20,8 +20,8 @@ import ( "gopkg.in/yaml.v2" - "github.com/ossf/scorecard/v2/checker" - sce "github.com/ossf/scorecard/v2/errors" + "github.com/ossf/scorecard/v3/checker" + sce "github.com/ossf/scorecard/v3/errors" ) // CheckTokenPermissions is the exported name for Token-Permissions check. diff --git a/checks/permissions_test.go b/checks/permissions_test.go index f20c2b0f..d9bf494d 100644 --- a/checks/permissions_test.go +++ b/checks/permissions_test.go @@ -19,8 +19,8 @@ import ( "io/ioutil" "testing" - "github.com/ossf/scorecard/v2/checker" - scut "github.com/ossf/scorecard/v2/utests" + "github.com/ossf/scorecard/v3/checker" + scut "github.com/ossf/scorecard/v3/utests" ) //nolint diff --git a/checks/pinned_dependencies.go b/checks/pinned_dependencies.go index e71c34ae..a9dd79d1 100644 --- a/checks/pinned_dependencies.go +++ b/checks/pinned_dependencies.go @@ -23,8 +23,8 @@ import ( "github.com/moby/buildkit/frontend/dockerfile/parser" "gopkg.in/yaml.v3" - "github.com/ossf/scorecard/v2/checker" - sce "github.com/ossf/scorecard/v2/errors" + "github.com/ossf/scorecard/v3/checker" + sce "github.com/ossf/scorecard/v3/errors" ) // CheckPinnedDependencies is the registered name for FrozenDeps. diff --git a/checks/pinned_dependencies_test.go b/checks/pinned_dependencies_test.go index 30da8488..03682439 100644 --- a/checks/pinned_dependencies_test.go +++ b/checks/pinned_dependencies_test.go @@ -23,8 +23,8 @@ import ( "github.com/google/go-cmp/cmp" "gopkg.in/yaml.v3" - "github.com/ossf/scorecard/v2/checker" - scut "github.com/ossf/scorecard/v2/utests" + "github.com/ossf/scorecard/v3/checker" + scut "github.com/ossf/scorecard/v3/utests" ) func TestGithubWorkflowPinning(t *testing.T) { diff --git a/checks/sast.go b/checks/sast.go index 116d9ce2..7c3888dd 100644 --- a/checks/sast.go +++ b/checks/sast.go @@ -17,9 +17,9 @@ package checks import ( "fmt" - "github.com/ossf/scorecard/v2/checker" - "github.com/ossf/scorecard/v2/clients" - sce "github.com/ossf/scorecard/v2/errors" + "github.com/ossf/scorecard/v3/checker" + "github.com/ossf/scorecard/v3/clients" + sce "github.com/ossf/scorecard/v3/errors" ) // CheckSAST is the registered name for SAST. diff --git a/checks/security_policy.go b/checks/security_policy.go index a220a53f..0dc36dce 100644 --- a/checks/security_policy.go +++ b/checks/security_policy.go @@ -20,9 +20,9 @@ import ( "go.uber.org/zap" - "github.com/ossf/scorecard/v2/checker" - "github.com/ossf/scorecard/v2/clients/githubrepo" - sce "github.com/ossf/scorecard/v2/errors" + "github.com/ossf/scorecard/v3/checker" + "github.com/ossf/scorecard/v3/clients/githubrepo" + sce "github.com/ossf/scorecard/v3/errors" ) // CheckSecurityPolicy is the registred name for SecurityPolicy. diff --git a/checks/shell_download_validate.go b/checks/shell_download_validate.go index 20e0278d..4e42b927 100644 --- a/checks/shell_download_validate.go +++ b/checks/shell_download_validate.go @@ -27,8 +27,8 @@ import ( "mvdan.cc/sh/v3/syntax" - "github.com/ossf/scorecard/v2/checker" - sce "github.com/ossf/scorecard/v2/errors" + "github.com/ossf/scorecard/v3/checker" + sce "github.com/ossf/scorecard/v3/errors" ) var ( diff --git a/checks/signed_releases.go b/checks/signed_releases.go index 57e497ae..2cf69405 100644 --- a/checks/signed_releases.go +++ b/checks/signed_releases.go @@ -18,8 +18,8 @@ import ( "fmt" "strings" - "github.com/ossf/scorecard/v2/checker" - sce "github.com/ossf/scorecard/v2/errors" + "github.com/ossf/scorecard/v3/checker" + sce "github.com/ossf/scorecard/v3/errors" ) const ( diff --git a/checks/vulnerabilities.go b/checks/vulnerabilities.go index c7b0c7c0..cb291dce 100644 --- a/checks/vulnerabilities.go +++ b/checks/vulnerabilities.go @@ -21,8 +21,8 @@ import ( "net/http" "strings" - "github.com/ossf/scorecard/v2/checker" - sce "github.com/ossf/scorecard/v2/errors" + "github.com/ossf/scorecard/v3/checker" + sce "github.com/ossf/scorecard/v3/errors" ) const ( diff --git a/clients/githubrepo/branches.go b/clients/githubrepo/branches.go index 7423c9d5..6324c002 100644 --- a/clients/githubrepo/branches.go +++ b/clients/githubrepo/branches.go @@ -22,8 +22,8 @@ import ( "github.com/google/go-github/v38/github" "github.com/shurcooL/githubv4" - "github.com/ossf/scorecard/v2/clients" - sce "github.com/ossf/scorecard/v2/errors" + "github.com/ossf/scorecard/v3/clients" + sce "github.com/ossf/scorecard/v3/errors" ) const ( diff --git a/clients/githubrepo/checkruns.go b/clients/githubrepo/checkruns.go index e3de35b7..a51f50e1 100644 --- a/clients/githubrepo/checkruns.go +++ b/clients/githubrepo/checkruns.go @@ -20,8 +20,8 @@ import ( "github.com/google/go-github/v38/github" - "github.com/ossf/scorecard/v2/clients" - sce "github.com/ossf/scorecard/v2/errors" + "github.com/ossf/scorecard/v3/clients" + sce "github.com/ossf/scorecard/v3/errors" ) type checkrunsHandler struct { diff --git a/clients/githubrepo/client.go b/clients/githubrepo/client.go index d5953ce5..e7031792 100644 --- a/clients/githubrepo/client.go +++ b/clients/githubrepo/client.go @@ -26,9 +26,9 @@ import ( "go.uber.org/zap" "go.uber.org/zap/zapcore" - "github.com/ossf/scorecard/v2/clients" - "github.com/ossf/scorecard/v2/clients/githubrepo/roundtripper" - sce "github.com/ossf/scorecard/v2/errors" + "github.com/ossf/scorecard/v3/clients" + "github.com/ossf/scorecard/v3/clients/githubrepo/roundtripper" + sce "github.com/ossf/scorecard/v3/errors" ) var errInputRepoType = errors.New("input repo should be of type repoURL") diff --git a/clients/githubrepo/contributors.go b/clients/githubrepo/contributors.go index c5ad3b15..c27be941 100644 --- a/clients/githubrepo/contributors.go +++ b/clients/githubrepo/contributors.go @@ -21,7 +21,7 @@ import ( "github.com/google/go-github/v38/github" - "github.com/ossf/scorecard/v2/clients" + "github.com/ossf/scorecard/v3/clients" ) type contributorsHandler struct { diff --git a/clients/githubrepo/graphql.go b/clients/githubrepo/graphql.go index 716acd3f..1c262ee5 100644 --- a/clients/githubrepo/graphql.go +++ b/clients/githubrepo/graphql.go @@ -21,8 +21,8 @@ import ( "github.com/shurcooL/githubv4" - "github.com/ossf/scorecard/v2/clients" - sce "github.com/ossf/scorecard/v2/errors" + "github.com/ossf/scorecard/v3/clients" + sce "github.com/ossf/scorecard/v3/errors" ) const ( diff --git a/clients/githubrepo/releases.go b/clients/githubrepo/releases.go index 9c47bf9b..c237195c 100644 --- a/clients/githubrepo/releases.go +++ b/clients/githubrepo/releases.go @@ -21,8 +21,8 @@ import ( "github.com/google/go-github/v38/github" - "github.com/ossf/scorecard/v2/clients" - sce "github.com/ossf/scorecard/v2/errors" + "github.com/ossf/scorecard/v3/clients" + sce "github.com/ossf/scorecard/v3/errors" ) type releasesHandler struct { diff --git a/clients/githubrepo/repo_url.go b/clients/githubrepo/repo_url.go index 96bff3dd..43fc5d18 100644 --- a/clients/githubrepo/repo_url.go +++ b/clients/githubrepo/repo_url.go @@ -19,8 +19,8 @@ import ( "net/url" "strings" - "github.com/ossf/scorecard/v2/clients" - sce "github.com/ossf/scorecard/v2/errors" + "github.com/ossf/scorecard/v3/clients" + sce "github.com/ossf/scorecard/v3/errors" ) const ( diff --git a/clients/githubrepo/roundtripper/census.go b/clients/githubrepo/roundtripper/census.go index f1873964..32aca8ee 100644 --- a/clients/githubrepo/roundtripper/census.go +++ b/clients/githubrepo/roundtripper/census.go @@ -22,8 +22,8 @@ import ( opencensusstats "go.opencensus.io/stats" "go.opencensus.io/tag" - sce "github.com/ossf/scorecard/v2/errors" - "github.com/ossf/scorecard/v2/stats" + sce "github.com/ossf/scorecard/v3/errors" + "github.com/ossf/scorecard/v3/stats" ) const fromCacheHeader = "X-From-Cache" diff --git a/clients/githubrepo/roundtripper/rate_limit.go b/clients/githubrepo/roundtripper/rate_limit.go index 468ddf62..1956c4da 100644 --- a/clients/githubrepo/roundtripper/rate_limit.go +++ b/clients/githubrepo/roundtripper/rate_limit.go @@ -22,7 +22,7 @@ import ( "go.uber.org/zap" - sce "github.com/ossf/scorecard/v2/errors" + sce "github.com/ossf/scorecard/v3/errors" ) // MakeRateLimitedTransport returns a RoundTripper which rate limits GitHub requests. diff --git a/clients/githubrepo/roundtripper/transport.go b/clients/githubrepo/roundtripper/transport.go index 154b4a3e..edbe1413 100644 --- a/clients/githubrepo/roundtripper/transport.go +++ b/clients/githubrepo/roundtripper/transport.go @@ -24,7 +24,7 @@ import ( "go.opencensus.io/stats" "go.opencensus.io/tag" - githubstats "github.com/ossf/scorecard/v2/clients/githubrepo/stats" + githubstats "github.com/ossf/scorecard/v3/clients/githubrepo/stats" ) const expiryTimeInSec = 30 diff --git a/clients/githubrepo/search.go b/clients/githubrepo/search.go index a817f356..d752918f 100644 --- a/clients/githubrepo/search.go +++ b/clients/githubrepo/search.go @@ -22,7 +22,7 @@ import ( "github.com/google/go-github/v38/github" - "github.com/ossf/scorecard/v2/clients" + "github.com/ossf/scorecard/v3/clients" ) var errEmptyQuery = errors.New("search query is empty") diff --git a/clients/githubrepo/search_test.go b/clients/githubrepo/search_test.go index b45c0f07..49744d51 100644 --- a/clients/githubrepo/search_test.go +++ b/clients/githubrepo/search_test.go @@ -18,7 +18,7 @@ import ( "errors" "testing" - "github.com/ossf/scorecard/v2/clients" + "github.com/ossf/scorecard/v3/clients" ) func TestBuildQuery(t *testing.T) { diff --git a/clients/githubrepo/statuses.go b/clients/githubrepo/statuses.go index 22286a8e..befe25e1 100644 --- a/clients/githubrepo/statuses.go +++ b/clients/githubrepo/statuses.go @@ -20,8 +20,8 @@ import ( "github.com/google/go-github/v38/github" - "github.com/ossf/scorecard/v2/clients" - sce "github.com/ossf/scorecard/v2/errors" + "github.com/ossf/scorecard/v3/clients" + sce "github.com/ossf/scorecard/v3/errors" ) type statusesHandler struct { diff --git a/clients/githubrepo/tarball.go b/clients/githubrepo/tarball.go index 56b6614b..faa4b998 100644 --- a/clients/githubrepo/tarball.go +++ b/clients/githubrepo/tarball.go @@ -30,7 +30,7 @@ import ( "github.com/google/go-github/v38/github" - sce "github.com/ossf/scorecard/v2/errors" + sce "github.com/ossf/scorecard/v3/errors" ) const ( diff --git a/clients/githubrepo/workflows.go b/clients/githubrepo/workflows.go index 82a333c1..82f8c771 100644 --- a/clients/githubrepo/workflows.go +++ b/clients/githubrepo/workflows.go @@ -20,8 +20,8 @@ import ( "github.com/google/go-github/v38/github" - "github.com/ossf/scorecard/v2/clients" - sce "github.com/ossf/scorecard/v2/errors" + "github.com/ossf/scorecard/v3/clients" + sce "github.com/ossf/scorecard/v3/errors" ) type workflowsHandler struct { diff --git a/clients/mockrepo/client.go b/clients/mockrepo/client.go index ce596e5a..747aac13 100644 --- a/clients/mockrepo/client.go +++ b/clients/mockrepo/client.go @@ -23,7 +23,7 @@ import ( reflect "reflect" gomock "github.com/golang/mock/gomock" - clients "github.com/ossf/scorecard/v2/clients" + clients "github.com/ossf/scorecard/v3/clients" ) // MockRepoClient is a mock of RepoClient interface. diff --git a/clients/mockrepo/repo.go b/clients/mockrepo/repo.go index 6b14de62..79354c9a 100644 --- a/clients/mockrepo/repo.go +++ b/clients/mockrepo/repo.go @@ -23,7 +23,7 @@ import ( reflect "reflect" gomock "github.com/golang/mock/gomock" - clients "github.com/ossf/scorecard/v2/clients" + clients "github.com/ossf/scorecard/v3/clients" ) // MockRepo is a mock of Repo interface. diff --git a/cmd/root.go b/cmd/root.go index 967a69cb..c26956da 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -30,14 +30,14 @@ import ( "github.com/spf13/cobra" "go.uber.org/zap" - "github.com/ossf/scorecard/v2/checker" - "github.com/ossf/scorecard/v2/checks" - "github.com/ossf/scorecard/v2/clients/githubrepo" - docs "github.com/ossf/scorecard/v2/docs/checks" - sce "github.com/ossf/scorecard/v2/errors" - "github.com/ossf/scorecard/v2/pkg" - spol "github.com/ossf/scorecard/v2/policy" - "github.com/ossf/scorecard/v2/repos" + "github.com/ossf/scorecard/v3/checker" + "github.com/ossf/scorecard/v3/checks" + "github.com/ossf/scorecard/v3/clients/githubrepo" + docs "github.com/ossf/scorecard/v3/docs/checks" + sce "github.com/ossf/scorecard/v3/errors" + "github.com/ossf/scorecard/v3/pkg" + spol "github.com/ossf/scorecard/v3/policy" + "github.com/ossf/scorecard/v3/repos" ) var ( diff --git a/cmd/serve.go b/cmd/serve.go index 89fc1a24..cee61878 100644 --- a/cmd/serve.go +++ b/cmd/serve.go @@ -24,10 +24,10 @@ import ( "github.com/spf13/cobra" - "github.com/ossf/scorecard/v2/checks" - "github.com/ossf/scorecard/v2/clients/githubrepo" - "github.com/ossf/scorecard/v2/pkg" - "github.com/ossf/scorecard/v2/repos" + "github.com/ossf/scorecard/v3/checks" + "github.com/ossf/scorecard/v3/clients/githubrepo" + "github.com/ossf/scorecard/v3/pkg" + "github.com/ossf/scorecard/v3/repos" ) //nolint:gochecknoinits diff --git a/cmd/version.go b/cmd/version.go index 5f989e32..8081db88 100644 --- a/cmd/version.go +++ b/cmd/version.go @@ -19,7 +19,7 @@ import ( "github.com/spf13/cobra" - "github.com/ossf/scorecard/v2/pkg" + "github.com/ossf/scorecard/v3/pkg" ) //nolint:gochecknoinits diff --git a/cron/bq/main.go b/cron/bq/main.go index d211ec06..291784d8 100644 --- a/cron/bq/main.go +++ b/cron/bq/main.go @@ -28,8 +28,8 @@ import ( "google.golang.org/protobuf/encoding/protojson" - "github.com/ossf/scorecard/v2/cron/config" - "github.com/ossf/scorecard/v2/cron/data" + "github.com/ossf/scorecard/v3/cron/config" + "github.com/ossf/scorecard/v3/cron/data" ) type shardSummary struct { diff --git a/cron/controller/main.go b/cron/controller/main.go index b14b1338..3f57666d 100644 --- a/cron/controller/main.go +++ b/cron/controller/main.go @@ -24,10 +24,10 @@ import ( "google.golang.org/protobuf/encoding/protojson" "google.golang.org/protobuf/types/known/timestamppb" - "github.com/ossf/scorecard/v2/cron/config" - "github.com/ossf/scorecard/v2/cron/data" - "github.com/ossf/scorecard/v2/cron/pubsub" - "github.com/ossf/scorecard/v2/pkg" + "github.com/ossf/scorecard/v3/cron/config" + "github.com/ossf/scorecard/v3/cron/data" + "github.com/ossf/scorecard/v3/cron/pubsub" + "github.com/ossf/scorecard/v3/pkg" ) func publishToRepoRequestTopic(ctx context.Context, iter data.Iterator, datetime time.Time) (int32, error) { diff --git a/cron/data/add/main.go b/cron/data/add/main.go index 4b9a106e..4b50f837 100644 --- a/cron/data/add/main.go +++ b/cron/data/add/main.go @@ -20,8 +20,8 @@ import ( "fmt" "os" - "github.com/ossf/scorecard/v2/cron/data" - "github.com/ossf/scorecard/v2/repos" + "github.com/ossf/scorecard/v3/cron/data" + "github.com/ossf/scorecard/v3/repos" ) // Script to add new project repositories to the projects.csv file: diff --git a/cron/data/add/main_test.go b/cron/data/add/main_test.go index 9c596bb2..29438281 100644 --- a/cron/data/add/main_test.go +++ b/cron/data/add/main_test.go @@ -21,8 +21,8 @@ import ( "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" - "github.com/ossf/scorecard/v2/cron/data" - "github.com/ossf/scorecard/v2/repos" + "github.com/ossf/scorecard/v3/cron/data" + "github.com/ossf/scorecard/v3/repos" ) func isLessThanRepoURL(x, y repos.RepoURL) bool { diff --git a/cron/data/blob.go b/cron/data/blob.go index 91855da2..ccbddc93 100644 --- a/cron/data/blob.go +++ b/cron/data/blob.go @@ -27,7 +27,7 @@ import ( // Needed to link in GCP drivers. _ "gocloud.dev/blob/gcsblob" - "github.com/ossf/scorecard/v2/cron/config" + "github.com/ossf/scorecard/v3/cron/config" ) const ( diff --git a/cron/data/iterator.go b/cron/data/iterator.go index dc8fbdf5..b43709d1 100644 --- a/cron/data/iterator.go +++ b/cron/data/iterator.go @@ -22,7 +22,7 @@ import ( "github.com/jszwec/csvutil" - "github.com/ossf/scorecard/v2/repos" + "github.com/ossf/scorecard/v3/repos" ) // Iterator interface is used to iterate through list of input repos for the cron job. diff --git a/cron/data/iterator_test.go b/cron/data/iterator_test.go index fa8583d1..e7e326be 100644 --- a/cron/data/iterator_test.go +++ b/cron/data/iterator_test.go @@ -21,7 +21,7 @@ import ( "github.com/google/go-cmp/cmp" - "github.com/ossf/scorecard/v2/repos" + "github.com/ossf/scorecard/v3/repos" ) type outcome struct { diff --git a/cron/data/update/dependency.go b/cron/data/update/dependency.go index 8e83728b..9d958a15 100644 --- a/cron/data/update/dependency.go +++ b/cron/data/update/dependency.go @@ -30,8 +30,8 @@ import ( "github.com/google/go-github/v38/github" "golang.org/x/tools/go/vcs" - "github.com/ossf/scorecard/v2/cron/data" - "github.com/ossf/scorecard/v2/repos" + "github.com/ossf/scorecard/v3/cron/data" + "github.com/ossf/scorecard/v3/repos" ) var ( diff --git a/cron/data/update/main.go b/cron/data/update/main.go index df87b28f..d5556a06 100644 --- a/cron/data/update/main.go +++ b/cron/data/update/main.go @@ -19,7 +19,7 @@ import ( "bytes" "os" - "github.com/ossf/scorecard/v2/cron/data" + "github.com/ossf/scorecard/v3/cron/data" ) // Adds "project=${PROJECT},dependency=true" to the repositories metadata. diff --git a/cron/data/validate/main.go b/cron/data/validate/main.go index 6e47a6a4..93f2a45e 100644 --- a/cron/data/validate/main.go +++ b/cron/data/validate/main.go @@ -19,7 +19,7 @@ import ( "log" "os" - "github.com/ossf/scorecard/v2/cron/data" + "github.com/ossf/scorecard/v3/cron/data" ) // Validates data.Iterator used by production PubSub cron job. diff --git a/cron/data/writer.go b/cron/data/writer.go index 340a4665..181626c9 100644 --- a/cron/data/writer.go +++ b/cron/data/writer.go @@ -22,7 +22,7 @@ import ( "github.com/jszwec/csvutil" - "github.com/ossf/scorecard/v2/repos" + "github.com/ossf/scorecard/v3/repos" ) func repoFormatFromRepoURL(repoURLs []repos.RepoURL) []repoFormat { diff --git a/cron/data/writer_test.go b/cron/data/writer_test.go index 57b64cd9..9c80a970 100644 --- a/cron/data/writer_test.go +++ b/cron/data/writer_test.go @@ -18,7 +18,7 @@ import ( "bytes" "testing" - "github.com/ossf/scorecard/v2/repos" + "github.com/ossf/scorecard/v3/repos" ) func TestCsvWriter(t *testing.T) { diff --git a/cron/format/json.go b/cron/format/json.go index 5f9582db..a2630742 100644 --- a/cron/format/json.go +++ b/cron/format/json.go @@ -24,9 +24,9 @@ import ( "go.uber.org/zap/zapcore" - docs "github.com/ossf/scorecard/v2/docs/checks" - sce "github.com/ossf/scorecard/v2/errors" - "github.com/ossf/scorecard/v2/pkg" + docs "github.com/ossf/scorecard/v3/docs/checks" + sce "github.com/ossf/scorecard/v3/errors" + "github.com/ossf/scorecard/v3/pkg" ) //nolint diff --git a/cron/format/json_test.go b/cron/format/json_test.go index d6afa50a..fbeb72f7 100644 --- a/cron/format/json_test.go +++ b/cron/format/json_test.go @@ -27,8 +27,8 @@ import ( "github.com/xeipuuv/gojsonschema" "go.uber.org/zap/zapcore" - "github.com/ossf/scorecard/v2/checker" - "github.com/ossf/scorecard/v2/pkg" + "github.com/ossf/scorecard/v3/checker" + "github.com/ossf/scorecard/v3/pkg" ) func jsonMockDocRead() *mockDoc { diff --git a/cron/format/mock_doc.go b/cron/format/mock_doc.go index dfc874dd..a2e105b2 100644 --- a/cron/format/mock_doc.go +++ b/cron/format/mock_doc.go @@ -17,7 +17,7 @@ package format import ( "strings" - docs "github.com/ossf/scorecard/v2/docs/checks" + docs "github.com/ossf/scorecard/v3/docs/checks" ) type mockCheck struct { diff --git a/cron/monitoring/exporter.go b/cron/monitoring/exporter.go index be975ed4..a8b498cd 100644 --- a/cron/monitoring/exporter.go +++ b/cron/monitoring/exporter.go @@ -24,7 +24,7 @@ import ( "contrib.go.opencensus.io/exporter/stackdriver/monitoredresource/gcp" "go.opencensus.io/stats/view" - "github.com/ossf/scorecard/v2/cron/config" + "github.com/ossf/scorecard/v3/cron/config" ) var errorUndefinedExporter = errors.New("unsupported exporterType") diff --git a/cron/pubsub/publisher.go b/cron/pubsub/publisher.go index acf529c1..b5a0c27d 100644 --- a/cron/pubsub/publisher.go +++ b/cron/pubsub/publisher.go @@ -29,7 +29,7 @@ import ( _ "gocloud.dev/pubsub/gcppubsub" "google.golang.org/protobuf/encoding/protojson" - "github.com/ossf/scorecard/v2/cron/data" + "github.com/ossf/scorecard/v3/cron/data" ) var errorPublish = errors.New("total errors when publishing") diff --git a/cron/pubsub/publisher_test.go b/cron/pubsub/publisher_test.go index 407721df..86e41074 100644 --- a/cron/pubsub/publisher_test.go +++ b/cron/pubsub/publisher_test.go @@ -21,7 +21,7 @@ import ( "gocloud.dev/pubsub" - "github.com/ossf/scorecard/v2/cron/data" + "github.com/ossf/scorecard/v3/cron/data" ) type mockSucceedTopic struct{} diff --git a/cron/pubsub/subscriber.go b/cron/pubsub/subscriber.go index 193d8055..2ae2044d 100644 --- a/cron/pubsub/subscriber.go +++ b/cron/pubsub/subscriber.go @@ -21,7 +21,7 @@ import ( "google.golang.org/protobuf/encoding/protojson" - "github.com/ossf/scorecard/v2/cron/data" + "github.com/ossf/scorecard/v3/cron/data" ) // ErrorInParse indicates there was an error while unmarshalling the protocol buffer message. diff --git a/cron/pubsub/subscriber_gcs.go b/cron/pubsub/subscriber_gcs.go index adb72af3..2e1835a1 100644 --- a/cron/pubsub/subscriber_gcs.go +++ b/cron/pubsub/subscriber_gcs.go @@ -24,7 +24,7 @@ import ( pubsub "cloud.google.com/go/pubsub/apiv1" pubsubpb "google.golang.org/genproto/googleapis/pubsub/v1" - "github.com/ossf/scorecard/v2/cron/data" + "github.com/ossf/scorecard/v3/cron/data" ) const ( diff --git a/cron/pubsub/subscriber_gocloud.go b/cron/pubsub/subscriber_gocloud.go index 86654d8f..67918cff 100644 --- a/cron/pubsub/subscriber_gocloud.go +++ b/cron/pubsub/subscriber_gocloud.go @@ -24,7 +24,7 @@ import ( // Needed to link in GCP drivers. _ "gocloud.dev/pubsub/gcppubsub" - "github.com/ossf/scorecard/v2/cron/data" + "github.com/ossf/scorecard/v3/cron/data" ) type receiver interface { diff --git a/cron/pubsub/subscriber_gocloud_test.go b/cron/pubsub/subscriber_gocloud_test.go index 80102566..c9441806 100644 --- a/cron/pubsub/subscriber_gocloud_test.go +++ b/cron/pubsub/subscriber_gocloud_test.go @@ -23,7 +23,7 @@ import ( "google.golang.org/protobuf/encoding/protojson" "google.golang.org/protobuf/proto" - "github.com/ossf/scorecard/v2/cron/data" + "github.com/ossf/scorecard/v3/cron/data" ) type mockReceiver struct { diff --git a/cron/webhook/main.go b/cron/webhook/main.go index 1cb5eb81..cf9d14eb 100644 --- a/cron/webhook/main.go +++ b/cron/webhook/main.go @@ -26,7 +26,7 @@ import ( "github.com/google/go-containerregistry/pkg/v1/google" "google.golang.org/protobuf/encoding/protojson" - "github.com/ossf/scorecard/v2/cron/data" + "github.com/ossf/scorecard/v3/cron/data" ) const stableTag = "stable" diff --git a/cron/worker/main.go b/cron/worker/main.go index ccee8925..5de3c963 100644 --- a/cron/worker/main.go +++ b/cron/worker/main.go @@ -31,21 +31,21 @@ import ( "go.uber.org/zap" "go.uber.org/zap/zapcore" - "github.com/ossf/scorecard/v2/checker" - "github.com/ossf/scorecard/v2/checks" - "github.com/ossf/scorecard/v2/clients" - "github.com/ossf/scorecard/v2/clients/githubrepo" - githubstats "github.com/ossf/scorecard/v2/clients/githubrepo/stats" - "github.com/ossf/scorecard/v2/cron/config" - "github.com/ossf/scorecard/v2/cron/data" - format "github.com/ossf/scorecard/v2/cron/format" - "github.com/ossf/scorecard/v2/cron/monitoring" - "github.com/ossf/scorecard/v2/cron/pubsub" - docs "github.com/ossf/scorecard/v2/docs/checks" - sce "github.com/ossf/scorecard/v2/errors" - "github.com/ossf/scorecard/v2/pkg" - "github.com/ossf/scorecard/v2/repos" - "github.com/ossf/scorecard/v2/stats" + "github.com/ossf/scorecard/v3/checker" + "github.com/ossf/scorecard/v3/checks" + "github.com/ossf/scorecard/v3/clients" + "github.com/ossf/scorecard/v3/clients/githubrepo" + githubstats "github.com/ossf/scorecard/v3/clients/githubrepo/stats" + "github.com/ossf/scorecard/v3/cron/config" + "github.com/ossf/scorecard/v3/cron/data" + format "github.com/ossf/scorecard/v3/cron/format" + "github.com/ossf/scorecard/v3/cron/monitoring" + "github.com/ossf/scorecard/v3/cron/pubsub" + docs "github.com/ossf/scorecard/v3/docs/checks" + sce "github.com/ossf/scorecard/v3/errors" + "github.com/ossf/scorecard/v3/pkg" + "github.com/ossf/scorecard/v3/repos" + "github.com/ossf/scorecard/v3/stats" ) var ignoreRuntimeErrors = flag.Bool("ignoreRuntimeErrors", false, "if set to true any runtime errors will be ignored") diff --git a/docs/checks/impl.go b/docs/checks/impl.go index ba1b1b3d..57863bfd 100644 --- a/docs/checks/impl.go +++ b/docs/checks/impl.go @@ -20,8 +20,8 @@ import ( "fmt" "strings" - "github.com/ossf/scorecard/v2/docs/checks/internal" - sce "github.com/ossf/scorecard/v2/errors" + "github.com/ossf/scorecard/v3/docs/checks/internal" + sce "github.com/ossf/scorecard/v3/errors" ) var errCheckNotExist = errors.New("check does not exist") diff --git a/docs/checks/internal/generate/main.go b/docs/checks/internal/generate/main.go index 4178a683..cd333eae 100644 --- a/docs/checks/internal/generate/main.go +++ b/docs/checks/internal/generate/main.go @@ -18,7 +18,7 @@ import ( "os" "sort" - docs "github.com/ossf/scorecard/v2/docs/checks" + docs "github.com/ossf/scorecard/v3/docs/checks" ) func main() { diff --git a/docs/checks/internal/validate/main.go b/docs/checks/internal/validate/main.go index 69e5eb91..b075d9ff 100644 --- a/docs/checks/internal/validate/main.go +++ b/docs/checks/internal/validate/main.go @@ -17,8 +17,8 @@ import ( "fmt" "strings" - "github.com/ossf/scorecard/v2/checks" - docs "github.com/ossf/scorecard/v2/docs/checks" + "github.com/ossf/scorecard/v3/checks" + docs "github.com/ossf/scorecard/v3/docs/checks" ) var allowedRisks = map[string]bool{"Critical": true, "High": true, "Medium": true, "Low": true} diff --git a/e2e/binary_artifacts_test.go b/e2e/binary_artifacts_test.go index 9d959d16..a45b08b6 100644 --- a/e2e/binary_artifacts_test.go +++ b/e2e/binary_artifacts_test.go @@ -20,10 +20,10 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - "github.com/ossf/scorecard/v2/checker" - "github.com/ossf/scorecard/v2/checks" - "github.com/ossf/scorecard/v2/clients/githubrepo" - scut "github.com/ossf/scorecard/v2/utests" + "github.com/ossf/scorecard/v3/checker" + "github.com/ossf/scorecard/v3/checks" + "github.com/ossf/scorecard/v3/clients/githubrepo" + scut "github.com/ossf/scorecard/v3/utests" ) // TODO: use dedicated repo that don't change. diff --git a/e2e/branch_protection_test.go b/e2e/branch_protection_test.go index 2c9e1ec1..3102c9e5 100644 --- a/e2e/branch_protection_test.go +++ b/e2e/branch_protection_test.go @@ -20,10 +20,10 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - "github.com/ossf/scorecard/v2/checker" - "github.com/ossf/scorecard/v2/checks" - "github.com/ossf/scorecard/v2/clients/githubrepo" - scut "github.com/ossf/scorecard/v2/utests" + "github.com/ossf/scorecard/v3/checker" + "github.com/ossf/scorecard/v3/checks" + "github.com/ossf/scorecard/v3/clients/githubrepo" + scut "github.com/ossf/scorecard/v3/utests" ) var _ = Describe("E2E TEST:"+checks.CheckBranchProtection, func() { diff --git a/e2e/ci_tests_test.go b/e2e/ci_tests_test.go index 7c59c641..d4983af5 100644 --- a/e2e/ci_tests_test.go +++ b/e2e/ci_tests_test.go @@ -20,10 +20,10 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - "github.com/ossf/scorecard/v2/checker" - "github.com/ossf/scorecard/v2/checks" - "github.com/ossf/scorecard/v2/clients/githubrepo" - scut "github.com/ossf/scorecard/v2/utests" + "github.com/ossf/scorecard/v3/checker" + "github.com/ossf/scorecard/v3/checks" + "github.com/ossf/scorecard/v3/clients/githubrepo" + scut "github.com/ossf/scorecard/v3/utests" ) var _ = Describe("E2E TEST:"+checks.CheckCITests, func() { diff --git a/e2e/cii_best_practices_test.go b/e2e/cii_best_practices_test.go index 68fd8bef..67920170 100644 --- a/e2e/cii_best_practices_test.go +++ b/e2e/cii_best_practices_test.go @@ -20,10 +20,10 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - "github.com/ossf/scorecard/v2/checker" - "github.com/ossf/scorecard/v2/checks" - "github.com/ossf/scorecard/v2/clients/githubrepo" - scut "github.com/ossf/scorecard/v2/utests" + "github.com/ossf/scorecard/v3/checker" + "github.com/ossf/scorecard/v3/checks" + "github.com/ossf/scorecard/v3/clients/githubrepo" + scut "github.com/ossf/scorecard/v3/utests" ) var _ = Describe("E2E TEST:CIIBestPractices", func() { diff --git a/e2e/code_review_test.go b/e2e/code_review_test.go index 5ae7f631..082863d9 100644 --- a/e2e/code_review_test.go +++ b/e2e/code_review_test.go @@ -20,10 +20,10 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - "github.com/ossf/scorecard/v2/checker" - "github.com/ossf/scorecard/v2/checks" - "github.com/ossf/scorecard/v2/clients/githubrepo" - scut "github.com/ossf/scorecard/v2/utests" + "github.com/ossf/scorecard/v3/checker" + "github.com/ossf/scorecard/v3/checks" + "github.com/ossf/scorecard/v3/clients/githubrepo" + scut "github.com/ossf/scorecard/v3/utests" ) // TODO: use dedicated repo that don't change. diff --git a/e2e/contributors_test.go b/e2e/contributors_test.go index 86612142..04fafcd8 100644 --- a/e2e/contributors_test.go +++ b/e2e/contributors_test.go @@ -20,10 +20,10 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - "github.com/ossf/scorecard/v2/checker" - "github.com/ossf/scorecard/v2/checks" - "github.com/ossf/scorecard/v2/clients/githubrepo" - scut "github.com/ossf/scorecard/v2/utests" + "github.com/ossf/scorecard/v3/checker" + "github.com/ossf/scorecard/v3/checks" + "github.com/ossf/scorecard/v3/clients/githubrepo" + scut "github.com/ossf/scorecard/v3/utests" ) var _ = Describe("E2E TEST:"+checks.CheckContributors, func() { diff --git a/e2e/dependency_update_tool_test.go b/e2e/dependency_update_tool_test.go index 3d34d21a..c9212c0e 100644 --- a/e2e/dependency_update_tool_test.go +++ b/e2e/dependency_update_tool_test.go @@ -20,10 +20,10 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - "github.com/ossf/scorecard/v2/checker" - "github.com/ossf/scorecard/v2/checks" - "github.com/ossf/scorecard/v2/clients/githubrepo" - scut "github.com/ossf/scorecard/v2/utests" + "github.com/ossf/scorecard/v3/checker" + "github.com/ossf/scorecard/v3/checks" + "github.com/ossf/scorecard/v3/clients/githubrepo" + scut "github.com/ossf/scorecard/v3/utests" ) // TODO: use dedicated repo that don't change. diff --git a/e2e/e2e_suite_test.go b/e2e/e2e_suite_test.go index 6fa25564..6d82c000 100644 --- a/e2e/e2e_suite_test.go +++ b/e2e/e2e_suite_test.go @@ -22,7 +22,7 @@ import ( . "github.com/onsi/gomega" "go.uber.org/zap" - "github.com/ossf/scorecard/v2/clients/githubrepo" + "github.com/ossf/scorecard/v3/clients/githubrepo" ) var logger *zap.Logger diff --git a/e2e/executable_test.go b/e2e/executable_test.go index 84fcda19..247467a6 100644 --- a/e2e/executable_test.go +++ b/e2e/executable_test.go @@ -21,7 +21,7 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - "github.com/ossf/scorecard/v2/checks" + "github.com/ossf/scorecard/v3/checks" ) type scorecard struct { diff --git a/e2e/fuzzing_test.go b/e2e/fuzzing_test.go index fa5ed594..04cbc10f 100644 --- a/e2e/fuzzing_test.go +++ b/e2e/fuzzing_test.go @@ -20,10 +20,10 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - "github.com/ossf/scorecard/v2/checker" - "github.com/ossf/scorecard/v2/checks" - "github.com/ossf/scorecard/v2/clients/githubrepo" - scut "github.com/ossf/scorecard/v2/utests" + "github.com/ossf/scorecard/v3/checker" + "github.com/ossf/scorecard/v3/checks" + "github.com/ossf/scorecard/v3/clients/githubrepo" + scut "github.com/ossf/scorecard/v3/utests" ) var _ = Describe("E2E TEST:"+checks.CheckFuzzing, func() { diff --git a/e2e/maintained_test.go b/e2e/maintained_test.go index e73e546c..9a39ee32 100644 --- a/e2e/maintained_test.go +++ b/e2e/maintained_test.go @@ -21,10 +21,10 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - "github.com/ossf/scorecard/v2/checker" - "github.com/ossf/scorecard/v2/checks" - "github.com/ossf/scorecard/v2/clients/githubrepo" - scut "github.com/ossf/scorecard/v2/utests" + "github.com/ossf/scorecard/v3/checker" + "github.com/ossf/scorecard/v3/checks" + "github.com/ossf/scorecard/v3/clients/githubrepo" + scut "github.com/ossf/scorecard/v3/utests" ) var _ = Describe("E2E TEST:"+checks.CheckMaintained, func() { diff --git a/e2e/packaging_test.go b/e2e/packaging_test.go index 8cb9bfd5..3cf44db8 100644 --- a/e2e/packaging_test.go +++ b/e2e/packaging_test.go @@ -20,10 +20,10 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - "github.com/ossf/scorecard/v2/checker" - "github.com/ossf/scorecard/v2/checks" - "github.com/ossf/scorecard/v2/clients/githubrepo" - scut "github.com/ossf/scorecard/v2/utests" + "github.com/ossf/scorecard/v3/checker" + "github.com/ossf/scorecard/v3/checks" + "github.com/ossf/scorecard/v3/clients/githubrepo" + scut "github.com/ossf/scorecard/v3/utests" ) var _ = Describe("E2E TEST:"+checks.CheckPackaging, func() { diff --git a/e2e/permissions_test.go b/e2e/permissions_test.go index aa29b12b..d739d1a3 100644 --- a/e2e/permissions_test.go +++ b/e2e/permissions_test.go @@ -19,10 +19,10 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - "github.com/ossf/scorecard/v2/checker" - "github.com/ossf/scorecard/v2/checks" - "github.com/ossf/scorecard/v2/clients/githubrepo" - scut "github.com/ossf/scorecard/v2/utests" + "github.com/ossf/scorecard/v3/checker" + "github.com/ossf/scorecard/v3/checks" + "github.com/ossf/scorecard/v3/clients/githubrepo" + scut "github.com/ossf/scorecard/v3/utests" ) var _ = Describe("E2E TEST:"+checks.CheckTokenPermissions, func() { diff --git a/e2e/pinned_dependencies_test.go b/e2e/pinned_dependencies_test.go index 0a579ee8..6cb780d5 100644 --- a/e2e/pinned_dependencies_test.go +++ b/e2e/pinned_dependencies_test.go @@ -19,10 +19,10 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - "github.com/ossf/scorecard/v2/checker" - "github.com/ossf/scorecard/v2/checks" - "github.com/ossf/scorecard/v2/clients/githubrepo" - scut "github.com/ossf/scorecard/v2/utests" + "github.com/ossf/scorecard/v3/checker" + "github.com/ossf/scorecard/v3/checks" + "github.com/ossf/scorecard/v3/clients/githubrepo" + scut "github.com/ossf/scorecard/v3/utests" ) // TODO: use dedicated repo that don't change. diff --git a/e2e/sast_test.go b/e2e/sast_test.go index 3c227b10..d68a7b8d 100644 --- a/e2e/sast_test.go +++ b/e2e/sast_test.go @@ -20,10 +20,10 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - "github.com/ossf/scorecard/v2/checker" - "github.com/ossf/scorecard/v2/checks" - "github.com/ossf/scorecard/v2/clients/githubrepo" - scut "github.com/ossf/scorecard/v2/utests" + "github.com/ossf/scorecard/v3/checker" + "github.com/ossf/scorecard/v3/checks" + "github.com/ossf/scorecard/v3/clients/githubrepo" + scut "github.com/ossf/scorecard/v3/utests" ) var _ = Describe("E2E TEST:"+checks.CheckSAST, func() { diff --git a/e2e/security_policy_test.go b/e2e/security_policy_test.go index d150caef..507fefcf 100644 --- a/e2e/security_policy_test.go +++ b/e2e/security_policy_test.go @@ -19,10 +19,10 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - "github.com/ossf/scorecard/v2/checker" - "github.com/ossf/scorecard/v2/checks" - "github.com/ossf/scorecard/v2/clients/githubrepo" - scut "github.com/ossf/scorecard/v2/utests" + "github.com/ossf/scorecard/v3/checker" + "github.com/ossf/scorecard/v3/checks" + "github.com/ossf/scorecard/v3/clients/githubrepo" + scut "github.com/ossf/scorecard/v3/utests" ) var _ = Describe("E2E TEST:SecurityPolicy", func() { diff --git a/e2e/signedreleases_test.go b/e2e/signedreleases_test.go index 908828dc..7d845a39 100644 --- a/e2e/signedreleases_test.go +++ b/e2e/signedreleases_test.go @@ -20,10 +20,10 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - "github.com/ossf/scorecard/v2/checker" - "github.com/ossf/scorecard/v2/checks" - "github.com/ossf/scorecard/v2/clients/githubrepo" - scut "github.com/ossf/scorecard/v2/utests" + "github.com/ossf/scorecard/v3/checker" + "github.com/ossf/scorecard/v3/checks" + "github.com/ossf/scorecard/v3/clients/githubrepo" + scut "github.com/ossf/scorecard/v3/utests" ) var _ = Describe("E2E TEST:"+checks.CheckSignedReleases, func() { diff --git a/e2e/vulnerabilities_test.go b/e2e/vulnerabilities_test.go index d22e05d0..5c415a0a 100644 --- a/e2e/vulnerabilities_test.go +++ b/e2e/vulnerabilities_test.go @@ -20,10 +20,10 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - "github.com/ossf/scorecard/v2/checker" - "github.com/ossf/scorecard/v2/checks" - "github.com/ossf/scorecard/v2/clients/githubrepo" - scut "github.com/ossf/scorecard/v2/utests" + "github.com/ossf/scorecard/v3/checker" + "github.com/ossf/scorecard/v3/checks" + "github.com/ossf/scorecard/v3/clients/githubrepo" + scut "github.com/ossf/scorecard/v3/utests" ) var _ = Describe("E2E TEST:Vulnerabilities", func() { diff --git a/go.mod b/go.mod index 2e989923..31bcb7af 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/ossf/scorecard/v2 +module github.com/ossf/scorecard/v3 go 1.17 diff --git a/main.go b/main.go index b9194a8a..74e1123f 100644 --- a/main.go +++ b/main.go @@ -15,7 +15,7 @@ // Package main of OSSF Scoreard. package main -import "github.com/ossf/scorecard/v2/cmd" +import "github.com/ossf/scorecard/v3/cmd" func main() { cmd.Execute() diff --git a/pkg/common.go b/pkg/common.go index 728851d1..b5049ffc 100644 --- a/pkg/common.go +++ b/pkg/common.go @@ -20,7 +20,7 @@ import ( "go.uber.org/zap/zapcore" - "github.com/ossf/scorecard/v2/checker" + "github.com/ossf/scorecard/v3/checker" ) func textToMarkdown(s string) string { diff --git a/pkg/json.go b/pkg/json.go index 8b5d492e..921d491c 100644 --- a/pkg/json.go +++ b/pkg/json.go @@ -21,8 +21,8 @@ import ( "go.uber.org/zap/zapcore" - docs "github.com/ossf/scorecard/v2/docs/checks" - sce "github.com/ossf/scorecard/v2/errors" + docs "github.com/ossf/scorecard/v3/docs/checks" + sce "github.com/ossf/scorecard/v3/errors" ) //nolint diff --git a/pkg/json_test.go b/pkg/json_test.go index 24e0743d..6e62a9c0 100644 --- a/pkg/json_test.go +++ b/pkg/json_test.go @@ -27,7 +27,7 @@ import ( "github.com/xeipuuv/gojsonschema" "go.uber.org/zap/zapcore" - "github.com/ossf/scorecard/v2/checker" + "github.com/ossf/scorecard/v3/checker" ) func jsonMockDocRead() *mockDoc { diff --git a/pkg/mock_doc.go b/pkg/mock_doc.go index 774751a3..d362845b 100644 --- a/pkg/mock_doc.go +++ b/pkg/mock_doc.go @@ -17,7 +17,7 @@ package pkg import ( "strings" - docs "github.com/ossf/scorecard/v2/docs/checks" + docs "github.com/ossf/scorecard/v3/docs/checks" ) type mockCheck struct { diff --git a/pkg/sarif.go b/pkg/sarif.go index 9147e9d3..d54c85bc 100644 --- a/pkg/sarif.go +++ b/pkg/sarif.go @@ -23,10 +23,10 @@ import ( "go.uber.org/zap/zapcore" - "github.com/ossf/scorecard/v2/checker" - docs "github.com/ossf/scorecard/v2/docs/checks" - sce "github.com/ossf/scorecard/v2/errors" - spol "github.com/ossf/scorecard/v2/policy" + "github.com/ossf/scorecard/v3/checker" + docs "github.com/ossf/scorecard/v3/docs/checks" + sce "github.com/ossf/scorecard/v3/errors" + spol "github.com/ossf/scorecard/v3/policy" ) type text struct { diff --git a/pkg/sarif_test.go b/pkg/sarif_test.go index 3ac3edeb..70ef894e 100644 --- a/pkg/sarif_test.go +++ b/pkg/sarif_test.go @@ -23,8 +23,8 @@ import ( "go.uber.org/zap/zapcore" - "github.com/ossf/scorecard/v2/checker" - spol "github.com/ossf/scorecard/v2/policy" + "github.com/ossf/scorecard/v3/checker" + spol "github.com/ossf/scorecard/v3/policy" ) func sarifMockDocRead() *mockDoc { diff --git a/pkg/scorecard.go b/pkg/scorecard.go index d2699de5..71abe6e9 100644 --- a/pkg/scorecard.go +++ b/pkg/scorecard.go @@ -24,12 +24,12 @@ import ( opencensusstats "go.opencensus.io/stats" "go.opencensus.io/tag" - "github.com/ossf/scorecard/v2/checker" - "github.com/ossf/scorecard/v2/clients" - "github.com/ossf/scorecard/v2/clients/githubrepo" - sce "github.com/ossf/scorecard/v2/errors" - "github.com/ossf/scorecard/v2/repos" - "github.com/ossf/scorecard/v2/stats" + "github.com/ossf/scorecard/v3/checker" + "github.com/ossf/scorecard/v3/clients" + "github.com/ossf/scorecard/v3/clients/githubrepo" + sce "github.com/ossf/scorecard/v3/errors" + "github.com/ossf/scorecard/v3/repos" + "github.com/ossf/scorecard/v3/stats" ) func logStats(ctx context.Context, startTime time.Time) { diff --git a/pkg/scorecard_result.go b/pkg/scorecard_result.go index 969336fc..e9f6e105 100644 --- a/pkg/scorecard_result.go +++ b/pkg/scorecard_result.go @@ -23,9 +23,9 @@ import ( "github.com/olekukonko/tablewriter" "go.uber.org/zap/zapcore" - "github.com/ossf/scorecard/v2/checker" - docs "github.com/ossf/scorecard/v2/docs/checks" - sce "github.com/ossf/scorecard/v2/errors" + "github.com/ossf/scorecard/v3/checker" + docs "github.com/ossf/scorecard/v3/docs/checks" + sce "github.com/ossf/scorecard/v3/errors" ) // ScorecardInfo contains information about the scorecard code that was run. diff --git a/policy/policy.go b/policy/policy.go index 5cd15d7d..0814687a 100644 --- a/policy/policy.go +++ b/policy/policy.go @@ -20,8 +20,8 @@ import ( "gopkg.in/yaml.v3" - "github.com/ossf/scorecard/v2/checks" - sce "github.com/ossf/scorecard/v2/errors" + "github.com/ossf/scorecard/v3/checks" + sce "github.com/ossf/scorecard/v3/errors" ) var ( diff --git a/policy/policy_test.go b/policy/policy_test.go index e3b3399e..1ba78009 100644 --- a/policy/policy_test.go +++ b/policy/policy_test.go @@ -19,7 +19,7 @@ import ( "io/ioutil" "testing" - sce "github.com/ossf/scorecard/v2/errors" + sce "github.com/ossf/scorecard/v3/errors" ) func TestPolicyRead(t *testing.T) { diff --git a/repos/repo_url.go b/repos/repo_url.go index a53e3d30..c53f6214 100644 --- a/repos/repo_url.go +++ b/repos/repo_url.go @@ -21,7 +21,7 @@ import ( "net/url" "strings" - sce "github.com/ossf/scorecard/v2/errors" + sce "github.com/ossf/scorecard/v3/errors" ) var ( diff --git a/utests/utlib.go b/utests/utlib.go index 5aed445e..7771a033 100644 --- a/utests/utlib.go +++ b/utests/utlib.go @@ -23,7 +23,7 @@ import ( "github.com/google/go-cmp/cmp" - "github.com/ossf/scorecard/v2/checker" + "github.com/ossf/scorecard/v3/checker" ) // TestReturn encapsulates expected CheckResult return values.