Add gocyclo into source build, choosing cyclomatic complexity tolerance of 15 and below

pkg/drivers/bucket_policy.go

@@ -137,6 +137,37 @@ func isValidPrincipal(principal string) bool {
 	return ok
 }
 
+func parseStatement(statement Statement) bool {
+	if len(statement.Sid) == 0 {
+		return false
+	}
+	if len(statement.Effect) == 0 {
+		return false
+	}
+	if !isValidEffect(statement.Effect) {
+		return false
+	}
+	if len(statement.Principal.AWS) == 0 {
+		return false
+	}
+	if !isValidPrincipal(statement.Principal.AWS) {
+		return false
+	}
+	if len(statement.Action) == 0 {
+		return false
+	}
+	if !isValidAction(statement.Action) && !isValidActionS3(statement.Action) {
+		return false
+	}
+	if len(statement.Resource) == 0 {
+		return false
+	}
+	if !isValidResource(statement.Resource) {
+		return false
+	}
+	return true
+}
+
 // Parsepolicy - validate request body is proper JSON and in accordance with policy standards
 func Parsepolicy(data io.Reader) (BucketPolicy, bool) {
 	var policy BucketPolicy
@@ -157,33 +188,7 @@ func Parsepolicy(data io.Reader) (BucketPolicy, bool) {
 	}
 
 	for _, statement := range policy.Statement {
-		if len(statement.Sid) == 0 {
-			goto error
-		}
-		if len(statement.Effect) == 0 {
-			goto error
-		}
-		if !isValidEffect(statement.Effect) {
-			goto error
-		}
-
-		if len(statement.Principal.AWS) == 0 {
-			goto error
-		}
-		if !isValidPrincipal(statement.Principal.AWS) {
-			goto error
-		}
-		if len(statement.Action) == 0 {
-			goto error
-		}
-		if !isValidAction(statement.Action) && !isValidActionS3(statement.Action) {
-			goto error
-		}
-		if len(statement.Resource) == 0 {
-			goto error
-		}
-
-		if !isValidResource(statement.Resource) {
+		if !parseStatement(statement) {
 			goto error
 		}
 	}

pkg/drivers/file/file_filter.go

@@ -23,6 +23,32 @@ import (
 	"github.com/minio-io/minio/pkg/drivers"
 )
 
+func (file *fileDriver) filterDelimiterPrefix(bucket, name, fname, delimitedName string, resources drivers.BucketResourcesMetadata) (drivers.ObjectMetadata, drivers.BucketResourcesMetadata, error) {
+	var err error
+	var metadata drivers.ObjectMetadata
+	switch true {
+	case name == resources.Prefix:
+		// Use resources.Prefix to filter out delimited files
+		metadata, err = file.GetObjectMetadata(bucket, name, resources.Prefix)
+		if err != nil {
+			return drivers.ObjectMetadata{}, resources, drivers.EmbedError(bucket, "", err)
+		}
+	case delimitedName == fname:
+		// Use resources.Prefix to filter out delimited files
+		metadata, err = file.GetObjectMetadata(bucket, name, resources.Prefix)
+		if err != nil {
+			return drivers.ObjectMetadata{}, resources, drivers.EmbedError(bucket, "", err)
+		}
+	case delimitedName != "":
+		if delimitedName == resources.Delimiter {
+			resources.CommonPrefixes = appendUniq(resources.CommonPrefixes, resources.Prefix+delimitedName)
+		} else {
+			resources.CommonPrefixes = appendUniq(resources.CommonPrefixes, delimitedName)
+		}
+	}
+	return metadata, resources, nil
+}
+
 // TODO handle resources.Marker
 func (file *fileDriver) filter(bucket, name string, f os.FileInfo, resources drivers.BucketResourcesMetadata) (drivers.ObjectMetadata, drivers.BucketResourcesMetadata, error) {
 	var err error
@@ -34,25 +60,9 @@ func (file *fileDriver) filter(bucket, name string, f os.FileInfo, resources dri
 		if strings.HasPrefix(name, resources.Prefix) {
 			trimmedName := strings.TrimPrefix(name, resources.Prefix)
 			delimitedName := delimiter(trimmedName, resources.Delimiter)
-			switch true {
-			case name == resources.Prefix:
-				// Use resources.Prefix to filter out delimited files
-				metadata, err = file.GetObjectMetadata(bucket, name, resources.Prefix)
-				if err != nil {
-					return drivers.ObjectMetadata{}, resources, drivers.EmbedError(bucket, "", err)
-				}
-			case delimitedName == f.Name():
-				// Use resources.Prefix to filter out delimited files
-				metadata, err = file.GetObjectMetadata(bucket, name, resources.Prefix)
-				if err != nil {
-					return drivers.ObjectMetadata{}, resources, drivers.EmbedError(bucket, "", err)
-				}
-			case delimitedName != "":
-				if delimitedName == resources.Delimiter {
-					resources.CommonPrefixes = appendUniq(resources.CommonPrefixes, resources.Prefix+delimitedName)
-				} else {
-					resources.CommonPrefixes = appendUniq(resources.CommonPrefixes, delimitedName)
-				}
+			metadata, resources, err = file.filterDelimiterPrefix(bucket, name, f.Name(), delimitedName, resources)
+			if err != nil {
+				return drivers.ObjectMetadata{}, resources, err
 			}
 		}
 	// Delimiter present and Prefix is absent

pkg/drivers/memory/memory.go

@@ -173,6 +173,23 @@ func appendUniq(slice []string, i string) []string {
 	return append(slice, i)
 }
 
+func (memory memoryDriver) filterDelimiterPrefix(keys []string, key, delimitedName string, resources drivers.BucketResourcesMetadata) (drivers.BucketResourcesMetadata, []string) {
+	switch true {
+	case key == resources.Prefix:
+		keys = appendUniq(keys, key)
+		// DelimitedName - requires resources.Prefix as it was trimmed off earlier in the flow
+	case key == resources.Prefix+delimitedName:
+		keys = appendUniq(keys, key)
+	case delimitedName != "":
+		if delimitedName == resources.Delimiter {
+			resources.CommonPrefixes = appendUniq(resources.CommonPrefixes, resources.Prefix+delimitedName)
+		} else {
+			resources.CommonPrefixes = appendUniq(resources.CommonPrefixes, delimitedName)
+		}
+	}
+	return resources, keys
+}
+
 // ListObjects - list objects from memory
 func (memory memoryDriver) ListObjects(bucket string, resources drivers.BucketResourcesMetadata) ([]drivers.ObjectMetadata, drivers.BucketResourcesMetadata, error) {
 	if _, ok := memory.bucketdata[bucket]; ok == false {
@@ -183,7 +200,7 @@ func (memory memoryDriver) ListObjects(bucket string, resources drivers.BucketRe
 	for key := range memory.objectdata {
 		switch true {
 		// Prefix absent, delimit object key based on delimiter
-		case resources.Delimiter != "" && resources.Prefix == "":
+		case resources.IsDelimiterSet():
 			delimitedName := delimiter(key, resources.Delimiter)
 			switch true {
 			case delimitedName == "" || delimitedName == key:
@@ -192,31 +209,20 @@ func (memory memoryDriver) ListObjects(bucket string, resources drivers.BucketRe
 				resources.CommonPrefixes = appendUniq(resources.CommonPrefixes, delimitedName)
 			}
 		// Prefix present, delimit object key with prefix key based on delimiter
-		case resources.Delimiter != "" && resources.Prefix != "" && strings.HasPrefix(key, resources.Prefix):
-			trimmedName := strings.TrimPrefix(key, resources.Prefix)
-			delimitedName := delimiter(trimmedName, resources.Delimiter)
-			switch true {
-			case key == resources.Prefix:
-				keys = appendUniq(keys, key)
-			// DelimitedName - requires resources.Prefix as it was trimmed off earlier in the flow
-			case key == resources.Prefix+delimitedName:
-				keys = appendUniq(keys, key)
-			case delimitedName != "":
-				if delimitedName == resources.Delimiter {
-					resources.CommonPrefixes = appendUniq(resources.CommonPrefixes, resources.Prefix+delimitedName)
-				} else {
-					resources.CommonPrefixes = appendUniq(resources.CommonPrefixes, delimitedName)
-				}
+		case resources.IsDelimiterPrefixSet():
+			if strings.HasPrefix(key, resources.Prefix) {
+				trimmedName := strings.TrimPrefix(key, resources.Prefix)
+				delimitedName := delimiter(trimmedName, resources.Delimiter)
+				resources, keys = memory.filterDelimiterPrefix(keys, key, delimitedName, resources)
 			}
 		// Prefix present, nothing to delimit
-		case resources.Delimiter == "" && resources.Prefix != "" && strings.HasPrefix(key, resources.Prefix):
+		case resources.IsPrefixSet():
 			keys = appendUniq(keys, key)
 		// Prefix and delimiter absent
-		case resources.Prefix == "" && resources.Delimiter == "":
+		case resources.IsDefault():
 			keys = appendUniq(keys, key)
 		}
 	}
-
 	sort.Strings(keys)
 	for _, key := range keys {
 		if len(results) == resources.Maxkeys {