Skip to content

Commit

Permalink
chore: add /v2 to module
Browse files Browse the repository at this point in the history
  • Loading branch information
shaj13 committed Oct 1, 2020
1 parent d23d38d commit 2a7bb72
Show file tree
Hide file tree
Showing 46 changed files with 81 additions and 81 deletions.
2 changes: 1 addition & 1 deletion .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ linters-settings:
lll:
line-length: 110
goimports:
local-prefixes: "github.com/shaj13/go-guardian/"
local-prefixes: "github.com/shaj13/go-guardian/v2"
issues:
exclude-use-default: false
exclude-rules:
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ lint:
./bin/golangci-lint run -c .golangci.yml ./...

lint-fix:
@FILES="$(shell find . -type f -name '*.go' -not -path "./vendor/*")"; goimports -local "github.com/shaj13/go-guardian/" -w $$FILES
@FILES="$(shell find . -type f -name '*.go' -not -path "./vendor/*")"; goimports -local "github.com/shaj13/go-guardian/v2" -w $$FILES
./bin/golangci-lint run -c .golangci.yml ./... --fix
./bin/golangci-lint run -c .golangci.yml ./... --fix

Expand Down
12 changes: 6 additions & 6 deletions _examples/basic_bearer/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ import (
"github.com/google/uuid"
"github.com/gorilla/mux"

"github.com/shaj13/go-guardian/auth"
"github.com/shaj13/go-guardian/auth/strategies/basic"
"github.com/shaj13/go-guardian/auth/strategies/token"
"github.com/shaj13/go-guardian/auth/strategies/union"
"github.com/shaj13/go-guardian/cache"
"github.com/shaj13/go-guardian/cache/container/fifo"
"github.com/shaj13/go-guardian/v2/auth"
"github.com/shaj13/go-guardian/v2/auth/strategies/basic"
"github.com/shaj13/go-guardian/v2/auth/strategies/token"
"github.com/shaj13/go-guardian/v2/auth/strategies/union"
"github.com/shaj13/go-guardian/v2/cache"
"github.com/shaj13/go-guardian/v2/cache/container/fifo"
)

// Usage:
Expand Down
8 changes: 4 additions & 4 deletions _examples/digest/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ import (

"github.com/gorilla/mux"

"github.com/shaj13/go-guardian/auth"
"github.com/shaj13/go-guardian/auth/strategies/digest"
"github.com/shaj13/go-guardian/cache"
"github.com/shaj13/go-guardian/cache/container/fifo"
"github.com/shaj13/go-guardian/v2/auth"
"github.com/shaj13/go-guardian/v2/auth/strategies/digest"
"github.com/shaj13/go-guardian/v2/cache"
"github.com/shaj13/go-guardian/v2/cache/container/fifo"
)

// Usage:
Expand Down
8 changes: 4 additions & 4 deletions _examples/kubernetes/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ import (

"github.com/gorilla/mux"

"github.com/shaj13/go-guardian/auth"
"github.com/shaj13/go-guardian/auth/strategies/kubernetes"
"github.com/shaj13/go-guardian/cache"
"github.com/shaj13/go-guardian/cache/container/fifo"
"github.com/shaj13/go-guardian/v2/auth"
"github.com/shaj13/go-guardian/v2/auth/strategies/kubernetes"
"github.com/shaj13/go-guardian/v2/cache"
"github.com/shaj13/go-guardian/v2/cache/container/fifo"
)

// Usage:
Expand Down
8 changes: 4 additions & 4 deletions _examples/ldap/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ import (

"github.com/gorilla/mux"

"github.com/shaj13/go-guardian/auth"
"github.com/shaj13/go-guardian/auth/strategies/ldap"
"github.com/shaj13/go-guardian/cache"
"github.com/shaj13/go-guardian/cache/container/fifo"
"github.com/shaj13/go-guardian/v2/auth"
"github.com/shaj13/go-guardian/v2/auth/strategies/ldap"
"github.com/shaj13/go-guardian/v2/cache"
"github.com/shaj13/go-guardian/v2/cache/container/fifo"
)

// Usage:
Expand Down
8 changes: 4 additions & 4 deletions _examples/twofactor/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ import (

"github.com/gorilla/mux"

"github.com/shaj13/go-guardian/auth"
"github.com/shaj13/go-guardian/auth/strategies/basic"
"github.com/shaj13/go-guardian/auth/strategies/twofactor"
"github.com/shaj13/go-guardian/otp"
"github.com/shaj13/go-guardian/v2/auth"
"github.com/shaj13/go-guardian/v2/auth/strategies/basic"
"github.com/shaj13/go-guardian/v2/auth/strategies/twofactor"
"github.com/shaj13/go-guardian/v2/otp"
)

// Usage:
Expand Down
4 changes: 2 additions & 2 deletions _examples/x509/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ import (

"github.com/gorilla/mux"

"github.com/shaj13/go-guardian/auth"
gx509 "github.com/shaj13/go-guardian/auth/strategies/x509"
"github.com/shaj13/go-guardian/v2/auth"
gx509 "github.com/shaj13/go-guardian/v2/auth/strategies/x509"
)

// Usage:
Expand Down
2 changes: 1 addition & 1 deletion auth/strategies/basic/basic.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"errors"
"net/http"

"github.com/shaj13/go-guardian/auth"
"github.com/shaj13/go-guardian/v2/auth"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion auth/strategies/basic/basic_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"net/http"
"testing"

"github.com/shaj13/go-guardian/auth"
"github.com/shaj13/go-guardian/v2/auth"
)

//nolint:goconst
Expand Down
2 changes: 1 addition & 1 deletion auth/strategies/basic/cached.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"
"net/http"

"github.com/shaj13/go-guardian/auth"
"github.com/shaj13/go-guardian/v2/auth"
)

// ExtensionKey represents a key for the password in info extensions.
Expand Down
2 changes: 1 addition & 1 deletion auth/strategies/basic/cached_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (

"github.com/stretchr/testify/assert"

"github.com/shaj13/go-guardian/auth"
"github.com/shaj13/go-guardian/v2/auth"
)

//nolint:goconst
Expand Down
8 changes: 4 additions & 4 deletions auth/strategies/basic/example_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ import (
"fmt"
"net/http"

"github.com/shaj13/go-guardian/auth"
"github.com/shaj13/go-guardian/auth/strategies/basic"
"github.com/shaj13/go-guardian/cache"
_ "github.com/shaj13/go-guardian/cache/container/lru"
"github.com/shaj13/go-guardian/v2/auth"
"github.com/shaj13/go-guardian/v2/auth/strategies/basic"
"github.com/shaj13/go-guardian/v2/cache"
_ "github.com/shaj13/go-guardian/v2/cache/container/lru"
)

func Example() {
Expand Down
2 changes: 1 addition & 1 deletion auth/strategies/basic/options.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package basic
import (
"crypto"

"github.com/shaj13/go-guardian/auth"
"github.com/shaj13/go-guardian/v2/auth"
)

// SetHash set the hashing algorithm to hash the user password.
Expand Down
2 changes: 1 addition & 1 deletion auth/strategies/digest/digest.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"errors"
"net/http"

"github.com/shaj13/go-guardian/auth"
"github.com/shaj13/go-guardian/v2/auth"
)

// ErrInvalidResponse is returned by Strategy when client authz response does not match server hash.
Expand Down
2 changes: 1 addition & 1 deletion auth/strategies/digest/digest_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (

"github.com/stretchr/testify/assert"

"github.com/shaj13/go-guardian/auth"
"github.com/shaj13/go-guardian/v2/auth"
)

func TestStartegy(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion auth/strategies/digest/options.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package digest
import (
"crypto"

"github.com/shaj13/go-guardian/auth"
"github.com/shaj13/go-guardian/v2/auth"
)

// SetHash set the hashing algorithm to hash the user password.
Expand Down
6 changes: 3 additions & 3 deletions auth/strategies/kubernetes/example_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"fmt"
"net/http"

"github.com/shaj13/go-guardian/auth/strategies/token"
"github.com/shaj13/go-guardian/cache"
_ "github.com/shaj13/go-guardian/cache/container/idle"
"github.com/shaj13/go-guardian/v2/auth/strategies/token"
"github.com/shaj13/go-guardian/v2/cache"
_ "github.com/shaj13/go-guardian/v2/cache/container/idle"
)

func ExampleNew() {
Expand Down
4 changes: 2 additions & 2 deletions auth/strategies/kubernetes/kubernetes.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ import (
kubeauth "k8s.io/api/authentication/v1"
kubemeta "k8s.io/apimachinery/pkg/apis/meta/v1"

"github.com/shaj13/go-guardian/auth"
"github.com/shaj13/go-guardian/auth/strategies/token"
"github.com/shaj13/go-guardian/v2/auth"
"github.com/shaj13/go-guardian/v2/auth/strategies/token"
)

type kubeReview struct {
Expand Down
2 changes: 1 addition & 1 deletion auth/strategies/kubernetes/kubernetes_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (

"github.com/stretchr/testify/assert"

"github.com/shaj13/go-guardian/auth"
"github.com/shaj13/go-guardian/v2/auth"
)

func TestNewKubeReview(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion auth/strategies/kubernetes/options.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"crypto/tls"
"net/http"

"github.com/shaj13/go-guardian/auth"
"github.com/shaj13/go-guardian/v2/auth"
)

// SetServiceAccountToken sets kubernetes service account token
Expand Down
4 changes: 2 additions & 2 deletions auth/strategies/ldap/ldap.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
"fmt"
"net/http"

"github.com/shaj13/go-guardian/auth"
"github.com/shaj13/go-guardian/auth/strategies/basic"
"github.com/shaj13/go-guardian/v2/auth"
"github.com/shaj13/go-guardian/v2/auth/strategies/basic"

"gopkg.in/ldap.v3"
)
Expand Down
2 changes: 1 addition & 1 deletion auth/strategies/token/cached.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"
"net/http"

"github.com/shaj13/go-guardian/auth"
"github.com/shaj13/go-guardian/v2/auth"
)

// AuthenticateFunc declare custom function to authenticate request using token.
Expand Down
2 changes: 1 addition & 1 deletion auth/strategies/token/cached_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (

"github.com/stretchr/testify/assert"

"github.com/shaj13/go-guardian/auth"
"github.com/shaj13/go-guardian/v2/auth"
)

func TestNewCahced(t *testing.T) {
Expand Down
6 changes: 3 additions & 3 deletions auth/strategies/token/example_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import (
"fmt"
"net/http"

"github.com/shaj13/go-guardian/auth"
"github.com/shaj13/go-guardian/cache"
_ "github.com/shaj13/go-guardian/cache/container/lru"
"github.com/shaj13/go-guardian/v2/auth"
"github.com/shaj13/go-guardian/v2/cache"
_ "github.com/shaj13/go-guardian/v2/cache/container/lru"
)

func ExampleNewStaticFromFile() {
Expand Down
2 changes: 1 addition & 1 deletion auth/strategies/token/parser.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package token
import (
"net/http"

"github.com/shaj13/go-guardian/auth/internal"
"github.com/shaj13/go-guardian/v2/auth/internal"
)

// Parser parse and extract token from incoming HTTP request.
Expand Down
2 changes: 1 addition & 1 deletion auth/strategies/token/static.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"strings"
"sync"

"github.com/shaj13/go-guardian/auth"
"github.com/shaj13/go-guardian/v2/auth"
)

// Static implements auth.Strategy and define a synchronized map honor all predefined bearer tokens.
Expand Down
2 changes: 1 addition & 1 deletion auth/strategies/token/static_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (

"github.com/stretchr/testify/assert"

"github.com/shaj13/go-guardian/auth"
"github.com/shaj13/go-guardian/v2/auth"
)

func TestNewStaticFromFile(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion auth/strategies/token/token.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ package token
import (
"errors"

"github.com/shaj13/go-guardian/auth"
"github.com/shaj13/go-guardian/v2/auth"
)

var (
Expand Down
8 changes: 4 additions & 4 deletions auth/strategies/twofactor/example_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ import (
"fmt"
"net/http"

"github.com/shaj13/go-guardian/auth"
"github.com/shaj13/go-guardian/auth/strategies/basic"
"github.com/shaj13/go-guardian/auth/strategies/twofactor"
"github.com/shaj13/go-guardian/otp"
"github.com/shaj13/go-guardian/v2/auth"
"github.com/shaj13/go-guardian/v2/auth/strategies/basic"
"github.com/shaj13/go-guardian/v2/auth/strategies/twofactor"
"github.com/shaj13/go-guardian/v2/otp"
)

type OTPManager struct{}
Expand Down
2 changes: 1 addition & 1 deletion auth/strategies/twofactor/parser.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"errors"
"net/http"

"github.com/shaj13/go-guardian/auth/internal"
"github.com/shaj13/go-guardian/v2/auth/internal"
)

// ErrMissingOTP is returned by Parser,
Expand Down
2 changes: 1 addition & 1 deletion auth/strategies/twofactor/twofactor.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"errors"
"net/http"

"github.com/shaj13/go-guardian/auth"
"github.com/shaj13/go-guardian/v2/auth"
)

// ErrInvalidOTP is returned by twofactor strategy,
Expand Down
2 changes: 1 addition & 1 deletion auth/strategies/twofactor/twofactor_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"

"github.com/shaj13/go-guardian/auth"
"github.com/shaj13/go-guardian/v2/auth"
)

func TestStrategy(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion auth/strategies/union/union.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"
"net/http"

"github.com/shaj13/go-guardian/auth"
"github.com/shaj13/go-guardian/v2/auth"
)

// MultiError represent multiple errors that occur when attempting to authenticate a request.
Expand Down
2 changes: 1 addition & 1 deletion auth/strategies/x509/example_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"net/http"
"testing"

"github.com/shaj13/go-guardian/auth"
"github.com/shaj13/go-guardian/v2/auth"
)

func Example() {
Expand Down
2 changes: 1 addition & 1 deletion auth/strategies/x509/x509.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"errors"
"net/http"

"github.com/shaj13/go-guardian/auth"
"github.com/shaj13/go-guardian/v2/auth"
)

var (
Expand Down
4 changes: 2 additions & 2 deletions cache/container/fifo/fifo.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ package fifo
import (
"container/list"

"github.com/shaj13/go-guardian/cache"
"github.com/shaj13/go-guardian/cache/internal"
"github.com/shaj13/go-guardian/v2/cache"
"github.com/shaj13/go-guardian/v2/cache/internal"
)

func init() {
Expand Down
Loading

0 comments on commit 2a7bb72

Please sign in to comment.