Skip to content

Commit

Permalink
Change httprc URL to v2
Browse files Browse the repository at this point in the history
  • Loading branch information
@lestrrat
lestrrat committed Feb 16, 2024
1 parent 30d1dc2 commit ea1ff6f
Show file tree
Hide file tree
Showing 12 changed files with 20 additions and 20 deletions.
2 changes: 1 addition & 1 deletion bench/performance/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ require (
github.com/goccy/go-json v0.10.2 // indirect
github.com/lestrrat-go/blackmagic v1.0.2 // indirect
github.com/lestrrat-go/httpcc v1.0.1 // indirect
github.com/lestrrat-go/httprc v1.0.5-0.20240131091448-aad5229b754e // indirect
github.com/lestrrat-go/httprc/v2 v2.0.0-20240215104503-259854c0bf17 // indirect
github.com/lestrrat-go/option v1.0.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/segmentio/asm v1.2.0 // indirect
Expand Down
4 changes: 2 additions & 2 deletions bench/performance/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ github.com/lestrrat-go/blackmagic v1.0.2 h1:Cg2gVSc9h7sz9NOByczrbUvLopQmXrfFx//N
github.com/lestrrat-go/blackmagic v1.0.2/go.mod h1:UrEqBzIR2U6CnzVyUtfM6oZNMt/7O7Vohk2J0OGSAtU=
github.com/lestrrat-go/httpcc v1.0.1 h1:ydWCStUeJLkpYyjLDHihupbn2tYmZ7m22BGkcvZZrIE=
github.com/lestrrat-go/httpcc v1.0.1/go.mod h1:qiltp3Mt56+55GPVCbTdM9MlqhvzyuL6W/NMDA8vA5E=
github.com/lestrrat-go/httprc v1.0.5-0.20240131091448-aad5229b754e h1:70WfLarbWqIEFegaD51537QpkgjXp2T/vUd102MHXQM=
github.com/lestrrat-go/httprc v1.0.5-0.20240131091448-aad5229b754e/go.mod h1:mwwz3JMTPBjHUkkDv/IGJ39aALInZLrhBp0X7KGUZlo=
github.com/lestrrat-go/httprc/v2 v2.0.0-20240215104503-259854c0bf17 h1:VImS2cQpeobQFpnP0dOg4FAFfIQNqG+Nhe7am03TWEU=
github.com/lestrrat-go/httprc/v2 v2.0.0-20240215104503-259854c0bf17/go.mod h1:MCacXKDZ/natZPiQhPgd2LT3UAF7geVocqOESzkB1gQ=
github.com/lestrrat-go/option v1.0.1 h1:oAzP2fvZGQKWkvHa1/SAcFolBEca1oN+mQ7eooNBEYU=
github.com/lestrrat-go/option v1.0.1/go.mod h1:5ZHFbivi4xwXxhxY9XHDe2FHo6/Z7WWmtT7T5nBBp3I=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
Expand Down
2 changes: 1 addition & 1 deletion cmd/jwx/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ require (
github.com/goccy/go-json v0.10.2 // indirect
github.com/lestrrat-go/blackmagic v1.0.2 // indirect
github.com/lestrrat-go/httpcc v1.0.1 // indirect
github.com/lestrrat-go/httprc v1.0.5-0.20240131091448-aad5229b754e // indirect
github.com/lestrrat-go/httprc/v2 v2.0.0-20240215104503-259854c0bf17 // indirect
github.com/lestrrat-go/option v1.0.1 // indirect
github.com/russross/blackfriday/v2 v2.1.0 // indirect
github.com/segmentio/asm v1.2.0 // indirect
Expand Down
4 changes: 2 additions & 2 deletions cmd/jwx/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ github.com/lestrrat-go/blackmagic v1.0.2 h1:Cg2gVSc9h7sz9NOByczrbUvLopQmXrfFx//N
github.com/lestrrat-go/blackmagic v1.0.2/go.mod h1:UrEqBzIR2U6CnzVyUtfM6oZNMt/7O7Vohk2J0OGSAtU=
github.com/lestrrat-go/httpcc v1.0.1 h1:ydWCStUeJLkpYyjLDHihupbn2tYmZ7m22BGkcvZZrIE=
github.com/lestrrat-go/httpcc v1.0.1/go.mod h1:qiltp3Mt56+55GPVCbTdM9MlqhvzyuL6W/NMDA8vA5E=
github.com/lestrrat-go/httprc v1.0.5-0.20240131091448-aad5229b754e h1:70WfLarbWqIEFegaD51537QpkgjXp2T/vUd102MHXQM=
github.com/lestrrat-go/httprc v1.0.5-0.20240131091448-aad5229b754e/go.mod h1:mwwz3JMTPBjHUkkDv/IGJ39aALInZLrhBp0X7KGUZlo=
github.com/lestrrat-go/httprc/v2 v2.0.0-20240215104503-259854c0bf17 h1:VImS2cQpeobQFpnP0dOg4FAFfIQNqG+Nhe7am03TWEU=
github.com/lestrrat-go/httprc/v2 v2.0.0-20240215104503-259854c0bf17/go.mod h1:MCacXKDZ/natZPiQhPgd2LT3UAF7geVocqOESzkB1gQ=
github.com/lestrrat-go/option v1.0.1 h1:oAzP2fvZGQKWkvHa1/SAcFolBEca1oN+mQ7eooNBEYU=
github.com/lestrrat-go/option v1.0.1/go.mod h1:5ZHFbivi4xwXxhxY9XHDe2FHo6/Z7WWmtT7T5nBBp3I=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
Expand Down
8 changes: 4 additions & 4 deletions deps.bzl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,11 @@ def go_dependencies():
version = "v1.0.1",
)
go_repository(
name = "com_github_lestrrat_go_httprc",
name = "com_github_lestrrat_go_httprc_v2",
build_file_proto_mode = "disable_global",
importpath = "github.com/lestrrat-go/httprc",
sum = "h1:70WfLarbWqIEFegaD51537QpkgjXp2T/vUd102MHXQM=",
version = "v1.0.5-0.20240131091448-aad5229b754e",
importpath = "github.com/lestrrat-go/httprc/v2",
sum = "h1:VImS2cQpeobQFpnP0dOg4FAFfIQNqG+Nhe7am03TWEU=",
version = "v2.0.0-20240215104503-259854c0bf17",
)

go_repository(
Expand Down
2 changes: 1 addition & 1 deletion examples/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ require (
github.com/goccy/go-json v0.10.2 // indirect
github.com/lestrrat-go/blackmagic v1.0.2 // indirect
github.com/lestrrat-go/httpcc v1.0.1 // indirect
github.com/lestrrat-go/httprc v1.0.5-0.20240131091448-aad5229b754e // indirect
github.com/lestrrat-go/httprc/v2 v2.0.0-20240215104503-259854c0bf17 // indirect
github.com/lestrrat-go/option v1.0.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/segmentio/asm v1.2.0 // indirect
Expand Down
4 changes: 2 additions & 2 deletions examples/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ github.com/lestrrat-go/blackmagic v1.0.2 h1:Cg2gVSc9h7sz9NOByczrbUvLopQmXrfFx//N
github.com/lestrrat-go/blackmagic v1.0.2/go.mod h1:UrEqBzIR2U6CnzVyUtfM6oZNMt/7O7Vohk2J0OGSAtU=
github.com/lestrrat-go/httpcc v1.0.1 h1:ydWCStUeJLkpYyjLDHihupbn2tYmZ7m22BGkcvZZrIE=
github.com/lestrrat-go/httpcc v1.0.1/go.mod h1:qiltp3Mt56+55GPVCbTdM9MlqhvzyuL6W/NMDA8vA5E=
github.com/lestrrat-go/httprc v1.0.5-0.20240131091448-aad5229b754e h1:70WfLarbWqIEFegaD51537QpkgjXp2T/vUd102MHXQM=
github.com/lestrrat-go/httprc v1.0.5-0.20240131091448-aad5229b754e/go.mod h1:mwwz3JMTPBjHUkkDv/IGJ39aALInZLrhBp0X7KGUZlo=
github.com/lestrrat-go/httprc/v2 v2.0.0-20240215104503-259854c0bf17 h1:VImS2cQpeobQFpnP0dOg4FAFfIQNqG+Nhe7am03TWEU=
github.com/lestrrat-go/httprc/v2 v2.0.0-20240215104503-259854c0bf17/go.mod h1:MCacXKDZ/natZPiQhPgd2LT3UAF7geVocqOESzkB1gQ=
github.com/lestrrat-go/option v1.0.1 h1:oAzP2fvZGQKWkvHa1/SAcFolBEca1oN+mQ7eooNBEYU=
github.com/lestrrat-go/option v1.0.1/go.mod h1:5ZHFbivi4xwXxhxY9XHDe2FHo6/Z7WWmtT7T5nBBp3I=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ require (
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0
github.com/goccy/go-json v0.10.2
github.com/lestrrat-go/blackmagic v1.0.2
github.com/lestrrat-go/httprc v1.0.5-0.20240131091448-aad5229b754e
github.com/lestrrat-go/httprc/v2 v2.0.0-20240215104503-259854c0bf17
github.com/lestrrat-go/option v1.0.1
github.com/segmentio/asm v1.2.0
github.com/stretchr/testify v1.8.4
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ github.com/lestrrat-go/blackmagic v1.0.2 h1:Cg2gVSc9h7sz9NOByczrbUvLopQmXrfFx//N
github.com/lestrrat-go/blackmagic v1.0.2/go.mod h1:UrEqBzIR2U6CnzVyUtfM6oZNMt/7O7Vohk2J0OGSAtU=
github.com/lestrrat-go/httpcc v1.0.1 h1:ydWCStUeJLkpYyjLDHihupbn2tYmZ7m22BGkcvZZrIE=
github.com/lestrrat-go/httpcc v1.0.1/go.mod h1:qiltp3Mt56+55GPVCbTdM9MlqhvzyuL6W/NMDA8vA5E=
github.com/lestrrat-go/httprc v1.0.5-0.20240131091448-aad5229b754e h1:70WfLarbWqIEFegaD51537QpkgjXp2T/vUd102MHXQM=
github.com/lestrrat-go/httprc v1.0.5-0.20240131091448-aad5229b754e/go.mod h1:mwwz3JMTPBjHUkkDv/IGJ39aALInZLrhBp0X7KGUZlo=
github.com/lestrrat-go/httprc/v2 v2.0.0-20240215104503-259854c0bf17 h1:VImS2cQpeobQFpnP0dOg4FAFfIQNqG+Nhe7am03TWEU=
github.com/lestrrat-go/httprc/v2 v2.0.0-20240215104503-259854c0bf17/go.mod h1:MCacXKDZ/natZPiQhPgd2LT3UAF7geVocqOESzkB1gQ=
github.com/lestrrat-go/option v1.0.1 h1:oAzP2fvZGQKWkvHa1/SAcFolBEca1oN+mQ7eooNBEYU=
github.com/lestrrat-go/option v1.0.1/go.mod h1:5ZHFbivi4xwXxhxY9XHDe2FHo6/Z7WWmtT7T5nBBp3I=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
Expand Down
4 changes: 2 additions & 2 deletions jwk/cache.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"net/http"
"time"

"github.com/lestrrat-go/httprc"
"github.com/lestrrat-go/httprc/v2"
)

type Transformer = httprc.Transformer
Expand All @@ -17,7 +17,7 @@ type ErrSink = httprc.ErrSink
// Whitelist describes a set of rules that allows users to access
// a particular URL. By default all URLs are blocked for security
// reasons. You will HAVE to provide some sort of whitelist. See
// the documentation for github.com/lestrrat-go/httprc for more details.
// the documentation for github.com/lestrrat-go/httprc/v2 for more details.
type Whitelist = httprc.Whitelist

// Cache is a container that keeps track of Set object by their source URLs.
Expand Down
2 changes: 1 addition & 1 deletion jwk/fetch.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"io"
"net/http"

"github.com/lestrrat-go/httprc"
"github.com/lestrrat-go/httprc/v2"
)

// Fetcher is an interface that represents an object that fetches a JWKS.
Expand Down
2 changes: 1 addition & 1 deletion jws/jws_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
"testing"
"time"

"github.com/lestrrat-go/httprc"
"github.com/lestrrat-go/httprc/v2"
"github.com/lestrrat-go/jwx/v3/internal/base64"
"github.com/lestrrat-go/jwx/v3/internal/json"
"github.com/lestrrat-go/jwx/v3/internal/jwxtest"
Expand Down

0 comments on commit ea1ff6f

Please sign in to comment.