Fix the "v2" behavior to match Go's git + mod functionality. (#563)

Signed-off-by: Caleb Brown <calebbrown@google.com>
ossf · Mar 17, 2024 · 7af16f1 · 7af16f1
1 parent 947e68d
commit 7af16f1
Show file tree

Hide file tree

Showing 60 changed files with 171 additions and 103 deletions.
diff --git a/README.md b/README.md
@@ -48,7 +48,7 @@ open source project:
 ## Usage
 
 ```shell
-$ go install github.com/ossf/criticality_score/cmd/criticality_score@latest
+$ go install github.com/ossf/criticality_score/v2/cmd/criticality_score@latest
 
 $ export GITHUB_TOKEN=...         # requires a GitHub token to work
 $ gcloud auth login --update-adc  # optional, add -depsdev-disable to skip

diff --git a/cmd/collect_signals/localworker/loop.go b/cmd/collect_signals/localworker/loop.go
@@ -25,7 +25,7 @@ import (
 	"github.com/ossf/scorecard/v4/cron/worker"
 	"go.uber.org/zap"
 
-	"github.com/ossf/criticality_score/internal/iterator"
+	"github.com/ossf/criticality_score/v2/internal/iterator"
 )
 
 // maxAttempts is the maximum number of times a batch will be attempted before

diff --git a/cmd/collect_signals/localworker/loop_test.go b/cmd/collect_signals/localworker/loop_test.go
@@ -27,7 +27,7 @@ import (
 	"gocloud.dev/blob"
 	_ "gocloud.dev/blob/fileblob"
 
-	"github.com/ossf/criticality_score/internal/iterator"
+	"github.com/ossf/criticality_score/v2/internal/iterator"
 )
 
 type testWorker struct {

diff --git a/cmd/collect_signals/localworker/scorecardcompat.go b/cmd/collect_signals/localworker/scorecardcompat.go
@@ -26,7 +26,7 @@ import (
 	"google.golang.org/protobuf/proto"
 	"google.golang.org/protobuf/types/known/timestamppb"
 
-	"github.com/ossf/criticality_score/cmd/collect_signals/vcs"
+	"github.com/ossf/criticality_score/v2/cmd/collect_signals/vcs"
 )
 
 var headSHA = clients.HeadSHA

diff --git a/cmd/collect_signals/main.go b/cmd/collect_signals/main.go
@@ -30,10 +30,10 @@ import (
 	"go.uber.org/zap"
 	"go.uber.org/zap/zapcore"
 
-	"github.com/ossf/criticality_score/cmd/collect_signals/localworker"
-	"github.com/ossf/criticality_score/cmd/collect_signals/vcs"
-	"github.com/ossf/criticality_score/internal/collector"
-	log "github.com/ossf/criticality_score/internal/log"
+	"github.com/ossf/criticality_score/v2/cmd/collect_signals/localworker"
+	"github.com/ossf/criticality_score/v2/cmd/collect_signals/vcs"
+	"github.com/ossf/criticality_score/v2/internal/collector"
+	log "github.com/ossf/criticality_score/v2/internal/log"
 )
 
 const (

diff --git a/cmd/collect_signals/worker.go b/cmd/collect_signals/worker.go
@@ -16,10 +16,10 @@ import (
 	"go.opencensus.io/stats/view"
 	"go.uber.org/zap"
 
-	"github.com/ossf/criticality_score/cmd/collect_signals/vcs"
-	"github.com/ossf/criticality_score/internal/collector"
-	"github.com/ossf/criticality_score/internal/scorer"
-	"github.com/ossf/criticality_score/internal/signalio"
+	"github.com/ossf/criticality_score/v2/cmd/collect_signals/vcs"
+	"github.com/ossf/criticality_score/v2/internal/collector"
+	"github.com/ossf/criticality_score/v2/internal/scorer"
+	"github.com/ossf/criticality_score/v2/internal/signalio"
 )
 
 const (

diff --git a/cmd/criticality_score/README.md b/cmd/criticality_score/README.md
@@ -21,7 +21,7 @@ $ criticality_score \
 ## Install
 
 ```shell
