From 53ee6aef0885b4055ef95bf4f20ee78fd381e333 Mon Sep 17 00:00:00 2001 From: kim <89579420+NyaaaWhatsUpDoc@users.noreply.github.com> Date: Thu, 26 Sep 2024 12:43:10 +0000 Subject: [bugfix] s3 media uploaded without content-type (#3353) * update go-storage dependency, for S3Storage manually call PutObject() so we can set content-type * update calls to PutFile() to include the contentType --- vendor/codeberg.org/gruf/go-storage/s3/errors.go | 26 ------------------------ 1 file changed, 26 deletions(-) (limited to 'vendor/codeberg.org/gruf/go-storage/s3/errors.go') diff --git a/vendor/codeberg.org/gruf/go-storage/s3/errors.go b/vendor/codeberg.org/gruf/go-storage/s3/errors.go index 2cbdd2e9d..1f4404469 100644 --- a/vendor/codeberg.org/gruf/go-storage/s3/errors.go +++ b/vendor/codeberg.org/gruf/go-storage/s3/errors.go @@ -3,35 +3,9 @@ package s3 import ( "strings" - "codeberg.org/gruf/go-storage" - "codeberg.org/gruf/go-storage/internal" "github.com/minio/minio-go/v7" ) -// transformS3Error transforms an error returned from S3Storage underlying -// minio.Core client, by wrapping where necessary with our own error types. -func transformS3Error(err error) error { - // Cast this to a minio error response - ersp, ok := err.(minio.ErrorResponse) - if ok { - switch ersp.Code { - case "NoSuchKey": - return internal.WrapErr(err, storage.ErrNotFound) - case "Conflict": - return internal.WrapErr(err, storage.ErrAlreadyExists) - default: - return err - } - } - - // Check if error has an invalid object name prefix - if strings.HasPrefix(err.Error(), "Object name ") { - return internal.WrapErr(err, storage.ErrInvalidKey) - } - - return err -} - func isNotFoundError(err error) bool { errRsp, ok := err.(minio.ErrorResponse) return ok && errRsp.Code == "NoSuchKey" -- cgit v1.2.3