Skip to content

Commit

Permalink
Updated all import paths to v2
Browse files Browse the repository at this point in the history
  • Loading branch information
@corbadoman
corbadoman committed Sep 25, 2024
1 parent b896879 commit ed3560d
Show file tree
Hide file tree
Showing 17 changed files with 46 additions and 46 deletions.
7 changes: 4 additions & 3 deletions client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,13 @@ import (
"net/http"
"runtime"

"github.com/corbado/corbado-go/pkg/logger"
"github.com/deepmap/oapi-codegen/pkg/securityprovider"
"github.com/pkg/errors"

"github.com/corbado/corbado-go/internal/assert"
"github.com/corbado/corbado-go/pkg/generated/api"
"github.com/corbado/corbado-go/v2/pkg/logger"

"github.com/corbado/corbado-go/v2/internal/assert"
"github.com/corbado/corbado-go/v2/pkg/generated/api"
)

func newClient(config *Config) (*api.ClientWithResponses, error) {
Expand Down
4 changes: 2 additions & 2 deletions config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (

"github.com/pkg/errors"

"github.com/corbado/corbado-go/internal/assert"
"github.com/corbado/corbado-go/pkg/generated/api"
"github.com/corbado/corbado-go/v2/internal/assert"
"github.com/corbado/corbado-go/v2/pkg/generated/api"
)

type Config struct {
Expand Down
2 changes: 1 addition & 1 deletion examples/basic/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (

"github.com/pkg/errors"

"github.com/corbado/corbado-go"
"github.com/corbado/corbado-go/v2"
)

func main() {
Expand Down
5 changes: 2 additions & 3 deletions examples/stdlib/identifier/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,10 @@ import (
"os"
"strconv"

"github.com/corbado/corbado-go/pkg/generated/api"
"github.com/corbado/corbado-go/v2"
"github.com/corbado/corbado-go/v2/pkg/generated/api"

"github.com/gorilla/mux"

"github.com/corbado/corbado-go"
)

var sdk corbado.SDK
Expand Down
8 changes: 4 additions & 4 deletions internal/services/identifier/identifier.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ import (

"github.com/pkg/errors"

"github.com/corbado/corbado-go/internal/assert"
"github.com/corbado/corbado-go/pkg/generated/api"
"github.com/corbado/corbado-go/pkg/generated/common"
"github.com/corbado/corbado-go/pkg/servererror"
"github.com/corbado/corbado-go/v2/internal/assert"
"github.com/corbado/corbado-go/v2/pkg/generated/api"
"github.com/corbado/corbado-go/v2/pkg/generated/common"
"github.com/corbado/corbado-go/v2/pkg/servererror"
)

type Identifier interface {
Expand Down
2 changes: 1 addition & 1 deletion internal/services/session/config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

"github.com/pkg/errors"

"github.com/corbado/corbado-go/internal/assert"
"github.com/corbado/corbado-go/v2/internal/assert"
)

type Config struct {
Expand Down
10 changes: 5 additions & 5 deletions internal/services/session/session.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ import (
"github.com/golang-jwt/jwt/v4"
"github.com/pkg/errors"

"github.com/corbado/corbado-go/pkg/logger"
"github.com/corbado/corbado-go/pkg/validationerror"
"github.com/corbado/corbado-go/v2/pkg/logger"
"github.com/corbado/corbado-go/v2/pkg/validationerror"

"github.com/corbado/corbado-go/internal/assert"
"github.com/corbado/corbado-go/pkg/entities"
"github.com/corbado/corbado-go/pkg/generated/api"
"github.com/corbado/corbado-go/v2/internal/assert"
"github.com/corbado/corbado-go/v2/pkg/entities"
"github.com/corbado/corbado-go/v2/pkg/generated/api"
)

type Session interface {
Expand Down
8 changes: 4 additions & 4 deletions internal/services/user/user.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ import (

"github.com/pkg/errors"

"github.com/corbado/corbado-go/internal/assert"
"github.com/corbado/corbado-go/pkg/generated/api"
"github.com/corbado/corbado-go/pkg/generated/common"
"github.com/corbado/corbado-go/pkg/servererror"
"github.com/corbado/corbado-go/v2/internal/assert"
"github.com/corbado/corbado-go/v2/pkg/generated/api"
"github.com/corbado/corbado-go/v2/pkg/generated/common"
"github.com/corbado/corbado-go/v2/pkg/servererror"
)

type User interface {
Expand Down
2 changes: 1 addition & 1 deletion pkg/generated/api/api.gen.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pkg/servererror/servererror.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"strings"

"github.com/corbado/corbado-go/pkg/generated/common"
"github.com/corbado/corbado-go/v2/pkg/generated/common"
)

type ServerError struct {
Expand Down
2 changes: 1 addition & 1 deletion pkg/util/util.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package util

import (
"github.com/corbado/corbado-go/pkg/generated/common"
"github.com/corbado/corbado-go/v2/pkg/generated/common"
)

// Ptr returns a pointer to provided value
Expand Down
2 changes: 1 addition & 1 deletion scripts/generate-openapi.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ path=$1

# generate Go entities and clients
oapi-codegen -package common -generate "types" common.yml > ${path}/common/common.gen.go
oapi-codegen -package api -import-mapping common.yml:github.com/corbado/corbado-go/pkg/generated/common -generate "types,client" backend_api_public_v2.yml > ${path}/api/api.gen.go
oapi-codegen -package api -import-mapping common.yml:github.com/corbado/corbado-go/v2/pkg/generated/common -generate "types,client" backend_api_public_v2.yml > ${path}/api/api.gen.go
16 changes: 8 additions & 8 deletions sdk.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,16 @@ import (

"github.com/pkg/errors"

"github.com/corbado/corbado-go/internal/assert"
"github.com/corbado/corbado-go/internal/services/identifier"
"github.com/corbado/corbado-go/internal/services/session"
"github.com/corbado/corbado-go/internal/services/user"
"github.com/corbado/corbado-go/pkg/generated/api"
"github.com/corbado/corbado-go/pkg/servererror"
"github.com/corbado/corbado-go/pkg/validationerror"
"github.com/corbado/corbado-go/v2/internal/assert"
"github.com/corbado/corbado-go/v2/internal/services/identifier"
"github.com/corbado/corbado-go/v2/internal/services/session"
"github.com/corbado/corbado-go/v2/internal/services/user"
"github.com/corbado/corbado-go/v2/pkg/generated/api"
"github.com/corbado/corbado-go/v2/pkg/servererror"
"github.com/corbado/corbado-go/v2/pkg/validationerror"
)

const Version = "2.0.1"
const Version = "2.0.2"

type SDK interface {
Sessions() session.Session
Expand Down
4 changes: 2 additions & 2 deletions tests/integration/identifier/identifier_complete_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (

"github.com/stretchr/testify/assert"

"github.com/corbado/corbado-go/pkg/generated/api"
"github.com/corbado/corbado-go/tests/integration"
"github.com/corbado/corbado-go/v2/pkg/generated/api"
"github.com/corbado/corbado-go/v2/tests/integration"
)

func TestIdentifierOperations(t *testing.T) {
Expand Down
6 changes: 3 additions & 3 deletions tests/integration/user/user_complete_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import (

"github.com/stretchr/testify/require"

"github.com/corbado/corbado-go"
"github.com/corbado/corbado-go/pkg/generated/api"
"github.com/corbado/corbado-go/tests/integration"
"github.com/corbado/corbado-go/v2"
"github.com/corbado/corbado-go/v2/pkg/generated/api"
"github.com/corbado/corbado-go/v2/tests/integration"
)

func TestUserOperations(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions tests/integration/utils.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (
"github.com/pkg/errors"
"github.com/stretchr/testify/require"

"github.com/corbado/corbado-go"
"github.com/corbado/corbado-go/pkg/generated/api"
"github.com/corbado/corbado-go/v2"
"github.com/corbado/corbado-go/v2/pkg/generated/api"
)

func SDK(t *testing.T) corbado.SDK {
Expand Down
8 changes: 4 additions & 4 deletions tests/unit/session/session_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@ import (
"github.com/MicahParks/keyfunc"
"github.com/stretchr/testify/require"

"github.com/corbado/corbado-go/pkg/logger"
"github.com/corbado/corbado-go/pkg/validationerror"
"github.com/corbado/corbado-go/v2/pkg/logger"
"github.com/corbado/corbado-go/v2/pkg/validationerror"

"github.com/golang-jwt/jwt/v4"
"github.com/stretchr/testify/assert"

"github.com/corbado/corbado-go/internal/services/session"
"github.com/corbado/corbado-go/pkg/generated/api"
"github.com/corbado/corbado-go/v2/internal/services/session"
"github.com/corbado/corbado-go/v2/pkg/generated/api"
)

func generateJWT(iss string, exp, nbf int64, privateKey *rsa.PrivateKey) string {
Expand Down

0 comments on commit ed3560d

Please sign in to comment.