fix(s3config): Accept S3 URL as url escaped.

Fixes: #1607 Introduced this type in another PR grafana/dskit#265
grafana · Feb 7, 2023 · 0012f89 · 0012f89
1 parent 9920a27
commit 0012f89
Show file tree

Hide file tree

Showing 7 changed files with 98 additions and 5 deletions.
diff --git a/go.mod b/go.mod
@@ -48,7 +48,7 @@ require (
 	github.com/gorilla/mux v1.8.0
 	github.com/gorilla/websocket v1.5.0
 	github.com/grafana/cloudflare-go v0.0.0-20230110200409-c627cf6792f2
-	github.com/grafana/dskit v0.0.0-20230201083518-528d8a7d52f2
+	github.com/grafana/dskit v0.0.0-20230207212244-6b8c28bc192e
 	github.com/grafana/go-gelf/v2 v2.0.1
 	github.com/grafana/gomemcache v0.0.0-20230105173749-11f792309e1f
 	github.com/grafana/regexp v0.0.0-20221122212121-6b5c0a4cb7fd

diff --git a/go.sum b/go.sum
@@ -742,6 +742,8 @@ github.com/grafana/cloudflare-go v0.0.0-20230110200409-c627cf6792f2 h1:qhugDMdQ4
 github.com/grafana/cloudflare-go v0.0.0-20230110200409-c627cf6792f2/go.mod h1:w/aiO1POVIeXUQyl0VQSZjl5OAGDTL5aX+4v0RA1tcw=
 github.com/grafana/dskit v0.0.0-20230201083518-528d8a7d52f2 h1:IOks+FXJ6iO/pfbaVEf4efNw+YzYBYNCkCabyrbkFTM=
 github.com/grafana/dskit v0.0.0-20230201083518-528d8a7d52f2/go.mod h1:zj+5BNZAVmQafV583uLTAOzRr963KPdEm4d6NPmtbwg=
+github.com/grafana/dskit v0.0.0-20230207212244-6b8c28bc192e h1:TTyqiatfJ0z/uUZQzpQoymc0pz5ypBnJiGY0fHXkFgw=
+github.com/grafana/dskit v0.0.0-20230207212244-6b8c28bc192e/go.mod h1:ulYLLoSd71AWIjxgifLO86Lndx82Yj+IcV+fFnh8tkI=
 github.com/grafana/go-gelf/v2 v2.0.1 h1:BOChP0h/jLeD+7F9mL7tq10xVkDG15he3T1zHuQaWak=
 github.com/grafana/go-gelf/v2 v2.0.1/go.mod h1:lexHie0xzYGwCgiRGcvZ723bSNyNI8ZRD4s0CLobh90=
 github.com/grafana/gocql v0.0.0-20200605141915-ba5dc39ece85 h1:xLuzPoOzdfNb/RF/IENCw+oLVdZB4G21VPhkHBgwSHY=

diff --git a/pkg/storage/chunk/client/aws/s3_storage_client.go b/pkg/storage/chunk/client/aws/s3_storage_client.go
@@ -63,7 +63,7 @@ func init() {
 
 // S3Config specifies config for storing chunks on AWS S3.
 type S3Config struct {
-	S3               flagext.URLValue
+	S3               flagext.URLEscaped
 	S3ForcePathStyle bool
 
 	BucketNames      string

diff --git a/vendor/github.com/grafana/dskit/flagext/urlescaped.go b/vendor/github.com/grafana/dskit/flagext/urlescaped.go
diff --git a/vendor/github.com/grafana/dskit/kv/consul/client.go b/vendor/github.com/grafana/dskit/kv/consul/client.go
diff --git a/vendor/github.com/grafana/dskit/modules/modules.go b/vendor/github.com/grafana/dskit/modules/modules.go
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -681,7 +681,7 @@ github.com/gorilla/websocket
 # github.com/grafana/cloudflare-go v0.0.0-20230110200409-c627cf6792f2
 ## explicit; go 1.17
 github.com/grafana/cloudflare-go
-# github.com/grafana/dskit v0.0.0-20230201083518-528d8a7d52f2
+# github.com/grafana/dskit v0.0.0-20230207212244-6b8c28bc192e
 ## explicit; go 1.18
 github.com/grafana/dskit/backoff
 github.com/grafana/dskit/concurrency