From ea1ff6ffcb0bbd8a6edfcb62c1e0c86eb3f7a4ff Mon Sep 17 00:00:00 2001 From: Daisuke Maki Date: Fri, 16 Feb 2024 10:55:05 +0900 Subject: [PATCH] Change httprc URL to v2 --- bench/performance/go.mod | 2 +- bench/performance/go.sum | 4 ++-- cmd/jwx/go.mod | 2 +- cmd/jwx/go.sum | 4 ++-- deps.bzl | 8 ++++---- examples/go.mod | 2 +- examples/go.sum | 4 ++-- go.mod | 2 +- go.sum | 4 ++-- jwk/cache.go | 4 ++-- jwk/fetch.go | 2 +- jws/jws_test.go | 2 +- 12 files changed, 20 insertions(+), 20 deletions(-) diff --git a/bench/performance/go.mod b/bench/performance/go.mod index a8a7b7bb5..d72bbdeb1 100644 --- a/bench/performance/go.mod +++ b/bench/performance/go.mod @@ -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 diff --git a/bench/performance/go.sum b/bench/performance/go.sum index 6bc2f7024..20b59e4f9 100644 --- a/bench/performance/go.sum +++ b/bench/performance/go.sum @@ -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= diff --git a/cmd/jwx/go.mod b/cmd/jwx/go.mod index 181417422..856ae6e78 100644 --- a/cmd/jwx/go.mod +++ b/cmd/jwx/go.mod @@ -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 diff --git a/cmd/jwx/go.sum b/cmd/jwx/go.sum index a94fb7c5f..fdf51bba6 100644 --- a/cmd/jwx/go.sum +++ b/cmd/jwx/go.sum @@ -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= diff --git a/deps.bzl b/deps.bzl index 441e3b9bf..8020598a4 100644 --- a/deps.bzl +++ b/deps.bzl @@ -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( diff --git a/examples/go.mod b/examples/go.mod index 023161230..5f5baabaa 100644 --- a/examples/go.mod +++ b/examples/go.mod @@ -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 diff --git a/examples/go.sum b/examples/go.sum index 4be1a9e2f..127f5f2d0 100644 --- a/examples/go.sum +++ b/examples/go.sum @@ -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= diff --git a/go.mod b/go.mod index efdff69b5..34c28fa37 100644 --- a/go.mod +++ b/go.mod @@ -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 diff --git a/go.sum b/go.sum index 6bc2f7024..20b59e4f9 100644 --- a/go.sum +++ b/go.sum @@ -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= diff --git a/jwk/cache.go b/jwk/cache.go index b60ebd869..b36663709 100644 --- a/jwk/cache.go +++ b/jwk/cache.go @@ -7,7 +7,7 @@ import ( "net/http" "time" - "github.com/lestrrat-go/httprc" + "github.com/lestrrat-go/httprc/v2" ) type Transformer = httprc.Transformer @@ -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. diff --git a/jwk/fetch.go b/jwk/fetch.go index 808d2ba16..558e47aaf 100644 --- a/jwk/fetch.go +++ b/jwk/fetch.go @@ -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. diff --git a/jws/jws_test.go b/jws/jws_test.go index 9d1402a8c..565028b39 100644 --- a/jws/jws_test.go +++ b/jws/jws_test.go @@ -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"