Skip to content

convertMinioError: stop shadowing minio error with os.ErrNotExist #31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 30, 2023
Merged

convertMinioError: stop shadowing minio error with os.ErrNotExist #31

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
08403e0
convertMinioError: stop shadowing minio error with os.ErrNotFound
ahouene Mar 21, 2023
ffe639e
convertMinioError: wrap only one err, differentiate call from doList
ahouene Mar 21, 2023
f360115
convertMinioError: keep more readable `err` variable instead of `e`
ahouene Mar 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions backends/s3/s3.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ func (b *Backend) doList(ctx context.Context, prefix string) (simpleblob.BlobLis
})
for obj := range objCh {
// Handle error returned by MinIO client
if err := convertMinioError(obj.Err); err != nil {
if err := convertMinioError(obj.Err, true); err != nil {
metricCallErrors.WithLabelValues("list").Inc()
return nil, err
}
Expand Down Expand Up @@ -207,14 +207,14 @@ func (b *Backend) Load(ctx context.Context, name string) ([]byte, error) {
metricLastCallTimestamp.WithLabelValues("load").SetToCurrentTime()

obj, err := b.client.GetObject(ctx, b.opt.Bucket, name, minio.GetObjectOptions{})
if err = convertMinioError(err); err != nil {
if err = convertMinioError(err, false); err != nil {
return nil, err
} else if obj == nil {
return nil, os.ErrNotExist
}

p, err := io.ReadAll(obj)
if err = convertMinioError(err); err != nil {
if err = convertMinioError(err, false); err != nil {
return nil, err
}
return p, nil
Expand Down Expand Up @@ -263,7 +263,7 @@ func (b *Backend) doDelete(ctx context.Context, name string) error {
metricLastCallTimestamp.WithLabelValues("delete").SetToCurrentTime()

err := b.client.RemoveObject(ctx, b.opt.Bucket, name, minio.RemoveObjectOptions{})
if err = convertMinioError(err); err != nil {
if err = convertMinioError(err, false); err != nil {
metricCallErrors.WithLabelValues("delete").Inc()
}
return err
Expand Down Expand Up @@ -366,7 +366,7 @@ func New(ctx context.Context, opt Options) (*Backend, error) {

err := client.MakeBucket(ctx, opt.Bucket, minio.MakeBucketOptions{Region: opt.Region})
if err != nil {
if err := convertMinioError(err); err != nil {
if err := convertMinioError(err, false); err != nil {
return nil, err
}
}
Expand All @@ -386,18 +386,18 @@ func New(ctx context.Context, opt Options) (*Backend, error) {
// and turns it into a well known error when possible.
// If error is not well known, it is returned as is.
// If error is considered to be ignorable, nil is returned.
func convertMinioError(err error) error {
func convertMinioError(err error, isList bool) error {
if err == nil {
return nil
}
errResp := minio.ToErrorResponse(err)
if errResp.StatusCode == 404 {
return os.ErrNotExist
errRes := minio.ToErrorResponse(err)
if !isList && errRes.StatusCode == 404 {
return fmt.Errorf("%w: %s", os.ErrNotExist, err.Error())
}
if errResp.Code != "BucketAlreadyOwnedByYou" {
return err
if errRes.Code == "BucketAlreadyOwnedByYou" {
return nil
}
return nil
return err
}

// prependGlobalPrefix prepends the GlobalPrefix to the name/prefix
Expand Down