From 202fc267196e95ad57b1ec571b5f3cc1ea2040eb Mon Sep 17 00:00:00 2001 From: "Frederick F. Kautz IV" Date: Sun, 26 Apr 2015 17:02:49 -0700 Subject: [PATCH] Revert "Exporting WriteErrorResponse" This reverts commit e05d46a0b578c300fec0dbb74c385dc9e74cf3bc. --- pkg/api/api_bucket_handlers.go | 28 +++++++++++++-------------- pkg/api/api_generic_handlers.go | 2 +- pkg/api/api_object_handlers.go | 34 ++++++++++++++++----------------- pkg/api/api_response.go | 3 +-- 4 files changed, 33 insertions(+), 34 deletions(-) diff --git a/pkg/api/api_bucket_handlers.go b/pkg/api/api_bucket_handlers.go index df2834cf4..3fbba0303 100644 --- a/pkg/api/api_bucket_handlers.go +++ b/pkg/api/api_bucket_handlers.go @@ -33,12 +33,12 @@ func (server *minioAPI) isValidOp(w http.ResponseWriter, req *http.Request, acce switch iodine.ToError(err).(type) { case drivers.BucketNotFound: { - WriteErrorResponse(w, req, NoSuchBucket, acceptsContentType, req.URL.Path) + writeErrorResponse(w, req, NoSuchBucket, acceptsContentType, req.URL.Path) return false } case drivers.BucketNameInvalid: { - WriteErrorResponse(w, req, InvalidBucketName, acceptsContentType, req.URL.Path) + writeErrorResponse(w, req, InvalidBucketName, acceptsContentType, req.URL.Path) return false } case nil: @@ -68,7 +68,7 @@ func (server *minioAPI) isValidOp(w http.ResponseWriter, req *http.Request, acce func (server *minioAPI) listObjectsHandler(w http.ResponseWriter, req *http.Request) { acceptsContentType := getContentType(req) if acceptsContentType == unknownContentType { - WriteErrorResponse(w, req, NotAcceptable, acceptsContentType, req.URL.Path) + writeErrorResponse(w, req, NotAcceptable, acceptsContentType, req.URL.Path) return } // verify if bucket allows this operation @@ -98,16 +98,16 @@ func (server *minioAPI) listObjectsHandler(w http.ResponseWriter, req *http.Requ } case drivers.ObjectNotFound: { - WriteErrorResponse(w, req, NoSuchKey, acceptsContentType, req.URL.Path) + writeErrorResponse(w, req, NoSuchKey, acceptsContentType, req.URL.Path) } case drivers.ObjectNameInvalid: { - WriteErrorResponse(w, req, NoSuchKey, acceptsContentType, req.URL.Path) + writeErrorResponse(w, req, NoSuchKey, acceptsContentType, req.URL.Path) } default: { log.Error.Println(iodine.New(err, nil)) - WriteErrorResponse(w, req, InternalError, acceptsContentType, req.URL.Path) + writeErrorResponse(w, req, InternalError, acceptsContentType, req.URL.Path) } } } @@ -119,7 +119,7 @@ func (server *minioAPI) listObjectsHandler(w http.ResponseWriter, req *http.Requ func (server *minioAPI) listBucketsHandler(w http.ResponseWriter, req *http.Request) { acceptsContentType := getContentType(req) if acceptsContentType == unknownContentType { - WriteErrorResponse(w, req, NotAcceptable, acceptsContentType, req.URL.Path) + writeErrorResponse(w, req, NotAcceptable, acceptsContentType, req.URL.Path) return } @@ -139,7 +139,7 @@ func (server *minioAPI) listBucketsHandler(w http.ResponseWriter, req *http.Requ default: { log.Error.Println(iodine.New(err, nil)) - WriteErrorResponse(w, req, InternalError, acceptsContentType, req.URL.Path) + writeErrorResponse(w, req, InternalError, acceptsContentType, req.URL.Path) } } } @@ -150,14 +150,14 @@ func (server *minioAPI) listBucketsHandler(w http.ResponseWriter, req *http.Requ func (server *minioAPI) putBucketHandler(w http.ResponseWriter, req *http.Request) { acceptsContentType := getContentType(req) if acceptsContentType == unknownContentType { - WriteErrorResponse(w, req, NotAcceptable, acceptsContentType, req.URL.Path) + writeErrorResponse(w, req, NotAcceptable, acceptsContentType, req.URL.Path) return } // read from 'x-amz-acl' aclType := getACLType(req) if aclType == unsupportedACLType { - WriteErrorResponse(w, req, NotImplemented, acceptsContentType, req.URL.Path) + writeErrorResponse(w, req, NotImplemented, acceptsContentType, req.URL.Path) return } @@ -173,16 +173,16 @@ func (server *minioAPI) putBucketHandler(w http.ResponseWriter, req *http.Reques } case drivers.BucketNameInvalid: { - WriteErrorResponse(w, req, InvalidBucketName, acceptsContentType, req.URL.Path) + writeErrorResponse(w, req, InvalidBucketName, acceptsContentType, req.URL.Path) } case drivers.BucketExists: { - WriteErrorResponse(w, req, BucketAlreadyExists, acceptsContentType, req.URL.Path) + writeErrorResponse(w, req, BucketAlreadyExists, acceptsContentType, req.URL.Path) } default: { log.Error.Println(iodine.New(err, nil)) - WriteErrorResponse(w, req, InternalError, acceptsContentType, req.URL.Path) + writeErrorResponse(w, req, InternalError, acceptsContentType, req.URL.Path) } } } @@ -196,7 +196,7 @@ func (server *minioAPI) putBucketHandler(w http.ResponseWriter, req *http.Reques func (server *minioAPI) headBucketHandler(w http.ResponseWriter, req *http.Request) { acceptsContentType := getContentType(req) if acceptsContentType == unknownContentType { - WriteErrorResponse(w, req, NotAcceptable, acceptsContentType, req.URL.Path) + writeErrorResponse(w, req, NotAcceptable, acceptsContentType, req.URL.Path) return } diff --git a/pkg/api/api_generic_handlers.go b/pkg/api/api_generic_handlers.go index f4561d995..f7707cd61 100644 --- a/pkg/api/api_generic_handlers.go +++ b/pkg/api/api_generic_handlers.go @@ -58,7 +58,7 @@ func validateHandler(conf config.Config, h http.Handler) http.Handler { func (h vHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { acceptsContentType := getContentType(r) if acceptsContentType == unknownContentType { - WriteErrorResponse(w, r, NotAcceptable, acceptsContentType, r.URL.Path) + writeErrorResponse(w, r, NotAcceptable, acceptsContentType, r.URL.Path) return } // success diff --git a/pkg/api/api_object_handlers.go b/pkg/api/api_object_handlers.go index d3d23ea71..0c0900429 100644 --- a/pkg/api/api_object_handlers.go +++ b/pkg/api/api_object_handlers.go @@ -32,7 +32,7 @@ import ( func (server *minioAPI) getObjectHandler(w http.ResponseWriter, req *http.Request) { acceptsContentType := getContentType(req) if acceptsContentType == unknownContentType { - WriteErrorResponse(w, req, NotAcceptable, acceptsContentType, req.URL.Path) + writeErrorResponse(w, req, NotAcceptable, acceptsContentType, req.URL.Path) return } @@ -51,7 +51,7 @@ func (server *minioAPI) getObjectHandler(w http.ResponseWriter, req *http.Reques { httpRange, err := getRequestedRange(req, metadata.Size) if err != nil { - WriteErrorResponse(w, req, InvalidRange, acceptsContentType, req.URL.Path) + writeErrorResponse(w, req, InvalidRange, acceptsContentType, req.URL.Path) return } switch httpRange.start == 0 && httpRange.length == 0 { @@ -73,16 +73,16 @@ func (server *minioAPI) getObjectHandler(w http.ResponseWriter, req *http.Reques } case drivers.ObjectNotFound: { - WriteErrorResponse(w, req, NoSuchKey, acceptsContentType, req.URL.Path) + writeErrorResponse(w, req, NoSuchKey, acceptsContentType, req.URL.Path) } case drivers.ObjectNameInvalid: { - WriteErrorResponse(w, req, NoSuchKey, acceptsContentType, req.URL.Path) + writeErrorResponse(w, req, NoSuchKey, acceptsContentType, req.URL.Path) } default: { log.Error.Println(iodine.New(err, nil)) - WriteErrorResponse(w, req, InternalError, acceptsContentType, req.URL.Path) + writeErrorResponse(w, req, InternalError, acceptsContentType, req.URL.Path) } } } @@ -93,7 +93,7 @@ func (server *minioAPI) getObjectHandler(w http.ResponseWriter, req *http.Reques func (server *minioAPI) headObjectHandler(w http.ResponseWriter, req *http.Request) { acceptsContentType := getContentType(req) if acceptsContentType == unknownContentType { - WriteErrorResponse(w, req, NotAcceptable, acceptsContentType, req.URL.Path) + writeErrorResponse(w, req, NotAcceptable, acceptsContentType, req.URL.Path) return } @@ -115,16 +115,16 @@ func (server *minioAPI) headObjectHandler(w http.ResponseWriter, req *http.Reque } case drivers.ObjectNotFound: { - WriteErrorResponse(w, req, NoSuchKey, acceptsContentType, req.URL.Path) + writeErrorResponse(w, req, NoSuchKey, acceptsContentType, req.URL.Path) } case drivers.ObjectNameInvalid: { - WriteErrorResponse(w, req, NoSuchKey, acceptsContentType, req.URL.Path) + writeErrorResponse(w, req, NoSuchKey, acceptsContentType, req.URL.Path) } default: { log.Error.Println(iodine.New(err, nil)) - WriteErrorResponse(w, req, InternalError, acceptsContentType, req.URL.Path) + writeErrorResponse(w, req, InternalError, acceptsContentType, req.URL.Path) } } } @@ -135,7 +135,7 @@ func (server *minioAPI) headObjectHandler(w http.ResponseWriter, req *http.Reque func (server *minioAPI) putObjectHandler(w http.ResponseWriter, req *http.Request) { acceptsContentType := getContentType(req) if acceptsContentType == unknownContentType { - WriteErrorResponse(w, req, NotAcceptable, acceptsContentType, req.URL.Path) + writeErrorResponse(w, req, NotAcceptable, acceptsContentType, req.URL.Path) return } @@ -152,7 +152,7 @@ func (server *minioAPI) putObjectHandler(w http.ResponseWriter, req *http.Reques // get Content-MD5 sent by client and verify if valid md5 := req.Header.Get("Content-MD5") if !isValidMD5(md5) { - WriteErrorResponse(w, req, InvalidDigest, acceptsContentType, req.URL.Path) + writeErrorResponse(w, req, InvalidDigest, acceptsContentType, req.URL.Path) return } err := server.driver.CreateObject(bucket, object, "", md5, req.Body) @@ -163,29 +163,29 @@ func (server *minioAPI) putObjectHandler(w http.ResponseWriter, req *http.Reques w.WriteHeader(http.StatusOK) case drivers.ObjectExists: { - WriteErrorResponse(w, req, NotImplemented, acceptsContentType, req.URL.Path) + writeErrorResponse(w, req, NotImplemented, acceptsContentType, req.URL.Path) } case drivers.BadDigest: { - WriteErrorResponse(w, req, BadDigest, acceptsContentType, req.URL.Path) + writeErrorResponse(w, req, BadDigest, acceptsContentType, req.URL.Path) } case drivers.EntityTooLarge: { - WriteErrorResponse(w, req, EntityTooLarge, acceptsContentType, req.URL.Path) + writeErrorResponse(w, req, EntityTooLarge, acceptsContentType, req.URL.Path) } case drivers.InvalidDigest: { - WriteErrorResponse(w, req, InvalidDigest, acceptsContentType, req.URL.Path) + writeErrorResponse(w, req, InvalidDigest, acceptsContentType, req.URL.Path) } case drivers.ImplementationError: { log.Error.Println(err) - WriteErrorResponse(w, req, InternalError, acceptsContentType, req.URL.Path) + writeErrorResponse(w, req, InternalError, acceptsContentType, req.URL.Path) } default: { log.Error.Println(err) - WriteErrorResponse(w, req, InternalError, acceptsContentType, req.URL.Path) + writeErrorResponse(w, req, InternalError, acceptsContentType, req.URL.Path) } } } diff --git a/pkg/api/api_response.go b/pkg/api/api_response.go index f34647ac6..a7b2c9065 100644 --- a/pkg/api/api_response.go +++ b/pkg/api/api_response.go @@ -109,8 +109,7 @@ func generateObjectsListResult(bucket string, objects []drivers.ObjectMetadata, return data } -// WriteErrorResponse writes a formatted error to the user -func WriteErrorResponse(w http.ResponseWriter, req *http.Request, errorType int, acceptsContentType contentType, resource string) { +func writeErrorResponse(w http.ResponseWriter, req *http.Request, errorType int, acceptsContentType contentType, resource string) { error := getErrorCode(errorType) errorResponse := getErrorResponse(error, resource) // set headers