fix: add v2 suffix (#3340)

ory · Nov 5, 2022 · c54b9db · c54b9db
1 parent 8d92030
commit c54b9db
Show file tree

Hide file tree

Showing 31 changed files with 54 additions and 46 deletions.
diff --git a/.schema/openapi/patches/meta.yaml b/.schema/openapi/patches/meta.yaml
@@ -13,12 +13,13 @@
 - op: replace
   path: /tags
   value:
-    - name: oauth2
+    - name: oAuth2
       description: OAuth 2.0
     - name: oidc
       description: OpenID Connect
     - name: jwk
       description: JSON Web Keys
-    - name: consent
-      description: OAuth 2.0 Consent
-
+    - name: wellknown
+      description: Well-Known Endpoints
+    - name: metadata
+      description: Service Metadata
diff --git a/client/sdk_test.go b/client/sdk_test.go
@@ -32,7 +32,7 @@ import (
 
 	"github.com/ory/hydra/internal"
 
-	hydra "github.com/ory/hydra-client-go"
+	hydra "github.com/ory/hydra-client-go/v2"
 	"github.com/ory/hydra/client"
 )
 

diff --git a/cmd/cliclient/client.go b/cmd/cliclient/client.go
@@ -12,7 +12,7 @@ import (
 
 	"github.com/spf13/cobra"
 
-	hydra "github.com/ory/hydra-client-go"
+	hydra "github.com/ory/hydra-client-go/v2"
 )
 
 type ContextKey int

diff --git a/cmd/cmd_create_jwks.go b/cmd/cmd_create_jwks.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/spf13/cobra"
 
-	hydra "github.com/ory/hydra-client-go"
+	hydra "github.com/ory/hydra-client-go/v2"
 	"github.com/ory/hydra/cmd/cliclient"
 	"github.com/ory/x/cmdx"
 	"github.com/ory/x/flagx"

diff --git a/cmd/cmd_get_client.go b/cmd/cmd_get_client.go
@@ -6,7 +6,7 @@ package cmd
 import (
 	"github.com/spf13/cobra"
 
-	hydra "github.com/ory/hydra-client-go"
+	hydra "github.com/ory/hydra-client-go/v2"
 	"github.com/ory/hydra/cmd/cliclient"
 	"github.com/ory/x/cmdx"
 )

diff --git a/cmd/cmd_helper_client.go b/cmd/cmd_helper_client.go
@@ -10,7 +10,7 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
 
-	hydra "github.com/ory/hydra-client-go"
+	hydra "github.com/ory/hydra-client-go/v2"
 	"github.com/ory/hydra/cmd/cli"
 	"github.com/ory/x/flagx"
 	"github.com/ory/x/pointerx"

diff --git a/cmd/cmd_import_client.go b/cmd/cmd_import_client.go
@@ -13,7 +13,7 @@ import (
 
 	"github.com/spf13/cobra"
 
-	hydra "github.com/ory/hydra-client-go"
+	hydra "github.com/ory/hydra-client-go/v2"
 	"github.com/ory/hydra/cmd/cli"
 	"github.com/ory/hydra/cmd/cliclient"
 	"github.com/ory/x/cmdx"

diff --git a/cmd/cmd_import_client_test.go b/cmd/cmd_import_client_test.go
@@ -14,7 +14,7 @@ import (
 	"github.com/stretchr/testify/require"
 	"github.com/tidwall/gjson"
 
-	hydra "github.com/ory/hydra-client-go"
+	hydra "github.com/ory/hydra-client-go/v2"
 	"github.com/ory/hydra/cmd"
 	"github.com/ory/x/cmdx"
 	"github.com/ory/x/pointerx"

diff --git a/cmd/cmd_import_jwk.go b/cmd/cmd_import_jwk.go
@@ -13,7 +13,7 @@ import (
 	"github.com/gofrs/uuid"
 	"github.com/spf13/cobra"
 
-	hydra "github.com/ory/hydra-client-go"
+	hydra "github.com/ory/hydra-client-go/v2"
 	"github.com/ory/hydra/cmd/cli"
 	"github.com/ory/hydra/cmd/cliclient"
 	"github.com/ory/x/cmdx"

diff --git a/cmd/cmd_revoke_token.go b/cmd/cmd_revoke_token.go
@@ -8,7 +8,7 @@ import (
 	"fmt"
 	"os"
 
-	hydra "github.com/ory/hydra-client-go"
+	hydra "github.com/ory/hydra-client-go/v2"
 	"github.com/ory/hydra/cmd/cliclient"
 	"github.com/ory/x/cmdx"
 	"github.com/ory/x/flagx"

diff --git a/cmd/output_client.go b/cmd/output_client.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/ory/x/pointerx"
 
-	hydra "github.com/ory/hydra-client-go"
+	hydra "github.com/ory/hydra-client-go/v2"
 )
 
 type (

diff --git a/cmd/output_introspection.go b/cmd/output_introspection.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/ory/x/pointerx"
 
-	hydra "github.com/ory/hydra-client-go"
+	hydra "github.com/ory/hydra-client-go/v2"
 )
 
 type (

diff --git a/cmd/output_jwks.go b/cmd/output_jwks.go
@@ -6,7 +6,7 @@ package cmd
 import (
 	"fmt"
 
-	hydra "github.com/ory/hydra-client-go"
+	hydra "github.com/ory/hydra-client-go/v2"
 )
 
 type (

diff --git a/consent/handler_test.go b/consent/handler_test.go
@@ -24,7 +24,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	hydra "github.com/ory/hydra-client-go"
+	hydra "github.com/ory/hydra-client-go/v2"
 	"github.com/ory/hydra/client"
 	. "github.com/ory/hydra/consent"
 )

diff --git a/consent/sdk_test.go b/consent/sdk_test.go
@@ -10,7 +10,7 @@ import (
 	"testing"
 	"time"
 
-	hydra "github.com/ory/hydra-client-go"
+	hydra "github.com/ory/hydra-client-go/v2"
 
 	"github.com/ory/x/httprouterx"
 

diff --git a/consent/strategy_default_test.go b/consent/strategy_default_test.go
@@ -10,7 +10,7 @@ import (
 	"net/http/httptest"
 	"testing"
 
-	hydra "github.com/ory/hydra-client-go"
+	hydra "github.com/ory/hydra-client-go/v2"
 
 	"github.com/stretchr/testify/require"
 

diff --git a/consent/strategy_logout_test.go b/consent/strategy_logout_test.go
@@ -24,7 +24,7 @@ import (
 
 	jwtgo "github.com/ory/fosite/token/jwt"
 
-	hydra "github.com/ory/hydra-client-go"
+	hydra "github.com/ory/hydra-client-go/v2"
 	"github.com/ory/hydra/client"
 	"github.com/ory/hydra/driver/config"
 	"github.com/ory/hydra/internal"

diff --git a/consent/strategy_oauth_test.go b/consent/strategy_oauth_test.go
@@ -35,7 +35,7 @@ import (
 	"github.com/ory/x/urlx"
 	"github.com/ory/x/uuidx"
 
-	hydra "github.com/ory/hydra-client-go"
+	hydra "github.com/ory/hydra-client-go/v2"
 	"github.com/ory/hydra/client"
 	"github.com/ory/hydra/driver/config"
 	"github.com/ory/hydra/internal"

diff --git a/go.mod b/go.mod
@@ -11,13 +11,13 @@ replace (
 	github.com/oleiade/reflections => github.com/oleiade/reflections v1.0.1
 )
 
-replace github.com/ory/hydra-client-go => ./internal/httpclient
+replace github.com/ory/hydra-client-go/v2 => ./internal/httpclient
 
 require (
 	github.com/ThalesIgnite/crypto11 v1.2.4
 	github.com/bradleyjkemp/cupaloy/v2 v2.6.0
 	github.com/bxcodec/faker/v3 v3.7.0
-	github.com/cenkalti/backoff/v3 v3.0.0
+	github.com/cenkalti/backoff/v3 v3.2.2
 	github.com/fatih/structs v1.1.0
 	github.com/go-bindata/go-bindata v3.1.2+incompatible
 	github.com/go-swagger/go-swagger v0.30.3
@@ -45,7 +45,7 @@ require (
 	github.com/ory/go-acc v0.2.8
 	github.com/ory/graceful v0.1.1
 	github.com/ory/herodot v0.9.13
-	github.com/ory/hydra-client-go v1.11.8
+	github.com/ory/hydra-client-go/v2 v2.0.1
 	github.com/ory/jsonschema/v3 v3.0.7
 	github.com/ory/x v0.0.486
 	github.com/pborman/uuid v1.2.1

diff --git a/go.sum b/go.sum
@@ -192,8 +192,8 @@ github.com/bugsnag/osext v0.0.0-20130617224835-0dd3f918b21b/go.mod h1:obH5gd0Bsq
 github.com/bugsnag/panicwrap v0.0.0-20151223152923-e2c28503fcd0/go.mod h1:D/8v3kj0zr8ZAKg1AQ6crr+5VwKN5eIywRkfhyM/+dE=
 github.com/bxcodec/faker/v3 v3.7.0 h1:qWAFFwcyVS0ukF0UoJju1wBLO0cuPQ7JdVBPggM8kNo=
 github.com/bxcodec/faker/v3 v3.7.0/go.mod h1:gF31YgnMSMKgkvl+fyEo1xuSMbEuieyqfeslGYFjneM=
-github.com/cenkalti/backoff/v3 v3.0.0 h1:ske+9nBpD9qZsTBoF41nW5L+AIuFBKMeze18XQ3eG1c=
-github.com/cenkalti/backoff/v3 v3.0.0/go.mod h1:cIeZDE3IrqwwJl6VUwCN6trj1oXrTS4rc0ij+ULvLYs=
+github.com/cenkalti/backoff/v3 v3.2.2 h1:cfUAAO3yvKMYKPrvhDuHSwQnhZNk/RMHKdZqKTxfm6M=
+github.com/cenkalti/backoff/v3 v3.2.2/go.mod h1:cIeZDE3IrqwwJl6VUwCN6trj1oXrTS4rc0ij+ULvLYs=
 github.com/cenkalti/backoff/v4 v4.1.3 h1:cFAlzYUlVYDysBEH2T5hyJZMh3+5+WCBvSnK6Q8UtC4=
 github.com/cenkalti/backoff/v4 v4.1.3/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
@@ -1534,9 +1534,9 @@ github.com/tomnomnom/linkheader v0.0.0-20180905144013-02ca5825eb80/go.mod h1:iFy
 github.com/toqueteos/webbrowser v1.2.0 h1:tVP/gpK69Fx+qMJKsLE7TD8LuGWPnEV71wBN9rrstGQ=
 github.com/toqueteos/webbrowser v1.2.0/go.mod h1:XWoZq4cyp9WeUeak7w7LXRUQf1F1ATJMir8RTqb4ayM=
 github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM=
+github.com/twitchtv/twirp v8.1.1+incompatible/go.mod h1:RRJoFSAmTEh2weEqWtpPE3vFK5YBhA6bqp2l1kfCC5A=
 github.com/twmb/murmur3 v1.1.6 h1:mqrRot1BRxm+Yct+vavLMou2/iJt0tNVTTC0QoIjaZg=
 github.com/twmb/murmur3 v1.1.6/go.mod h1:Qq/R7NUyOfr65zD+6Q5IHKsJLwP7exErjN6lyyq3OSQ=
-github.com/twitchtv/twirp v8.1.1+incompatible/go.mod h1:RRJoFSAmTEh2weEqWtpPE3vFK5YBhA6bqp2l1kfCC5A=
 github.com/uber/jaeger-client-go v2.30.0+incompatible h1:D6wyKGCecFaSRUpo8lCVbaOOb6ThwMmTEbhRwtKR97o=
 github.com/uber/jaeger-client-go v2.30.0+incompatible/go.mod h1:WVhlPFC8FDjOFMMWRy2pZqQJSXxYSwNYOkTr/Z6d3Kk=
 github.com/uber/jaeger-lib v2.4.1+incompatible h1:td4jdvLcExb4cBISKIpHuGoVXh+dVKhn2Um6rjCsSsg=

diff --git a/internal/httpclient/api/openapi.yaml b/internal/httpclient/api/openapi.yaml
@@ -12,13 +12,15 @@ servers:
 - url: /
 tags:
 - description: OAuth 2.0
-  name: oauth2
+  name: oAuth2
 - description: OpenID Connect
   name: oidc
 - description: JSON Web Keys
   name: jwk
-- description: OAuth 2.0 Consent
-  name: consent
+- description: Well-Known Endpoints
+  name: wellknown
+- description: Service Metadata
+  name: metadata
 paths:
   /.well-known/jwks.json:
     get:

diff --git a/jwk/sdk_test.go b/jwk/sdk_test.go
@@ -11,7 +11,7 @@ import (
 
 	"github.com/ory/hydra/driver/config"
 
-	hydra "github.com/ory/hydra-client-go"
+	hydra "github.com/ory/hydra-client-go/v2"
 
 	"github.com/ory/hydra/internal"
 	"github.com/ory/hydra/x"

diff --git a/oauth2/handler_test.go b/oauth2/handler_test.go
@@ -15,7 +15,7 @@ import (
 	"testing"
 	"time"
 
-	hydra "github.com/ory/hydra-client-go"
+	hydra "github.com/ory/hydra-client-go/v2"
 
 	"github.com/ory/x/httprouterx"
 

diff --git a/oauth2/introspector_test.go b/oauth2/introspector_test.go
@@ -12,7 +12,7 @@ import (
 	"testing"
 	"time"
 
-	hydra "github.com/ory/hydra-client-go"
+	hydra "github.com/ory/hydra-client-go/v2"
 
 	"github.com/ory/x/httprouterx"
 

diff --git a/oauth2/oauth2_auth_code_test.go b/oauth2/oauth2_auth_code_test.go
@@ -21,7 +21,7 @@ import (
 	"github.com/ory/x/ioutilx"
 	"github.com/ory/x/requirex"
 
-	hydra "github.com/ory/hydra-client-go"
+	hydra "github.com/ory/hydra-client-go/v2"
 
 	"github.com/ory/x/httprouterx"
 

diff --git a/oauth2/revocator_test.go b/oauth2/revocator_test.go
@@ -11,14 +11,14 @@ import (
 	"testing"
 	"time"
 
-	"github.com/ory/x/httprouterx"
-
 	"github.com/gobuffalo/pop/v6"
 
+	"github.com/ory/x/httprouterx"
+
 	"github.com/ory/hydra/persistence/sql"
 	"github.com/ory/x/contextx"
 
-	hydra "github.com/ory/hydra-client-go"
+	hydra "github.com/ory/hydra-client-go/v2"
 
 	"github.com/ory/hydra/internal"
 

diff --git a/oauth2/trust/handler_test.go b/oauth2/trust/handler_test.go
@@ -14,6 +14,8 @@ import (
 	"testing"
 	"time"
 
+	"gopkg.in/square/go-jose.v2"
+
 	"github.com/ory/x/pointerx"
 
 	"github.com/stretchr/testify/assert"
@@ -23,12 +25,11 @@ import (
 
 	"github.com/google/uuid"
 	"github.com/stretchr/testify/suite"
-	"gopkg.in/square/go-jose.v2"
 
 	"github.com/ory/hydra/driver"
 	"github.com/ory/hydra/jwk"
 
-	hydra "github.com/ory/hydra-client-go"
+	hydra "github.com/ory/hydra-client-go/v2"
 	"github.com/ory/hydra/driver/config"
 	"github.com/ory/hydra/internal"
 	"github.com/ory/hydra/x"

diff --git a/spec/api.json b/spec/api.json
@@ -3625,7 +3625,7 @@
   "tags": [
     {
       "description": "OAuth 2.0",
-      "name": "oauth2"
+      "name": "oAuth2"
     },
     {
       "description": "OpenID Connect",
@@ -3636,8 +3636,12 @@
       "name": "jwk"
     },
     {
-      "description": "OAuth 2.0 Consent",
-      "name": "consent"
+      "description": "Well-Known Endpoints",
+      "name": "wellknown"
+    },
+    {
+      "description": "Service Metadata",
+      "name": "metadata"
     }
   ],
   "x-forwarded-proto": "string",

diff --git a/test/conformance/run_test.go b/test/conformance/run_test.go
@@ -20,9 +20,9 @@ import (
 	"testing"
 	"time"
 
-	hydrac "github.com/ory/hydra-client-go"
+	backoff "github.com/cenkalti/backoff/v3"
 
-	"github.com/cenkalti/backoff/v3"
+	hydrac "github.com/ory/hydra-client-go/v2"
 
 	"github.com/ory/x/httpx"
 

diff --git a/test/mock-client/main.go b/test/mock-client/main.go
@@ -18,7 +18,7 @@ import (
 	"strings"
 	"time"
 
-	hydra "github.com/ory/hydra-client-go"
+	hydra "github.com/ory/hydra-client-go/v2"
 
 	"golang.org/x/oauth2"
 

diff --git a/test/mock-lcp/main.go b/test/mock-lcp/main.go
@@ -9,7 +9,7 @@ import (
 	"os"
 	"strings"
 
-	hydra "github.com/ory/hydra-client-go"
+	hydra "github.com/ory/hydra-client-go/v2"
 
 	"github.com/ory/x/pointerx"
 	"github.com/ory/x/urlx"