Skip to content

Commit

Permalink
fix: append /v2 to module path
Browse files Browse the repository at this point in the history
  • Loading branch information
@alnr @aeneasr
alnr authored and aeneasr committed Jan 28, 2023
1 parent 488f930 commit f56e5fa
Show file tree
Hide file tree
Showing 147 changed files with 410 additions and 410 deletions.
6 changes: 3 additions & 3 deletions .goreleaser.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ includes:
variables:
brew_name: hydra
brew_description: "The Ory OAuth2 and OpenID Connect Platform (Ory Hydra)"
buildinfo_hash: "github.com/ory/hydra/driver/config.Commit"
buildinfo_tag: "github.com/ory/hydra/driver/config.Version"
buildinfo_date: "github.com/ory/hydra/driver/config.Date"
buildinfo_hash: "github.com/ory/hydra/v2/driver/config.Commit"
buildinfo_tag: "github.com/ory/hydra/v2/driver/config.Version"
buildinfo_date: "github.com/ory/hydra/v2/driver/config.Date"
dockerfile: ".docker/Dockerfile-alpine"

project_name: hydra
15 changes: 8 additions & 7 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,12 +116,12 @@ mocks: .bin/mockgen
.PHONY: sdk
sdk: .bin/swagger .bin/ory node_modules
swagger generate spec -m -o spec/swagger.json \
-c github.com/ory/hydra/client \
-c github.com/ory/hydra/consent \
-c github.com/ory/hydra/health \
-c github.com/ory/hydra/jwk \
-c github.com/ory/hydra/oauth2 \
-c github.com/ory/hydra/x \
-c github.com/ory/hydra/v2/client \
-c github.com/ory/hydra/v2/consent \
-c github.com/ory/hydra/v2/health \
-c github.com/ory/hydra/v2/jwk \
-c github.com/ory/hydra/v2/oauth2 \
-c github.com/ory/hydra/v2/x \
-c github.com/ory/x/healthx \
-c github.com/ory/x/openapix \
-c github.com/ory/x/pagination \
Expand All @@ -147,6 +147,7 @@ sdk: .bin/swagger .bin/ory node_modules
--git-user-id ory \
--git-repo-id hydra-client-go \
--git-host github.com
(cd internal/httpclient && go mod edit -module github.com/ory/hydra-client-go/v2)

make format

Expand Down Expand Up @@ -177,7 +178,7 @@ install-stable:
git checkout $$HYDRA_LATEST
GO111MODULE=on go install \
-tags sqlite,json1 \
-ldflags "-X github.com/ory/hydra/driver/config.Version=$$HYDRA_LATEST -X github.com/ory/hydra/driver/config.Date=`TZ=UTC date -u '+%Y-%m-%dT%H:%M:%SZ'` -X github.com/ory/hydra/driver/config.Commit=`git rev-parse HEAD`" \
-ldflags "-X github.com/ory/hydra/v2/driver/config.Version=$$HYDRA_LATEST -X github.com/ory/hydra/v2/driver/config.Date=`TZ=UTC date -u '+%Y-%m-%dT%H:%M:%SZ'` -X github.com/ory/hydra/v2/driver/config.Commit=`git rev-parse HEAD`" \
.
git checkout master

Expand Down
2 changes: 1 addition & 1 deletion client/client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (
jose "gopkg.in/square/go-jose.v2" // Naming the dependency jose is important for go-swagger to work, see https://github.com/go-swagger/go-swagger/issues/1587

"github.com/ory/fosite"
"github.com/ory/hydra/x"
"github.com/ory/hydra/v2/x"
"github.com/ory/x/sqlxx"
)

