MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2024-12-24 06:05:55 -05:00
Code Issues Packages Projects Releases Wiki Activity

Revert "s3: Put bucket tagging to return an error when bucket is not found (#13232)"

Browse Source 
This reverts commit 91567ba916.

Revert because the error was incorrectly converted, there are
callers that rely on errConfigNotFound and it also took away
the migration code.

Instead the correct fix is PutBucketTaggingHandler() which
is already added.
This commit is contained in:
Harshavardhana 2021-09-22 20:06:17 -07:00
parent c25b482301
commit f9b104f37b
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/api-errors.go
View File

@ -1794,8 +1794,6 @@ func toAPIErrorCode(ctx context.Context, err error) (apiErr APIErrorCode) {
} }
switch err { switch err {
case errVolumeNotFound:
apiErr = ErrNoSuchBucket
case errInvalidArgument: case errInvalidArgument:
apiErr = ErrAdminInvalidArgument apiErr = ErrAdminInvalidArgument
case errNoSuchUser: case errNoSuchUser:

5
cmd/bucket-metadata.go
View File

@ -123,9 +123,6 @@ func (b *BucketMetadata) Load(ctx context.Context, api ObjectLayer, name string)
configFile := path.Join(bucketConfigPrefix, name, bucketMetadataFile) configFile := path.Join(bucketConfigPrefix, name, bucketMetadataFile)
data, err := readConfig(ctx, api, configFile) data, err := readConfig(ctx, api, configFile)
if err != nil { if err != nil {
if err == errConfigNotFound {
err = errVolumeNotFound
}
return err return err
} }
if len(data) <= 4 { if len(data) <= 4 {
@ -152,7 +149,7 @@ func (b *BucketMetadata) Load(ctx context.Context, api ObjectLayer, name string)
func loadBucketMetadata(ctx context.Context, objectAPI ObjectLayer, bucket string) (BucketMetadata, error) { func loadBucketMetadata(ctx context.Context, objectAPI ObjectLayer, bucket string) (BucketMetadata, error) {
b := newBucketMetadata(bucket) b := newBucketMetadata(bucket)
err := b.Load(ctx, objectAPI, b.Name) err := b.Load(ctx, objectAPI, b.Name)
if err != nil { if err != nil && !errors.Is(err, errConfigNotFound) {
return b, err return b, err
} }