-$ go install github.com/ossf/criticality_score/cmd/criticality_score
+$ go install github.com/ossf/criticality_score/v2/cmd/criticality_score
 ```
 
 ## Usage

diff --git a/cmd/criticality_score/inputiter/new.go b/cmd/criticality_score/inputiter/new.go
@@ -20,8 +20,8 @@ import (
 	"net/url"
 	"os"
 
-	"github.com/ossf/criticality_score/internal/infile"
-	"github.com/ossf/criticality_score/internal/iterator"
+	"github.com/ossf/criticality_score/v2/internal/infile"
+	"github.com/ossf/criticality_score/v2/internal/iterator"
 )
 
 // osErrorWithFilename is an os-specific helper for determining if a particular

diff --git a/cmd/criticality_score/inputiter/new_test.go b/cmd/criticality_score/inputiter/new_test.go
@@ -21,7 +21,7 @@ import (
 	"slices"
 	"testing"
 
-	"github.com/ossf/criticality_score/cmd/criticality_score/inputiter"
+	"github.com/ossf/criticality_score/v2/cmd/criticality_score/inputiter"
 )
 
 func TestNew_SingleURL(t *testing.T) {

diff --git a/cmd/criticality_score/main.go b/cmd/criticality_score/main.go
@@ -29,13 +29,13 @@ import (
 	"go.uber.org/zap"
 	"go.uber.org/zap/zapcore"
 
-	"github.com/ossf/criticality_score/cmd/criticality_score/inputiter"
-	"github.com/ossf/criticality_score/internal/collector"
-	log "github.com/ossf/criticality_score/internal/log"
-	"github.com/ossf/criticality_score/internal/outfile"
-	"github.com/ossf/criticality_score/internal/scorer"
-	"github.com/ossf/criticality_score/internal/signalio"
-	"github.com/ossf/criticality_score/internal/workerpool"
+	"github.com/ossf/criticality_score/v2/cmd/criticality_score/inputiter"
+	"github.com/ossf/criticality_score/v2/internal/collector"
+	log "github.com/ossf/criticality_score/v2/internal/log"
+	"github.com/ossf/criticality_score/v2/internal/outfile"
+	"github.com/ossf/criticality_score/v2/internal/scorer"
+	"github.com/ossf/criticality_score/v2/internal/signalio"
+	"github.com/ossf/criticality_score/v2/internal/workerpool"
 )
 
 const defaultLogLevel = zapcore.InfoLevel

diff --git a/cmd/csv_transfer/main.go b/cmd/csv_transfer/main.go
@@ -28,7 +28,7 @@ import (
 	"go.uber.org/zap"
 	"go.uber.org/zap/zapcore"
 
-	"github.com/ossf/criticality_score/internal/log"
+	"github.com/ossf/criticality_score/v2/internal/log"
 )
 
 const defaultLogLevel = zapcore.InfoLevel

diff --git a/cmd/enumerate_github/README.md b/cmd/enumerate_github/README.md
@@ -19,7 +19,7 @@ $ enumerate_github \
 ## Install
 
 ```shell
