fixed the v1 mod path

johnabass · johnabass · commit e694ef161e19 · 2024-08-19T10:07:23.000-07:00
diff --git a/basculehttp/authenticator.go b/basculehttp/authenticator.go
@@ -6,7 +6,7 @@ package basculehttp
 import (
 	"net/http"
 
-	"github.com/xmidt-org/bascule/v1"
+	"github.com/xmidt-org/bascule"
 )
 
 // NewAuthenticator is a convenient wrapper around bascule.NewAuthenticator.
diff --git a/basculehttp/authorization.go b/basculehttp/authorization.go
@@ -9,7 +9,7 @@ import (
 	"net/http"
 	"strings"
 
-	"github.com/xmidt-org/bascule/v1"
+	"github.com/xmidt-org/bascule"
 )
 
 const (
diff --git a/basculehttp/authorization_test.go b/basculehttp/authorization_test.go
@@ -9,7 +9,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/suite"
-	"github.com/xmidt-org/bascule/v1"
+	"github.com/xmidt-org/bascule"
 )
 
 // withAuthorizationParserOptionErr is an option that returns an error.
diff --git a/basculehttp/authorizer.go b/basculehttp/authorizer.go
@@ -6,7 +6,7 @@ package basculehttp
 import (
 	"net/http"
 
-	"github.com/xmidt-org/bascule/v1"
+	"github.com/xmidt-org/bascule"
 )
 
 // NewAuthorizer is a convenient wrapper around bascule.NewAuthorizer.
diff --git a/basculehttp/basic.go b/basculehttp/basic.go
@@ -9,7 +9,7 @@ import (
 	"encoding/base64"
 	"strings"
 
-	"github.com/xmidt-org/bascule/v1"
+	"github.com/xmidt-org/bascule"
 )
 
 // BasicToken is the interface that Basic Auth tokens implement.
