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

Remove redundant mgmtQueryKey type. (#10557)

Browse Source 
Remove redundant type conversion.
This commit is contained in:
飞雪无情 2020-09-24 23:40:21 +08:00 committed by GitHub
parent df08fd1f03
commit d778d034e7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
cmd/admin-handlers.go
View File

@ -54,12 +54,9 @@ const (
maxEConfigJSONSize = 262272 maxEConfigJSONSize = 262272
) )
// Type-safe query params.
type mgmtQueryKey string
// Only valid query params for mgmt admin APIs. // Only valid query params for mgmt admin APIs.
const ( const (
mgmtBucket mgmtQueryKey = "bucket" mgmtBucket = "bucket"
mgmtPrefix = "prefix" mgmtPrefix = "prefix"
mgmtClientToken = "clientToken" mgmtClientToken = "clientToken"
mgmtForceStart = "forceStart" mgmtForceStart = "forceStart"
@ -572,8 +569,8 @@ type healInitParams struct {
// extractHealInitParams - Validates params for heal init API. // extractHealInitParams - Validates params for heal init API.
func extractHealInitParams(vars map[string]string, qParms url.Values, r io.Reader) (hip healInitParams, err APIErrorCode) { func extractHealInitParams(vars map[string]string, qParms url.Values, r io.Reader) (hip healInitParams, err APIErrorCode) {
hip.bucket = vars[string(mgmtBucket)] hip.bucket = vars[mgmtBucket]
hip.objPrefix = vars[string(mgmtPrefix)] hip.objPrefix = vars[mgmtPrefix]
if hip.bucket == "" { if hip.bucket == "" {
if hip.objPrefix != "" { if hip.objPrefix != "" {
@ -592,13 +589,13 @@ func extractHealInitParams(vars map[string]string, qParms url.Values, r io.Reade
return return
} }
if len(qParms[string(mgmtClientToken)]) > 0 { if len(qParms[mgmtClientToken]) > 0 {
hip.clientToken = qParms[string(mgmtClientToken)][0] hip.clientToken = qParms[mgmtClientToken][0]
} }
if _, ok := qParms[string(mgmtForceStart)]; ok { if _, ok := qParms[mgmtForceStart]; ok {
hip.forceStart = true hip.forceStart = true
} }
if _, ok := qParms[string(mgmtForceStop)]; ok { if _, ok := qParms[mgmtForceStop]; ok {
hip.forceStop = true hip.forceStop = true
} }

12
cmd/admin-handlers_test.go
View File

@ -327,13 +327,13 @@ func TestExtractHealInitParams(t *testing.T) {
mkParams := func(clientToken string, forceStart, forceStop bool) url.Values { mkParams := func(clientToken string, forceStart, forceStop bool) url.Values {
v := url.Values{} v := url.Values{}
if clientToken != "" { if clientToken != "" {
v.Add(string(mgmtClientToken), clientToken) v.Add(mgmtClientToken, clientToken)
} }
if forceStart { if forceStart {
v.Add(string(mgmtForceStart), "") v.Add(mgmtForceStart, "")
} }
if forceStop { if forceStop {
v.Add(string(mgmtForceStop), "") v.Add(mgmtForceStop, "")
} }
return v return v
} }
@ -351,11 +351,11 @@ func TestExtractHealInitParams(t *testing.T) {
} }
varsArr := []map[string]string{ varsArr := []map[string]string{
// Invalid cases // Invalid cases
{string(mgmtPrefix): "objprefix"}, {mgmtPrefix: "objprefix"},
// Valid cases // Valid cases
{}, {},
{string(mgmtBucket): "bucket"}, {mgmtBucket: "bucket"},
{string(mgmtBucket): "bucket", string(mgmtPrefix): "objprefix"}, {mgmtBucket: "bucket", mgmtPrefix: "objprefix"},
} }
// Body is always valid - we do not test JSON decoding. // Body is always valid - we do not test JSON decoding.