From fb13d1fcb35074507ce6c98767e3bde1e78db8f2 Mon Sep 17 00:00:00 2001
From: Evgeniy Kulikov <kim@nspcc.ru>
Date: Thu, 20 Aug 2020 02:33:43 +0300
Subject: [PATCH] Move ListObjects and ListBuckets in same file

Signed-off-by: Evgeniy Kulikov <kim@nspcc.ru>
---
 api/handler/list-buckets.go              | 73 ------------------------
 api/handler/{list-objects.go => list.go} | 71 +++++++++++++++++++++--
 2 files changed, 67 insertions(+), 77 deletions(-)
 delete mode 100644 api/handler/list-buckets.go
 rename api/handler/{list-objects.go => list.go} (64%)

diff --git a/api/handler/list-buckets.go b/api/handler/list-buckets.go
deleted file mode 100644
index 2002ec27..00000000
--- a/api/handler/list-buckets.go
+++ /dev/null
@@ -1,73 +0,0 @@
-package handler
-
-import (
-	"net/http"
-	"time"
-
-	"github.com/nspcc-dev/neofs-s3-gate/api"
-	"github.com/nspcc-dev/neofs-s3-gate/auth"
-	"go.uber.org/zap"
-)
-
-func (h *handler) ListBucketsHandler(w http.ResponseWriter, r *http.Request) {
-	var (
-		res *ListBucketsResponse
-		rid = api.GetRequestID(r.Context())
-	)
-
-	tkn, err := auth.GetBearerToken(r.Context())
-	if err != nil {
-		h.log.Error("something went wrong",
-			zap.String("request_id", rid),
-			zap.Error(err))
-
-		api.WriteErrorResponse(r.Context(), w, api.Error{
-			Code:           api.GetAPIError(api.ErrInternalError).Code,
-			Description:    err.Error(),
-			HTTPStatusCode: http.StatusInternalServerError,
-		}, r.URL)
-
-		return
-	}
-
-	list, err := h.obj.ListBuckets(r.Context())
-	if err != nil {
-		h.log.Error("something went wrong",
-			zap.String("request_id", rid),
-			zap.Error(err))
-
-		api.WriteErrorResponse(r.Context(), w, api.Error{
-			Code:           api.GetAPIError(api.ErrInternalError).Code,
-			Description:    err.Error(),
-			HTTPStatusCode: http.StatusInternalServerError,
-		}, r.URL)
-
-		return
-	}
-
-	res = &ListBucketsResponse{
-		Owner: Owner{
-			ID:          tkn.OwnerID.String(),
-			DisplayName: tkn.OwnerID.String(),
-		},
-	}
-
-	for _, item := range list {
-		res.Buckets.Buckets = append(res.Buckets.Buckets, Bucket{
-			Name:         item.Name,
-			CreationDate: item.Created.Format(time.RFC3339),
-		})
-	}
-
-	if err = api.EncodeToResponse(w, res); err != nil {
-		h.log.Error("something went wrong",
-			zap.String("request_id", rid),
-			zap.Error(err))
-
-		api.WriteErrorResponse(r.Context(), w, api.Error{
-			Code:           api.GetAPIError(api.ErrInternalError).Code,
-			Description:    err.Error(),
-			HTTPStatusCode: http.StatusInternalServerError,
-		}, r.URL)
-	}
-}
diff --git a/api/handler/list-objects.go b/api/handler/list.go
similarity index 64%
rename from api/handler/list-objects.go
rename to api/handler/list.go
index 241151b7..78b8b4a0 100644
--- a/api/handler/list-objects.go
+++ b/api/handler/list.go
@@ -5,9 +5,9 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/gorilla/mux"
 	"github.com/nspcc-dev/neofs-s3-gate/api"
 	"github.com/nspcc-dev/neofs-s3-gate/api/layer"
+	"github.com/nspcc-dev/neofs-s3-gate/auth"
 	"go.uber.org/zap"
 )
 
@@ -23,6 +23,69 @@ type listObjectsArgs struct {
 
 var maxObjectList = 10000 // Limit number of objects in a listObjectsResponse/listObjectsVersionsResponse.
 
+func (h *handler) ListBucketsHandler(w http.ResponseWriter, r *http.Request) {
+	var (
+		res *ListBucketsResponse
+		rid = api.GetRequestID(r.Context())
+	)
+
+	tkn, err := auth.GetBearerToken(r.Context())
+	if err != nil {
+		h.log.Error("something went wrong",
+			zap.String("request_id", rid),
+			zap.Error(err))
+
+		api.WriteErrorResponse(r.Context(), w, api.Error{
+			Code:           api.GetAPIError(api.ErrInternalError).Code,
+			Description:    err.Error(),
+			HTTPStatusCode: http.StatusInternalServerError,
+		}, r.URL)
+
+		return
+	}
+
+	list, err := h.obj.ListBuckets(r.Context())
+	if err != nil {
+		h.log.Error("something went wrong",
+			zap.String("request_id", rid),
+			zap.Error(err))
+
+		api.WriteErrorResponse(r.Context(), w, api.Error{
+			Code:           api.GetAPIError(api.ErrInternalError).Code,
+			Description:    err.Error(),
+			HTTPStatusCode: http.StatusInternalServerError,
+		}, r.URL)
+
+		return
+	}
+
+	res = &ListBucketsResponse{
+		Owner: Owner{
+			ID:          tkn.OwnerID.String(),
+			DisplayName: tkn.OwnerID.String(),
+		},
+	}
+
+	for _, item := range list {
+		res.Buckets.Buckets = append(res.Buckets.Buckets, Bucket{
+			Name:         item.Name,
+			CreationDate: item.Created.Format(time.RFC3339),
+		})
+	}
+
+	if err = api.EncodeToResponse(w, res); err != nil {
+		h.log.Error("something went wrong",
+			zap.String("request_id", rid),
+			zap.Error(err))
+
+		api.WriteErrorResponse(r.Context(), w, api.Error{
+			Code:           api.GetAPIError(api.ErrInternalError).Code,
+			Description:    err.Error(),
+			HTTPStatusCode: http.StatusInternalServerError,
+		}, r.URL)
+	}
+}
+
 func (h *handler) ListObjectsV1Handler(w http.ResponseWriter, r *http.Request) {
 	var (
 		err error
@@ -104,9 +167,9 @@ func (h *handler) ListObjectsV1Handler(w http.ResponseWriter, r *http.Request) {
 			zap.Error(err))
 
 		api.WriteErrorResponse(r.Context(), w, api.Error{
-			Code:           "XNeoFSUnimplemented",
-			Description:    "implement me " + mux.CurrentRoute(r).GetName(),
-			HTTPStatusCode: http.StatusNotImplemented,
+			Code:           api.GetAPIError(api.ErrInternalError).Code,
+			Description:    err.Error(),
+			HTTPStatusCode: http.StatusInternalServerError,
 		}, r.URL)
 	}
 }