Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: move to non-retracted v2 ristretto #819

Closed
wants to merge 1 commit into from
+16 −16
Closed

chore: move to non-retracted v2 ristretto #819

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion configx/koanf_env_test.go
View file
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@ import (
_ "embed"
"testing"

"github.com/dgraph-io/ristretto"
"github.com/dgraph-io/ristretto/v2"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
2 changes: 1 addition & 1 deletion configx/koanf_test.go
View file
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@ import (

"github.com/spf13/pflag"

"github.com/dgraph-io/ristretto"
"github.com/dgraph-io/ristretto/v2"
"github.com/stretchr/testify/require"
)

2 changes: 1 addition & 1 deletion configx/schema_cache.go
View file
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@ import (
"context"
"crypto/sha256"

"github.com/dgraph-io/ristretto"
"github.com/dgraph-io/ristretto/v2"

"github.com/ory/jsonschema/v3"
)
2 changes: 1 addition & 1 deletion configx/schema_path_cache.go
View file
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@ import (

"github.com/ory/x/jsonschemax"

"github.com/dgraph-io/ristretto"
"github.com/dgraph-io/ristretto/v2"

"github.com/ory/jsonschema/v3"
)
2 changes: 1 addition & 1 deletion fetcher/fetcher.go
View file
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@ import (
"strings"
"time"

"github.com/dgraph-io/ristretto"
"github.com/dgraph-io/ristretto/v2"
"github.com/hashicorp/go-retryablehttp"
"github.com/pkg/errors"

2 changes: 1 addition & 1 deletion fetcher/fetcher_test.go
View file
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@ import (
"testing"
"time"

"github.com/dgraph-io/ristretto"
"github.com/dgraph-io/ristretto/v2"
"github.com/hashicorp/go-retryablehttp"

"github.com/gobuffalo/httptest"
8 changes: 4 additions & 4 deletions go.mod
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
module github.com/ory/x

go 1.22
go 1.23

toolchain go1.22.2
toolchain go1.23.1

require (
code.dny.dev/ssrf v0.2.0
@@ -12,7 +12,7 @@ require (
github.com/bradleyjkemp/cupaloy/v2 v2.8.0
github.com/cenkalti/backoff/v4 v4.3.0
github.com/cockroachdb/cockroach-go/v2 v2.3.5
github.com/dgraph-io/ristretto v1.0.0
github.com/dgraph-io/ristretto/v2 v2.0.0-alpha
github.com/docker/docker v26.1.4+incompatible
github.com/evanphx/json-patch/v5 v5.6.0
github.com/fatih/structs v1.1.0
@@ -213,7 +213,7 @@ require (
go.uber.org/atomic v1.10.0 // indirect
golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa // indirect
golang.org/x/image v0.18.0 // indirect
golang.org/x/sys v0.25.0 // indirect
golang.org/x/sys v0.26.0 // indirect
golang.org/x/text v0.16.0 // indirect
golang.org/x/time v0.4.0 // indirect
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
8 changes: 4 additions & 4 deletions go.sum
View file
Original file line number Diff line number Diff line change
@@ -123,8 +123,8 @@ github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
github.com/decred/dcrd/crypto/blake256 v1.0.1/go.mod h1:2OfgNZ5wDpcsFmHmCK5gZTPcCXqlm2ArzUIkw9czNJo=
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 h1:8UrgZ3GkP4i/CLijOJx79Yu+etlyjdBU4sfcs2WYQMs=
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0/go.mod h1:v57UDF4pDQJcEfFUCRop3lJL149eHGSe9Jvczhzjo/0=
github.com/dgraph-io/ristretto v1.0.0 h1:SYG07bONKMlFDUYu5pEu3DGAh8c2OFNzKm6G9J4Si84=
github.com/dgraph-io/ristretto v1.0.0/go.mod h1:jTi2FiYEhQ1NsMmA7DeBykizjOuY88NhKBkepyu1jPc=
github.com/dgraph-io/ristretto/v2 v2.0.0-alpha h1:JBy5Mm/z1HBj3hyDLFBS2uHalL971q3yjUaKcia0Sgo=
github.com/dgraph-io/ristretto/v2 v2.0.0-alpha/go.mod h1:7bFGBdXzLfFFjKCN8YDQ7+98m/AEYcrdqH7s0En96Qg=
github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 h1:fAjc9m62+UWV/WAFKLNi6ZS0675eEUC9y3AlwSbQu1Y=
github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw=
github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk=
@@ -1093,8 +1093,8 @@ golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34=
golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo=
golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
2 changes: 1 addition & 1 deletion jwksx/fetcher_v2.go
View file
Original file line number Diff line number Diff line change
@@ -19,7 +19,7 @@ import (

"github.com/ory/x/otelx"

"github.com/dgraph-io/ristretto"
"github.com/dgraph-io/ristretto/v2"
"github.com/lestrrat-go/jwx/jwk"
"github.com/pkg/errors"
"golang.org/x/sync/errgroup"
2 changes: 1 addition & 1 deletion jwksx/fetcher_v2_test.go
View file
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@ import (
"github.com/hashicorp/go-retryablehttp"
"github.com/pkg/errors"

"github.com/dgraph-io/ristretto"
"github.com/dgraph-io/ristretto/v2"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"