diff --git a/basculehttp/basic_test.go b/basculehttp/basic_test.go
@@ -9,7 +9,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/suite"
-	"github.com/xmidt-org/bascule/v1"
+	"github.com/xmidt-org/bascule"
 )
 
 type BasicTestSuite struct {
diff --git a/basculehttp/error.go b/basculehttp/error.go
@@ -7,7 +7,7 @@ import (
 	"errors"
 	"net/http"
 
-	"github.com/xmidt-org/bascule/v1"
+	"github.com/xmidt-org/bascule"
 )
 
 // ErrorStatusCoder is a strategy for determining the HTTP response code for an error.
diff --git a/basculehttp/error_test.go b/basculehttp/error_test.go
@@ -10,7 +10,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/suite"
-	"github.com/xmidt-org/bascule/v1"
+	"github.com/xmidt-org/bascule"
 )
 
 type ErrorTestSuite struct {
diff --git a/basculehttp/middleware.go b/basculehttp/middleware.go
@@ -8,7 +8,7 @@ import (
 	"net/http"
 	"strconv"
 
-	"github.com/xmidt-org/bascule/v1"
+	"github.com/xmidt-org/bascule"
 	"go.uber.org/multierr"
 )
 
diff --git a/basculehttp/middleware_examples_test.go b/basculehttp/middleware_examples_test.go
@@ -8,7 +8,7 @@ import (
 	"net/http"
 	"net/http/httptest"
 
-	"github.com/xmidt-org/bascule/v1"
+	"github.com/xmidt-org/bascule"
 )
 
 // ExampleMiddleware_basicauth illustrates how to use a basculehttp Middleware with
diff --git a/basculehttp/middleware_test.go b/basculehttp/middleware_test.go
@@ -12,7 +12,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/suite"
-	"github.com/xmidt-org/bascule/v1"
+	"github.com/xmidt-org/bascule"
 )
 
 type MiddlewareTestSuite struct {
diff --git a/basculehttp/testSuite_test.go b/basculehttp/testSuite_test.go
@@ -8,7 +8,7 @@ import (
 	"net/http/httptest"
 
 	"github.com/stretchr/testify/suite"
-	"github.com/xmidt-org/bascule/v1"
+	"github.com/xmidt-org/bascule"
 )
 
 const (
diff --git a/basculejwt/token.go b/basculejwt/token.go
@@ -8,7 +8,7 @@ import (
 	"time"
 
 	"github.com/lestrrat-go/jwx/v2/jwt"
-	"github.com/xmidt-org/bascule/v1"
+	"github.com/xmidt-org/bascule"
 )
 
 // CapabilitiesKey is the JWT claims key where capabilities are expected.
diff --git a/basculejwt/token_test.go b/basculejwt/token_test.go
@@ -12,7 +12,7 @@ import (
 	"github.com/lestrrat-go/jwx/v2/jwk"
 	"github.com/lestrrat-go/jwx/v2/jwt"
 	"github.com/stretchr/testify/suite"
-	"github.com/xmidt-org/bascule/v1"
+	"github.com/xmidt-org/bascule"
 )
 
 type TokenTestSuite struct {
diff --git a/go.mod b/go.mod
@@ -1,4 +1,4 @@
-module github.com/xmidt-org/bascule/v1
+module github.com/xmidt-org/bascule
 
 go 1.21
 

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ package basculehttp`
`6`	`6`	`import (`
`7`	`7`	`"net/http"`
`8`	`8`
`9`		`- "github.com/xmidt-org/bascule/v1"`
	`9`	`+ "github.com/xmidt-org/bascule"`
`10`	`10`	`)`
`11`	`11`
`12`	`12`	`// NewAuthenticator is a convenient wrapper around bascule.NewAuthenticator.`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ import (`
`9`	`9`	`"net/http"`
`10`	`10`	`"strings"`
`11`	`11`
`12`		`- "github.com/xmidt-org/bascule/v1"`
	`12`	`+ "github.com/xmidt-org/bascule"`
`13`	`13`	`)`
`14`	`14`
`15`	`15`	`const (`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ import (`
`9`	`9`	`"testing"`
`10`	`10`
`11`	`11`	`"github.com/stretchr/testify/suite"`
`12`		`- "github.com/xmidt-org/bascule/v1"`
	`12`	`+ "github.com/xmidt-org/bascule"`
`13`	`13`	`)`
`14`	`14`
`15`	`15`	`// withAuthorizationParserOptionErr is an option that returns an error.`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ import (`
`9`	`9`	`"encoding/base64"`
`10`	`10`	`"strings"`
`11`	`11`
`12`		`- "github.com/xmidt-org/bascule/v1"`
	`12`	`+ "github.com/xmidt-org/bascule"`
`13`	`13`	`)`
`14`	`14`
`15`	`15`	`// BasicToken is the interface that Basic Auth tokens implement.`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ import (`
`7`	`7`	`"errors"`
`8`	`8`	`"net/http"`
`9`	`9`
`10`		`- "github.com/xmidt-org/bascule/v1"`
	`10`	`+ "github.com/xmidt-org/bascule"`
`11`	`11`	`)`
`12`	`12`
`13`	`13`	`// ErrorStatusCoder is a strategy for determining the HTTP response code for an error.`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ import (`
`10`	`10`	`"testing"`
`11`	`11`
`12`	`12`	`"github.com/stretchr/testify/suite"`
`13`		`- "github.com/xmidt-org/bascule/v1"`
	`13`	`+ "github.com/xmidt-org/bascule"`
`14`	`14`	`)`
`15`	`15`
`16`	`16`	`type ErrorTestSuite struct {`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ import (`
`8`	`8`	`"net/http"`
`9`	`9`	`"strconv"`
`10`	`10`
`11`		`- "github.com/xmidt-org/bascule/v1"`
	`11`	`+ "github.com/xmidt-org/bascule"`
`12`	`12`	`"go.uber.org/multierr"`
`13`	`13`	`)`
`14`	`14`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ import (`
`8`	`8`	`"net/http"`
`9`	`9`	`"net/http/httptest"`
`10`	`10`
`11`		`- "github.com/xmidt-org/bascule/v1"`
	`11`	`+ "github.com/xmidt-org/bascule"`
`12`	`12`	`)`
`13`	`13`
`14`	`14`	`// ExampleMiddleware_basicauth illustrates how to use a basculehttp Middleware with`