Simplify error handling

Gopkg.lock

@@ -5,19 +5,19 @@
   branch = "master"
   name = "github.com/dustin/go-humanize"
   packages = ["."]
-  revision = "02af3965c54e8cacf948b97fef38925c4120652c"
+  revision = "9f541cc9db5d55bce703bd99987c9d5cb8eea45e"
 
 [[projects]]
   name = "github.com/go-ini/ini"
   packages = ["."]
-  revision = "06f5f3d67269ccec1fe5fe4134ba6e982984f7f5"
-  version = "v1.37.0"
+  revision = "358ee7663966325963d4e8b2e1fbd570c5195153"
+  version = "v1.38.1"
 
 [[projects]]
   branch = "master"
   name = "github.com/mastertinner/adapters"
   packages = ["logging"]
-  revision = "9704a6fb93c903ec6e38a8420cc82d3a95668966"
+  revision = "13d009731b3accb5b099171fb329a6d6b4e82a87"
 
 [[projects]]
   name = "github.com/matryer/is"
@@ -41,8 +41,8 @@
     "pkg/s3utils",
     "pkg/set"
   ]
-  revision = "3adf3e30ef96aea8469c7aff8ef19ed38901817b"
-  version = "v6.0.4"
+  revision = "70799fe8dae6ecfb6c7d7e9e048fce27f23a1992"
+  version = "v6.0.5"
 
 [[projects]]
   branch = "master"
@@ -59,8 +59,8 @@
 [[projects]]
   name = "github.com/sirupsen/logrus"
   packages = ["."]
-  revision = "c155da19408a8799da419ed3eeb0cb5db0ad5dbc"
-  version = "v1.0.5"
+  revision = "3e01752db0189b9157070a0e1668a620f9a85da2"
+  version = "v1.0.6"
 
 [[projects]]
   branch = "master"
@@ -70,7 +70,7 @@
     "blake2b",
     "ssh/terminal"
   ]
-  revision = "a49355c7e3f8fe157a85be2f77e6e269a0f89602"
+  revision = "c126467f60eb25f8f27e5a981f32a87e3965053f"
 
 [[projects]]
   branch = "master"
@@ -79,7 +79,7 @@
     "http/httpguts",
     "idna"
   ]
-  revision = "afe8f62b1d6bbd81f31868121a50b06d8188e1f9"
+  revision = "a680a1efc54dd51c040b3b5ce4939ea3cf2ea0d1"
 
 [[projects]]
   branch = "master"
@@ -89,7 +89,7 @@
     "unix",
     "windows"
   ]
-  revision = "63fc586f45fe72d95d5240a5d5eb95e6503907d3"
+  revision = "ac767d655b305d4e9612f5f6e33120b9176c4ad4"
 
 [[projects]]
   name = "golang.org/x/text"
@@ -115,6 +115,6 @@
 [solve-meta]
   analyzer-name = "dep"
   analyzer-version = 1
-  inputs-digest = "f3d6f693907c972aed6e0bca37e46ec1714fb631b4de4cf5dab7ba20ddf06e19"
+  inputs-digest = "36142ff417913b235566aeb04f404c879ab02b36fbeffc45235cc058ee223141"
   solver-name = "gps-cdcl"
   solver-version = 1

Gopkg.toml

@@ -39,7 +39,7 @@
 
 [[constraint]]
   name = "github.com/minio/minio-go"
-  version = "6.0.4"
+  version = "6.0.5"
 
 [[constraint]]
   name = "github.com/pkg/errors"

internal/app/s3manager/bucket_view.go

@@ -22,6 +22,7 @@ func HandleBucketView(s3 S3, tmplDir string) http.HandlerFunc {
 		BucketName string
 		Objects    []objectWithIcon
 	}
+
 	return func(w http.ResponseWriter, r *http.Request) {
 		bucketName := way.Param(r.Context(), "bucketName")
 

internal/app/s3manager/bucket_view_test.go

@@ -89,7 +89,7 @@ func TestHandleBucketView(t *testing.T) {
 			listObjectsV2Func: func(string, string, bool, <-chan struct{}) <-chan minio.ObjectInfo {
 				objCh := make(chan minio.ObjectInfo)
 				go func() {
-					objCh <- minio.ObjectInfo{Err: s3manager.ErrBucketDoesNotExist}
+					objCh <- minio.ObjectInfo{Err: errors.New("The specified bucket does not exist")}
 					close(objCh)
 				}()
 				return objCh

internal/app/s3manager/create_object.go

@@ -25,7 +25,8 @@ func HandleCreateObject(s3 S3) http.HandlerFunc {
 		}
 		defer file.Close()
 
-		_, err = s3.PutObject(bucketName, handler.Filename, file, 1, minio.PutObjectOptions{ContentType: "application/octet-stream"})
+		opts := minio.PutObjectOptions{ContentType: "application/octet-stream"}
+		_, err = s3.PutObject(bucketName, handler.Filename, file, 1, opts)
 		if err != nil {
 			handleHTTPError(w, errors.Wrap(err, "error putting object"))
 			return

internal/app/s3manager/errors.go

@@ -9,27 +9,26 @@ import (
 	"github.com/pkg/errors"
 )
 
-// Errors that may be returned from an S3 client.
-var (
-	ErrBucketDoesNotExist = errors.New("The specified bucket does not exist.") // nolint: golint
-	ErrKeyDoesNotExist    = errors.New("The specified key does not exist.")    // nolint: golint
+// Error codes that may be returned from an S3 client.
+const (
+	ErrBucketDoesNotExist = "The specified bucket does not exist"
+	ErrKeyDoesNotExist    = "The specified key does not exist"
 )
 
 // handleHTTPError handles HTTP errors.
 func handleHTTPError(w http.ResponseWriter, err error) {
-	var code int
+	cause := errors.Cause(err)
+	code := http.StatusInternalServerError
 
-	switch err := errors.Cause(err).(type) {
-	case *json.SyntaxError:
+	_, ok := cause.(*json.SyntaxError)
+	if ok {
 		code = http.StatusUnprocessableEntity
-	default:
-		if err == io.EOF || err == io.ErrUnexpectedEOF {
-			code = http.StatusUnprocessableEntity
-		} else if err == ErrBucketDoesNotExist || err == ErrKeyDoesNotExist {
-			code = http.StatusNotFound
-		} else {
-			code = http.StatusInternalServerError
-		}
+	}
+	switch {
+	case cause == io.EOF || cause == io.ErrUnexpectedEOF:
+		code = http.StatusUnprocessableEntity
+	case cause.Error() == ErrBucketDoesNotExist || cause.Error() == ErrKeyDoesNotExist:
+		code = http.StatusNotFound
 	}
 
 	http.Error(w, http.StatusText(code), code)