From 948e90b95aa71a635fe5933e6e4a01823db6ac86 Mon Sep 17 00:00:00 2001 From: Mara Sophie Grosch Date: Fri, 11 Nov 2022 12:03:18 +0100 Subject: [feature] S3: add config flag to proxy S3 media (#1014) * S3: add config value "proxy" for not redirecting Signed-off-by: Mara Sophie Grosch * S3: document new config value "proxy" * S3: add new config value "proxy" to test scripts Signed-off-by: Mara Sophie Grosch --- internal/storage/s3.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'internal/storage/s3.go') diff --git a/internal/storage/s3.go b/internal/storage/s3.go index ee51bea89..1b191f675 100644 --- a/internal/storage/s3.go +++ b/internal/storage/s3.go @@ -34,12 +34,14 @@ import ( type S3 struct { mc *minio.Client bucket string + proxy bool } -func NewS3(mc *minio.Client, bucket string) *S3 { +func NewS3(mc *minio.Client, bucket string, proxy bool) *S3 { return &S3{ mc: mc, bucket: bucket, + proxy: proxy, } } @@ -83,6 +85,10 @@ func (s *S3) Delete(ctx context.Context, key string) error { } func (s *S3) URL(ctx context.Context, key string) *url.URL { + if s.proxy { + return nil + } + // it's safe to ignore the error here, as we just fall back to fetching the // file if the url request fails url, _ := s.mc.PresignedGetObject(ctx, s.bucket, key, time.Hour, url.Values{ -- cgit v1.2.3