Skip to content

Commit e9563b3

Browse files
committed
chore: synchronize workspaces
1 parent 51bbb19 commit e9563b3

File tree

4 files changed

+211
-379
lines changed

4 files changed

+211
-379
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ export PATH := .bin:${PATH}
55
export PWD := $(shell pwd)
66
export IMAGE_TAG := $(if $(IMAGE_TAG),$(IMAGE_TAG),latest)
77

8-
GOLANGCI_LINT_VERSION = 1.61.0
8+
GOLANGCI_LINT_VERSION = 1.64.7
99

1010
GO_DEPENDENCIES = github.com/ory/go-acc \
1111
github.com/golang/mock/mockgen \

client/sdk_test.go

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -9,27 +9,20 @@ import (
99
"strings"
1010
"testing"
1111

12-
"github.com/ory/hydra/v2/internal/testhelpers"
13-
14-
"github.com/ory/x/assertx"
15-
16-
"github.com/ory/x/ioutilx"
17-
18-
"github.com/ory/x/uuidx"
19-
2012
"github.com/mohae/deepcopy"
21-
22-
"github.com/ory/hydra/v2/x"
23-
"github.com/ory/x/contextx"
24-
"github.com/ory/x/pointerx"
25-
26-
"github.com/ory/hydra/v2/driver/config"
27-
2813
"github.com/stretchr/testify/assert"
2914
"github.com/stretchr/testify/require"
3015

3116
hydra "github.com/ory/hydra-client-go/v2"
3217
"github.com/ory/hydra/v2/client"
18+
"github.com/ory/hydra/v2/driver/config"
19+
"github.com/ory/hydra/v2/internal/testhelpers"
20+
"github.com/ory/hydra/v2/x"
21+
"github.com/ory/x/assertx"
22+
"github.com/ory/x/contextx"
23+
"github.com/ory/x/ioutilx"
24+
"github.com/ory/x/pointerx"
25+
"github.com/ory/x/uuidx"
3326
)
3427

3528
func createTestClient(prefix string) hydra.OAuth2Client {
@@ -54,7 +47,7 @@ func createTestClient(prefix string) hydra.OAuth2Client {
5447
// because these values are not nullable in the SQL schema, we have to set them not nil
5548
AllowedCorsOrigins: []string{},
5649
Audience: []string{},
57-
Jwks: map[string]interface{}{},
50+
Jwks: &hydra.JsonWebKeySet{},
5851
SkipConsent: pointerx.Ptr(false),
5952
}
6053
}

0 commit comments

Comments
 (0)