-$ go install github.com/ossf/criticality_score/cmd/enumerate_github
+$ go install github.com/ossf/criticality_score/v2/cmd/enumerate_github
 ```
 
 ## Usage
@@ -136,4 +136,4 @@ $ go run ./cmd/enumerate_github \
     -start=2022-06-14 \
     -end=2022-06-21 \
     -min-stars=20
-```
+```
diff --git a/cmd/enumerate_github/githubsearch/repos.go b/cmd/enumerate_github/githubsearch/repos.go
@@ -22,7 +22,7 @@ import (
 	"github.com/hasura/go-graphql-client"
 	"go.uber.org/zap"
 
-	"github.com/ossf/criticality_score/internal/githubapi/pagination"
+	"github.com/ossf/criticality_score/v2/internal/githubapi/pagination"
 )
 
 // repo is part of the GitHub GraphQL query and includes the fields

diff --git a/cmd/enumerate_github/main.go b/cmd/enumerate_github/main.go
@@ -32,14 +32,14 @@ import (
 	"go.uber.org/zap"
 	"go.uber.org/zap/zapcore"
 
-	"github.com/ossf/criticality_score/cmd/enumerate_github/githubsearch"
-	"github.com/ossf/criticality_score/cmd/enumerate_github/marker"
-	"github.com/ossf/criticality_score/cmd/enumerate_github/repowriter"
-	"github.com/ossf/criticality_score/internal/envflag"
-	"github.com/ossf/criticality_score/internal/githubapi"
-	log "github.com/ossf/criticality_score/internal/log"
-	"github.com/ossf/criticality_score/internal/outfile"
-	"github.com/ossf/criticality_score/internal/workerpool"
+	"github.com/ossf/criticality_score/v2/cmd/enumerate_github/githubsearch"
+	"github.com/ossf/criticality_score/v2/cmd/enumerate_github/marker"
+	"github.com/ossf/criticality_score/v2/cmd/enumerate_github/repowriter"
+	"github.com/ossf/criticality_score/v2/internal/envflag"
+	"github.com/ossf/criticality_score/v2/internal/githubapi"
+	log "github.com/ossf/criticality_score/v2/internal/log"
+	"github.com/ossf/criticality_score/v2/internal/outfile"
+	"github.com/ossf/criticality_score/v2/internal/workerpool"
 )
 
 const (

diff --git a/cmd/enumerate_github/marker/type_test.go b/cmd/enumerate_github/marker/type_test.go
@@ -23,7 +23,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/ossf/criticality_score/cmd/enumerate_github/marker"
+	"github.com/ossf/criticality_score/v2/cmd/enumerate_github/marker"
 )
 
 func TestTransform(t *testing.T) {

diff --git a/cmd/enumerate_github/marker/write.go b/cmd/enumerate_github/marker/write.go
@@ -18,7 +18,7 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/ossf/criticality_score/internal/cloudstorage"
+	"github.com/ossf/criticality_score/v2/internal/cloudstorage"
 )
 
 func Write(ctx context.Context, t Type, markerFile, outFile string) (err error) {

diff --git a/cmd/enumerate_github/marker/write_test.go b/cmd/enumerate_github/marker/write_test.go
@@ -23,7 +23,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/ossf/criticality_score/cmd/enumerate_github/marker"
+	"github.com/ossf/criticality_score/v2/cmd/enumerate_github/marker"
 )
 
 func TestWrite(t *testing.T) {

diff --git a/cmd/enumerate_github/repowriter/scorecard_test.go b/cmd/enumerate_github/repowriter/scorecard_test.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/google/go-cmp/cmp"
 
-	"github.com/ossf/criticality_score/cmd/enumerate_github/repowriter"
+	"github.com/ossf/criticality_score/v2/cmd/enumerate_github/repowriter"
 )
 
 func TestScorecardRepoWriter(t *testing.T) {

diff --git a/cmd/enumerate_github/repowriter/text_test.go b/cmd/enumerate_github/repowriter/text_test.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/google/go-cmp/cmp"
 
-	"github.com/ossf/criticality_score/cmd/enumerate_github/repowriter"
+	"github.com/ossf/criticality_score/v2/cmd/enumerate_github/repowriter"
 )
 
 func TestTextRepoWriter(t *testing.T) {

diff --git a/cmd/enumerate_github/repowriter/type_test.go b/cmd/enumerate_github/repowriter/type_test.go
@@ -4,7 +4,7 @@ import (
 	"errors"
 	"testing"
 
-	"github.com/ossf/criticality_score/cmd/enumerate_github/repowriter"
+	"github.com/ossf/criticality_score/v2/cmd/enumerate_github/repowriter"
 )
 
 func TestTypeString(t *testing.T) {

diff --git a/cmd/scorer/README.md b/cmd/scorer/README.md
@@ -17,7 +17,7 @@ $ scorer \
 ## Install
 
 ```shell
-$ go install github.com/ossf/criticality_score/cmd/scorer
+$ go install github.com/ossf/criticality_score/v2/cmd/scorer
 ```
 
 ## Usage
@@ -168,4 +168,4 @@ https://github.com/georgetomzaridis/aade-publicity-search-js,JavaScript,MIT Lice
 https://github.com/mobcode1337/Twitter-Account-Creator,Python,,19,2022-11-22T12:58:49Z,2022-11-23T00:10:02Z,0,0,1,0,0.04,0,0,0,0,0,,0.11128,2022-11-28T02:47:06Z
 ```
 
-An example for the raw signal data can be found at: https://commondatastorage.googleapis.com/ossf-criticality-score/index.html?prefix=2022.11.28/024706/
+An example for the raw signal data can be found at: https://commondatastorage.googleapis.com/ossf-criticality-score/index.html?prefix=2022.11.28/024706/
diff --git a/cmd/scorer/main.go b/cmd/scorer/main.go
@@ -45,10 +45,10 @@ import (
 	"go.uber.org/zap"
 	"go.uber.org/zap/zapcore"
 
-	"github.com/ossf/criticality_score/internal/infile"
-	log "github.com/ossf/criticality_score/internal/log"
-	"github.com/ossf/criticality_score/internal/outfile"
-	"github.com/ossf/criticality_score/internal/scorer"
+	"github.com/ossf/criticality_score/v2/internal/infile"
+	log "github.com/ossf/criticality_score/v2/internal/log"
+	"github.com/ossf/criticality_score/v2/internal/outfile"
+	"github.com/ossf/criticality_score/v2/internal/scorer"
 )
 
 const defaultLogLevel = zapcore.InfoLevel

diff --git a/go.mod b/go.mod
@@ -1,4 +1,4 @@
-module github.com/ossf/criticality_score
+module github.com/ossf/criticality_score/v2
 
 go 1.21