Skip to content

Commit 0b9dfb6

Browse files
spencerschrockspencerschrock
authored
⚠️ Replace v4 module references with v5 (#4027)
Signed-off-by: Spencer Schrock <[email protected]>
1 parent f939ab1 commit 0b9dfb6

File tree

403 files changed

+1409
-1409
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

403 files changed

+1409
-1409
lines changed

‎.golangci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -165,4 +165,4 @@ linters-settings:
165165
require-specific: true
166166
wrapcheck:
167167
ignorePackageGlobs:
168-
- github.com/ossf/scorecard/v4/checks/fileparser
168+
- github.com/ossf/scorecard/v5/checks/fileparser

‎Makefile

+7-7
Original file line numberDiff line numberDiff line change
@@ -374,7 +374,7 @@ scorecard-ko: | $(KO) $(KOCACHE_PATH)
374374
--sbom=none \
375375
--platform=$(PLATFORM) \
376376
--tags latest,$(GIT_VERSION),$(GIT_HASH) \
377-
github.com/ossf/scorecard/v4
377+
github.com/ossf/scorecard/v5
378378

379379
cron-controller-ko: | $(KO) $(KOCACHE_PATH)
380380
KO_DATA_DATE_EPOCH=$(SOURCE_DATE_EPOCH) \
@@ -386,7 +386,7 @@ cron-controller-ko: | $(KO) $(KOCACHE_PATH)
386386
--sbom=none \
387387
--platform=$(PLATFORM) \
388388
--tags latest,$(GIT_VERSION),$(GIT_HASH) \
389-
github.com/ossf/scorecard/v4/cron/internal/controller
389+
github.com/ossf/scorecard/v5/cron/internal/controller
390390

391391
cron-worker-ko: | $(KO) $(KOCACHE_PATH)
392392
KO_DATA_DATE_EPOCH=$(SOURCE_DATE_EPOCH) \
@@ -398,7 +398,7 @@ cron-worker-ko: | $(KO) $(KOCACHE_PATH)
398398
--sbom=none \
399399
--platform=$(PLATFORM) \
400400
--tags latest,$(GIT_VERSION),$(GIT_HASH) \
401-
github.com/ossf/scorecard/v4/cron/internal/worker
401+
github.com/ossf/scorecard/v5/cron/internal/worker
402402

403403
cron-cii-worker-ko: | $(KO) $(KOCACHE_PATH)
404404
KO_DATA_DATE_EPOCH=$(SOURCE_DATE_EPOCH) \
@@ -410,7 +410,7 @@ cron-cii-worker-ko: | $(KO) $(KOCACHE_PATH)
410410
--sbom=none \
411411
--platform=$(PLATFORM)\
412412
--tags latest,$(GIT_VERSION),$(GIT_HASH) \
413-
github.com/ossf/scorecard/v4/cron/internal/cii
413+
github.com/ossf/scorecard/v5/cron/internal/cii
414414

415415
cron-bq-transfer-ko: | $(KO) $(KOCACHE_PATH)
416416
KO_DATA_DATE_EPOCH=$(SOURCE_DATE_EPOCH) \
@@ -422,7 +422,7 @@ cron-bq-transfer-ko: | $(KO) $(KOCACHE_PATH)
422422
--sbom=none \
423423
--platform=$(PLATFORM) \
424424
--tags latest,$(GIT_VERSION),$(GIT_HASH) \
425-
github.com/ossf/scorecard/v4/cron/internal/bq
425+
github.com/ossf/scorecard/v5/cron/internal/bq
426426

427427
cron-webhook-ko: | $(KO) $(KOCACHE_PATH)
428428
KO_DATA_DATE_EPOCH=$(SOURCE_DATE_EPOCH) \
@@ -434,7 +434,7 @@ cron-webhook-ko: | $(KO) $(KOCACHE_PATH)
434434
--sbom=none \
435435
--platform=$(PLATFORM) \
436436
--tags latest,$(GIT_VERSION),$(GIT_HASH) \
437-
github.com/ossf/scorecard/v4/cron/internal/webhook
437+
github.com/ossf/scorecard/v5/cron/internal/webhook
438438

439439
cron-github-server-ko: | $(KO) $(KOCACHE_PATH)
440440
KO_DATA_DATE_EPOCH=$(SOURCE_DATE_EPOCH) \
@@ -446,6 +446,6 @@ cron-github-server-ko: | $(KO) $(KOCACHE_PATH)
446446
--sbom=none \
447447
--platform=$(PLATFORM) \
448448
--tags latest,$(GIT_VERSION),$(GIT_HASH) \
449-
github.com/ossf/scorecard/v4/clients/githubrepo/roundtripper/tokens/server
449+
github.com/ossf/scorecard/v5/clients/githubrepo/roundtripper/tokens/server
450450

451451
###############################################################################

‎attestor/command/check.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ import (
1919
"fmt"
2020
"os"
2121

22-
"github.com/ossf/scorecard/v4/attestor/policy"
23-
"github.com/ossf/scorecard/v4/checker"
24-
"github.com/ossf/scorecard/v4/checks"
25-
sclog "github.com/ossf/scorecard/v4/log"
26-
"github.com/ossf/scorecard/v4/pkg"
22+
"github.com/ossf/scorecard/v5/attestor/policy"
23+
"github.com/ossf/scorecard/v5/checker"
24+
"github.com/ossf/scorecard/v5/checks"
25+
sclog "github.com/ossf/scorecard/v5/log"
26+
"github.com/ossf/scorecard/v5/pkg"
2727
)
2828

2929
type EmptyParameterError struct {

‎attestor/command/sign.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
"github.com/grafeas/kritis/pkg/kritis/signer"
2525
"github.com/grafeas/kritis/pkg/kritis/util"
2626

27-
sclog "github.com/ossf/scorecard/v4/log"
27+
sclog "github.com/ossf/scorecard/v5/log"
2828
)
2929

3030
const scorecardNoteID = "ossf-scorecard-attestation"

‎attestor/policy/attestation_policy.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ import (
2222
"github.com/gobwas/glob"
2323
"gopkg.in/yaml.v2"
2424

25-
"github.com/ossf/scorecard/v4/checker"
26-
"github.com/ossf/scorecard/v4/checks"
27-
sce "github.com/ossf/scorecard/v4/errors"
28-
"github.com/ossf/scorecard/v4/finding"
29-
sclog "github.com/ossf/scorecard/v4/log"
25+
"github.com/ossf/scorecard/v5/checker"
26+
"github.com/ossf/scorecard/v5/checks"
27+
sce "github.com/ossf/scorecard/v5/errors"
28+
"github.com/ossf/scorecard/v5/finding"
29+
sclog "github.com/ossf/scorecard/v5/log"
3030
)
3131

3232
//nolint:govet

‎attestor/policy/attestation_policy_test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ import (
2121

2222
"github.com/google/go-cmp/cmp"
2323

24-
"github.com/ossf/scorecard/v4/checker"
25-
"github.com/ossf/scorecard/v4/clients"
26-
sce "github.com/ossf/scorecard/v4/errors"
27-
sclog "github.com/ossf/scorecard/v4/log"
24+
"github.com/ossf/scorecard/v5/checker"
25+
"github.com/ossf/scorecard/v5/clients"
26+
sce "github.com/ossf/scorecard/v5/errors"
27+
sclog "github.com/ossf/scorecard/v5/log"
2828
)
2929

3030
func (ap *AttestationPolicy) ToJSON() string {

‎attestor/root.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
package main
1616

17-
import "github.com/ossf/scorecard/v4/attestor/command"
17+
import "github.com/ossf/scorecard/v5/attestor/command"
1818

1919
func main() {
2020
command.Execute()

‎checker/check_request.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ package checker
1717
import (
1818
"context"
1919

20-
"github.com/ossf/scorecard/v4/clients"
20+
"github.com/ossf/scorecard/v5/clients"
2121
)
2222

2323
// CheckRequest struct encapsulates all data to be passed into a CheckFn.

‎checker/check_result.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ import (
2020
"fmt"
2121
"math"
2222

23-
sce "github.com/ossf/scorecard/v4/errors"
24-
"github.com/ossf/scorecard/v4/finding"
23+
sce "github.com/ossf/scorecard/v5/errors"
24+
"github.com/ossf/scorecard/v5/finding"
2525
)
2626

2727
type (

‎checker/check_result_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"github.com/google/go-cmp/cmp"
2222
"github.com/google/go-cmp/cmp/cmpopts"
2323

24-
sce "github.com/ossf/scorecard/v4/errors"
24+
sce "github.com/ossf/scorecard/v5/errors"
2525
)
2626

2727
func TestAggregateScores(t *testing.T) {

‎checker/check_runner.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ import (
2323
opencensusstats "go.opencensus.io/stats"
2424
"go.opencensus.io/tag"
2525

26-
sce "github.com/ossf/scorecard/v4/errors"
27-
"github.com/ossf/scorecard/v4/stats"
26+
sce "github.com/ossf/scorecard/v5/errors"
27+
"github.com/ossf/scorecard/v5/stats"
2828
)
2929

3030
const checkRetries = 3

‎checker/client.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ import (
1818
"context"
1919
"fmt"
2020

21-
"github.com/ossf/scorecard/v4/clients"
22-
ghrepo "github.com/ossf/scorecard/v4/clients/githubrepo"
23-
glrepo "github.com/ossf/scorecard/v4/clients/gitlabrepo"
24-
"github.com/ossf/scorecard/v4/clients/localdir"
25-
"github.com/ossf/scorecard/v4/clients/ossfuzz"
26-
"github.com/ossf/scorecard/v4/log"
21+
"github.com/ossf/scorecard/v5/clients"
22+
ghrepo "github.com/ossf/scorecard/v5/clients/githubrepo"
23+
glrepo "github.com/ossf/scorecard/v5/clients/gitlabrepo"
24+
"github.com/ossf/scorecard/v5/clients/localdir"
25+
"github.com/ossf/scorecard/v5/clients/ossfuzz"
26+
"github.com/ossf/scorecard/v5/log"
2727
)
2828

2929
// GetClients returns a list of clients for running scorecard checks.

‎checker/client_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import (
1717
"context"
1818
"testing"
1919

20-
"github.com/ossf/scorecard/v4/log"
20+
"github.com/ossf/scorecard/v5/log"
2121
)
2222

2323
func TestGetClients(t *testing.T) {

‎checker/raw_result.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ import (
1818
"fmt"
1919
"time"
2020

21-
"github.com/ossf/scorecard/v4/clients"
22-
"github.com/ossf/scorecard/v4/finding"
21+
"github.com/ossf/scorecard/v5/clients"
22+
"github.com/ossf/scorecard/v5/finding"
2323
)
2424

2525
// RawResults contains results before a policy

‎checker/raw_result_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ package checker
1616
import (
1717
"testing"
1818

19-
"github.com/ossf/scorecard/v4/finding"
19+
"github.com/ossf/scorecard/v5/finding"
2020
)
2121

2222
func TestFile_Location(t *testing.T) {

‎checks/all_checks.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ package checks
1818
import (
1919
"os"
2020

21-
"github.com/ossf/scorecard/v4/checker"
21+
"github.com/ossf/scorecard/v5/checker"
2222
)
2323

2424
// allChecks is the list of all registered security checks.

‎checks/all_checks_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ package checks
1818
import (
1919
"testing"
2020

21-
"github.com/ossf/scorecard/v4/checker"
21+
"github.com/ossf/scorecard/v5/checker"
2222
)
2323

2424
func Test_registerCheck(t *testing.T) {

‎checks/binary_artifact.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@
1515
package checks
1616

1717
import (
18-
"github.com/ossf/scorecard/v4/checker"
19-
"github.com/ossf/scorecard/v4/checks/evaluation"
20-
"github.com/ossf/scorecard/v4/checks/raw"
21-
sce "github.com/ossf/scorecard/v4/errors"
22-
"github.com/ossf/scorecard/v4/probes"
23-
"github.com/ossf/scorecard/v4/probes/zrunner"
18+
"github.com/ossf/scorecard/v5/checker"
19+
"github.com/ossf/scorecard/v5/checks/evaluation"
20+
"github.com/ossf/scorecard/v5/checks/raw"
21+
sce "github.com/ossf/scorecard/v5/errors"
22+
"github.com/ossf/scorecard/v5/probes"
23+
"github.com/ossf/scorecard/v5/probes/zrunner"
2424
)
2525

2626
// CheckBinaryArtifacts is the exported name for Binary-Artifacts check.

‎checks/binary_artifact_test.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ import (
2121

2222
"github.com/golang/mock/gomock"
2323

24-
"github.com/ossf/scorecard/v4/checker"
25-
"github.com/ossf/scorecard/v4/clients"
26-
"github.com/ossf/scorecard/v4/clients/localdir"
27-
"github.com/ossf/scorecard/v4/log"
28-
scut "github.com/ossf/scorecard/v4/utests"
24+
"github.com/ossf/scorecard/v5/checker"
25+
"github.com/ossf/scorecard/v5/clients"
26+
"github.com/ossf/scorecard/v5/clients/localdir"
27+
"github.com/ossf/scorecard/v5/log"
28+
scut "github.com/ossf/scorecard/v5/utests"
2929
)
3030

3131
func TestBinaryArtifacts(t *testing.T) {

‎checks/branch_protection.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@
1515
package checks
1616

1717
import (
18-
"github.com/ossf/scorecard/v4/checker"
19-
"github.com/ossf/scorecard/v4/checks/evaluation"
20-
"github.com/ossf/scorecard/v4/checks/raw"
21-
sce "github.com/ossf/scorecard/v4/errors"
22-
"github.com/ossf/scorecard/v4/probes"
23-
"github.com/ossf/scorecard/v4/probes/zrunner"
18+
"github.com/ossf/scorecard/v5/checker"
19+
"github.com/ossf/scorecard/v5/checks/evaluation"
20+
"github.com/ossf/scorecard/v5/checks/raw"
21+
sce "github.com/ossf/scorecard/v5/errors"
22+
"github.com/ossf/scorecard/v5/probes"
23+
"github.com/ossf/scorecard/v5/probes/zrunner"
2424
)
2525

2626
// CheckBranchProtection is the exported name for Branch-Protected check.

‎checks/branch_protection_test.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ import (
1919

2020
"github.com/golang/mock/gomock"
2121

22-
"github.com/ossf/scorecard/v4/checker"
23-
"github.com/ossf/scorecard/v4/clients"
24-
mockrepo "github.com/ossf/scorecard/v4/clients/mockclients"
25-
sce "github.com/ossf/scorecard/v4/errors"
26-
scut "github.com/ossf/scorecard/v4/utests"
22+
"github.com/ossf/scorecard/v5/checker"
23+
"github.com/ossf/scorecard/v5/clients"
24+
mockrepo "github.com/ossf/scorecard/v5/clients/mockclients"
25+
sce "github.com/ossf/scorecard/v5/errors"
26+
scut "github.com/ossf/scorecard/v5/utests"
2727
)
2828

2929
func getBranchName(branch *clients.BranchRef) string {

‎checks/ci_tests.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@
1515
package checks
1616

1717
import (
18-
"github.com/ossf/scorecard/v4/checker"
19-
"github.com/ossf/scorecard/v4/checks/evaluation"
20-
"github.com/ossf/scorecard/v4/checks/raw"
21-
sce "github.com/ossf/scorecard/v4/errors"
22-
"github.com/ossf/scorecard/v4/probes"
23-
"github.com/ossf/scorecard/v4/probes/zrunner"
18+
"github.com/ossf/scorecard/v5/checker"
19+
"github.com/ossf/scorecard/v5/checks/evaluation"
20+
"github.com/ossf/scorecard/v5/checks/raw"
21+
sce "github.com/ossf/scorecard/v5/errors"
22+
"github.com/ossf/scorecard/v5/probes"
23+
"github.com/ossf/scorecard/v5/probes/zrunner"
2424
)
2525

2626
const CheckCITests = "CI-Tests"

‎checks/ci_tests_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ import (
2020

2121
"github.com/golang/mock/gomock"
2222

23-
"github.com/ossf/scorecard/v4/checker"
24-
mockrepo "github.com/ossf/scorecard/v4/clients/mockclients"
23+
"github.com/ossf/scorecard/v5/checker"
24+
mockrepo "github.com/ossf/scorecard/v5/clients/mockclients"
2525
)
2626

2727
func TestCITestsRuntimeError(t *testing.T) {

‎checks/cii_best_practices.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@
1515
package checks
1616

1717
import (
18-
"github.com/ossf/scorecard/v4/checker"
19-
"github.com/ossf/scorecard/v4/checks/evaluation"
20-
"github.com/ossf/scorecard/v4/checks/raw"
21-
sce "github.com/ossf/scorecard/v4/errors"
22-
"github.com/ossf/scorecard/v4/probes"
23-
"github.com/ossf/scorecard/v4/probes/zrunner"
18+
"github.com/ossf/scorecard/v5/checker"
19+
"github.com/ossf/scorecard/v5/checks/evaluation"
20+
"github.com/ossf/scorecard/v5/checks/raw"
21+
sce "github.com/ossf/scorecard/v5/errors"
22+
"github.com/ossf/scorecard/v5/probes"
23+
"github.com/ossf/scorecard/v5/probes/zrunner"
2424
)
2525

2626
// CheckCIIBestPractices is the registered name for CIIBestPractices.

‎checks/cii_best_practices_test.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ import (
2121

2222
"github.com/golang/mock/gomock"
2323

24-
"github.com/ossf/scorecard/v4/checker"
25-
"github.com/ossf/scorecard/v4/clients"
26-
mockrepo "github.com/ossf/scorecard/v4/clients/mockclients"
27-
sce "github.com/ossf/scorecard/v4/errors"
28-
scut "github.com/ossf/scorecard/v4/utests"
24+
"github.com/ossf/scorecard/v5/checker"
25+
"github.com/ossf/scorecard/v5/clients"
26+
mockrepo "github.com/ossf/scorecard/v5/clients/mockclients"
27+
sce "github.com/ossf/scorecard/v5/errors"
28+
scut "github.com/ossf/scorecard/v5/utests"
2929
)
3030

3131
var errTest = errors.New("test error")

‎checks/code_review.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@
1515
package checks
1616

1717
import (
18-
"github.com/ossf/scorecard/v4/checker"
19-
"github.com/ossf/scorecard/v4/checks/evaluation"
20-
"github.com/ossf/scorecard/v4/checks/raw"
21-
sce "github.com/ossf/scorecard/v4/errors"
22-
"github.com/ossf/scorecard/v4/probes"
23-
"github.com/ossf/scorecard/v4/probes/zrunner"
18+
"github.com/ossf/scorecard/v5/checker"
19+
"github.com/ossf/scorecard/v5/checks/evaluation"
20+
"github.com/ossf/scorecard/v5/checks/raw"
21+
sce "github.com/ossf/scorecard/v5/errors"
22+
"github.com/ossf/scorecard/v5/probes"
23+
"github.com/ossf/scorecard/v5/probes/zrunner"
2424
)
2525

2626
// CheckCodeReview is the registered name for DoesCodeReview.

0 commit comments

Comments
 (0)