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

return appropriate error upon tier update for incorrect credentials (#20034)

Browse Source
This commit is contained in:
Mark Theunissen 2024-07-03 17:17:20 +10:00 committed by GitHub
parent 32d04091a2
commit 88926ad8e9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/admin-handler-utils.go
View File

@ -216,6 +216,12 @@ func toAdminAPIErr(ctx context.Context, err error) APIError {
Description: err.Error(), Description: err.Error(),
HTTPStatusCode: http.StatusBadRequest, HTTPStatusCode: http.StatusBadRequest,
} }
case errors.Is(err, errTierInvalidConfig):
apiErr = APIError{
Code: "XMinioAdminTierInvalidConfig",
Description: err.Error(),
HTTPStatusCode: http.StatusBadRequest,
}
default: default:
apiErr = errorCodes.ToAPIErrWithErr(toAdminAPIErrCode(ctx, err), err) apiErr = errorCodes.ToAPIErrWithErr(toAdminAPIErrCode(ctx, err), err)
} }

6
cmd/tier.go
View File

@ -64,6 +64,12 @@ var (
Message: "Specified remote backend is not empty", Message: "Specified remote backend is not empty",
StatusCode: http.StatusBadRequest, StatusCode: http.StatusBadRequest,
} }
errTierInvalidConfig = AdminError{
Code: "XMinioAdminTierInvalidConfig",
Message: "Unable to setup remote tier, check tier configuration",
StatusCode: http.StatusBadRequest,
}
) )
const ( const (

3
cmd/warm-backend.go
View File

@ -144,7 +144,8 @@ func newWarmBackend(ctx context.Context, tier madmin.TierConfig, probe bool) (d
return nil, errTierTypeUnsupported return nil, errTierTypeUnsupported
} }
if err != nil { if err != nil {
return nil, errTierTypeUnsupported tierLogIf(ctx, err)
return nil, errTierInvalidConfig
} }
if probe { if probe {