Expand Down
2 changes: 1 addition & 1 deletion client/handler.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import (
"github.com/ory/x/errorsx"

"github.com/ory/herodot"
"github.com/ory/hydra/x"
"github.com/ory/hydra/v2/x"

"github.com/julienschmidt/httprouter"
"github.com/pkg/errors"
Expand Down
8 changes: 4 additions & 4 deletions client/handler_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ import (
"github.com/gofrs/uuid"
"github.com/tidwall/gjson"

"github.com/ory/hydra/internal/testhelpers"
"github.com/ory/hydra/v2/internal/testhelpers"

"github.com/ory/hydra/driver/config"
"github.com/ory/hydra/v2/driver/config"
"github.com/ory/x/contextx"

"github.com/julienschmidt/httprouter"
Expand All @@ -32,8 +32,8 @@ import (

"github.com/stretchr/testify/require"

"github.com/ory/hydra/client"
"github.com/ory/hydra/internal"
"github.com/ory/hydra/v2/client"
"github.com/ory/hydra/v2/internal"
)

type responseSnapshot struct {
Expand Down
4 changes: 2 additions & 2 deletions client/manager_test_helpers.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ import (

"github.com/ory/fosite"

testhelpersuuid "github.com/ory/hydra/internal/testhelpers/uuid"
"github.com/ory/hydra/x"
testhelpersuuid "github.com/ory/hydra/v2/internal/testhelpers/uuid"
"github.com/ory/hydra/v2/x"
)

func TestHelperClientAutoGenerateKey(k string, m Storage) func(t *testing.T) {
Expand Down
6 changes: 3 additions & 3 deletions client/registry.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
package client

import (
"github.com/ory/hydra/driver/config"
"github.com/ory/hydra/v2/driver/config"

"github.com/ory/fosite"
foauth2 "github.com/ory/fosite/handler/oauth2"
"github.com/ory/hydra/jwk"
"github.com/ory/hydra/x"
"github.com/ory/hydra/v2/jwk"
"github.com/ory/hydra/v2/x"
)

type InternalRegistry interface {
Expand Down
8 changes: 4 additions & 4 deletions client/sdk_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,19 +21,19 @@ import (

"github.com/mohae/deepcopy"

"github.com/ory/hydra/x"
"github.com/ory/hydra/v2/x"
"github.com/ory/x/contextx"
"github.com/ory/x/pointerx"

"github.com/ory/hydra/driver/config"
"github.com/ory/hydra/v2/driver/config"

"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"

"github.com/ory/hydra/internal"
"github.com/ory/hydra/v2/internal"

hydra "github.com/ory/hydra-client-go/v2"
"github.com/ory/hydra/client"
"github.com/ory/hydra/v2/client"
)

func createTestClient(prefix string) hydra.OAuth2Client {
Expand Down
4 changes: 2 additions & 2 deletions client/validator.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
"net/url"
"strings"

"github.com/ory/hydra/driver/config"
"github.com/ory/hydra/x"
"github.com/ory/hydra/v2/driver/config"
"github.com/ory/hydra/v2/x"
"github.com/ory/x/ipx"

"github.com/ory/x/errorsx"
Expand Down
10 changes: 5 additions & 5 deletions client/validator_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (

"github.com/hashicorp/go-retryablehttp"

"github.com/ory/hydra/driver"
"github.com/ory/hydra/v2/driver"
"github.com/ory/x/httpx"

"github.com/gofrs/uuid"
Expand All @@ -21,10 +21,10 @@ import (
"github.com/stretchr/testify/require"
jose "gopkg.in/square/go-jose.v2"

. "github.com/ory/hydra/client"
"github.com/ory/hydra/driver/config"
"github.com/ory/hydra/internal"
"github.com/ory/hydra/x"
. "github.com/ory/hydra/v2/client"
"github.com/ory/hydra/v2/driver/config"
"github.com/ory/hydra/v2/internal"
"github.com/ory/hydra/v2/x"
"github.com/ory/x/contextx"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/cli/handler.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
package cli

import (
"github.com/ory/hydra/driver"
"github.com/ory/hydra/v2/driver"
"github.com/ory/x/configx"
"github.com/ory/x/servicelocatorx"
)
Expand Down
6 changes: 3 additions & 3 deletions cmd/cli/handler_janitor.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,16 @@ import (

"github.com/ory/x/servicelocatorx"

"github.com/ory/hydra/persistence"
"github.com/ory/hydra/v2/persistence"

"github.com/pkg/errors"

"github.com/ory/x/flagx"

"github.com/spf13/cobra"

"github.com/ory/hydra/driver"
"github.com/ory/hydra/driver/config"
"github.com/ory/hydra/v2/driver"
"github.com/ory/hydra/v2/driver/config"
"github.com/ory/x/configx"
"github.com/ory/x/errorsx"
)
Expand Down
6 changes: 3 additions & 3 deletions cmd/cli/handler_janitor_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ import (
"testing"
"time"

"github.com/ory/hydra/cmd"
"github.com/ory/hydra/v2/cmd"

"github.com/spf13/cobra"

"github.com/stretchr/testify/require"

"github.com/ory/hydra/cmd/cli"
"github.com/ory/hydra/internal/testhelpers"
"github.com/ory/hydra/v2/cmd/cli"
"github.com/ory/hydra/v2/internal/testhelpers"
"github.com/ory/x/cmdx"
)

Expand Down
4 changes: 2 additions & 2 deletions cmd/cli/handler_migrate.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ import (

"github.com/spf13/cobra"

"github.com/ory/hydra/driver"
"github.com/ory/hydra/driver/config"
"github.com/ory/hydra/v2/driver"
"github.com/ory/hydra/v2/driver/config"
"github.com/ory/x/flagx"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/clidoc/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (

"github.com/ory/x/clidoc"

"github.com/ory/hydra/cmd"
"github.com/ory/hydra/v2/cmd"
)

func main() {
Expand Down
4 changes: 2 additions & 2 deletions cmd/cmd_create_client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ import (

"github.com/spf13/cobra"

"github.com/ory/hydra/cmd/cliclient"
"github.com/ory/hydra/v2/cmd/cliclient"
"github.com/ory/x/cmdx"
"github.com/ory/x/flagx"
"github.com/ory/x/pointerx"

"github.com/ory/hydra/cmd/cli"
"github.com/ory/hydra/v2/cmd/cli"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion cmd/cmd_create_client_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"github.com/stretchr/testify/require"
"github.com/tidwall/gjson"

"github.com/ory/hydra/cmd"
"github.com/ory/hydra/v2/cmd"
"github.com/ory/x/cmdx"
"github.com/ory/x/snapshotx"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/cmd_create_jwks.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"github.com/spf13/cobra"

hydra "github.com/ory/hydra-client-go/v2"
"github.com/ory/hydra/cmd/cliclient"
"github.com/ory/hydra/v2/cmd/cliclient"
"github.com/ory/x/cmdx"
"github.com/ory/x/flagx"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/cmd_create_jwks_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"github.com/stretchr/testify/require"
"github.com/tidwall/gjson"

"github.com/ory/hydra/cmd"
"github.com/ory/hydra/v2/cmd"
"github.com/ory/x/cmdx"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/cmd_delete_client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ package cmd
import (
"github.com/spf13/cobra"

"github.com/ory/hydra/cmd/cliclient"
"github.com/ory/hydra/v2/cmd/cliclient"
"github.com/ory/x/cmdx"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/cmd_delete_client_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"

"github.com/ory/hydra/cmd"
"github.com/ory/hydra/v2/cmd"
"github.com/ory/x/assertx"
"github.com/ory/x/cmdx"
"github.com/ory/x/snapshotx"
Expand Down
2 changes: 1 addition & 1 deletion cmd/cmd_delete_jwks.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (

"github.com/spf13/cobra"

"github.com/ory/hydra/cmd/cliclient"
"github.com/ory/hydra/v2/cmd/cliclient"
"github.com/ory/x/cmdx"
)

Expand Down
4 changes: 2 additions & 2 deletions cmd/cmd_delete_jwks_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ import (

"github.com/gofrs/uuid"

"github.com/ory/hydra/x"
"github.com/ory/hydra/v2/x"

"github.com/stretchr/testify/assert"

"github.com/ory/hydra/cmd"
"github.com/ory/hydra/v2/cmd"
"github.com/ory/x/assertx"
"github.com/ory/x/cmdx"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/cmd_delete_tokens.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ package cmd
import (
"github.com/spf13/cobra"

"github.com/ory/hydra/cmd/cliclient"
"github.com/ory/hydra/v2/cmd/cliclient"
"github.com/ory/x/cmdx"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/cmd_delete_tokens_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (

"github.com/stretchr/testify/assert"

"github.com/ory/hydra/cmd"
"github.com/ory/hydra/v2/cmd"
"github.com/ory/x/cmdx"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/cmd_get_client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"github.com/spf13/cobra"

hydra "github.com/ory/hydra-client-go/v2"
"github.com/ory/hydra/cmd/cliclient"
"github.com/ory/hydra/v2/cmd/cliclient"
"github.com/ory/x/cmdx"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/cmd_get_client_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"github.com/stretchr/testify/require"
"github.com/tidwall/gjson"

"github.com/ory/hydra/cmd"
"github.com/ory/hydra/v2/cmd"
"github.com/ory/x/cmdx"
"github.com/ory/x/snapshotx"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/cmd_get_jwks.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ package cmd
import (
"github.com/spf13/cobra"

"github.com/ory/hydra/cmd/cliclient"
"github.com/ory/hydra/v2/cmd/cliclient"
"github.com/ory/x/cmdx"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/cmd_get_jwks_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"github.com/stretchr/testify/require"
"github.com/tidwall/gjson"

"github.com/ory/hydra/cmd"
"github.com/ory/hydra/v2/cmd"
"github.com/ory/x/cmdx"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/cmd_helper_client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"github.com/spf13/pflag"

hydra "github.com/ory/hydra-client-go/v2"
"github.com/ory/hydra/cmd/cli"
"github.com/ory/hydra/v2/cmd/cli"
"github.com/ory/x/flagx"
"github.com/ory/x/pointerx"
)
Expand Down
Loading

0 comments on commit f56e5fa

Please sign in to comment.