Skip to content

Commit e18f86e

Browse files
committed
review
1 parent 7163d8a commit e18f86e

File tree

4 files changed

+13
-13
lines changed

4 files changed

+13
-13
lines changed

handler/aws.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package handler
33
import (
44
"io"
55
"path/filepath"
6-
"strconv"
76
"time"
87

98
"github.com/gofiber/fiber/v2"
@@ -66,17 +65,17 @@ func (a awsHandler) BucketExists(c *fiber.Ctx) error {
6665
bucketName := c.Params("bucket")
6766
exists := a.awsService.BucketExists(bucketName)
6867
if !exists {
69-
return service.Response(c, fiber.StatusNotFound, false, "not found", strconv.FormatBool(exists))
68+
return service.Response(c, fiber.StatusNotFound, false, "bucket not found", nil)
7069
}
71-
return service.Response(c, fiber.StatusFound, true, "found", strconv.FormatBool(exists))
70+
return service.Response(c, fiber.StatusOK, true, "bucket exists", nil)
7271
}
7372

7473
func (a awsHandler) BucketList(c *fiber.Ctx) error {
7574
buckets, err := a.awsService.ListBuckets()
7675
if err != nil {
7776
return service.Response(c, fiber.StatusOK, false, err.Error(), buckets)
7877
}
79-
return service.Response(c, fiber.StatusOK, true, "buckets", buckets)
78+
return service.Response(c, fiber.StatusOK, true, "buckets listed", buckets)
8079
}
8180

8281
func (a awsHandler) GlacierVaultList(c *fiber.Ctx) error {

handler/health.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ func (h *HealthChecker) HealthCheck(c *fiber.Ctx) error {
4141
statusCode = fiber.StatusServiceUnavailable
4242
}
4343

44-
status := map[string]any{
44+
data := map[string]any{
4545
"status": overallStatus,
4646
"services": map[string]any{
4747
"minio": minioHealth,
@@ -51,7 +51,7 @@ func (h *HealthChecker) HealthCheck(c *fiber.Ctx) error {
5151
"timestamp": time.Now().UTC(),
5252
}
5353

54-
return service.Response(c, statusCode, true, "Health check", status)
54+
return service.Response(c, statusCode, true, "Health check", data)
5555
}
5656

5757
func (h *HealthChecker) checkMinioHealth(ctx context.Context) string {

handler/minio.go

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package handler
22

33
import (
44
"context"
5-
"strconv"
65

76
"github.com/gofiber/fiber/v2"
87
"github.com/minio/minio-go/v7"
@@ -29,16 +28,19 @@ func (m minioHandler) BucketList(c *fiber.Ctx) error {
2928
if err != nil {
3029
return service.Response(c, fiber.StatusOK, false, err.Error(), buckets)
3130
}
32-
return service.Response(c, fiber.StatusOK, true, "buckets", buckets)
31+
return service.Response(c, fiber.StatusOK, true, "buckets listed", buckets)
3332
}
3433

3534
func (m minioHandler) BucketExists(c *fiber.Ctx) error {
3635
bucketName := c.Params("bucket")
3736
exists, err := m.minioClient.BucketExists(context.Background(), bucketName)
3837
if err != nil {
39-
return service.Response(c, fiber.StatusNotFound, false, err.Error(), strconv.FormatBool(exists))
38+
return service.Response(c, fiber.StatusNotFound, false, err.Error(), nil)
4039
}
41-
return service.Response(c, fiber.StatusFound, true, "success", strconv.FormatBool(exists))
40+
if !exists {
41+
return service.Response(c, fiber.StatusNotFound, false, "bucket not found", nil)
42+
}
43+
return service.Response(c, fiber.StatusOK, true, "bucket exists", nil)
4244
}
4345

4446
func (m minioHandler) CreateBucket(c *fiber.Ctx) error {
@@ -47,7 +49,7 @@ func (m minioHandler) CreateBucket(c *fiber.Ctx) error {
4749
if err != nil {
4850
return service.Response(c, fiber.StatusOK, false, err.Error(), bucketName)
4951
}
50-
return service.Response(c, fiber.StatusCreated, true, "success", bucketName)
52+
return service.Response(c, fiber.StatusCreated, true, "bucket created", bucketName)
5153
}
5254

5355
func (m minioHandler) RemoveBucket(c *fiber.Ctx) error {
@@ -56,5 +58,5 @@ func (m minioHandler) RemoveBucket(c *fiber.Ctx) error {
5658
if err != nil {
5759
return service.Response(c, fiber.StatusOK, false, err.Error(), bucketName)
5860
}
59-
return service.Response(c, fiber.StatusOK, true, "success", bucketName)
61+
return service.Response(c, fiber.StatusOK, true, "bucket deleted", bucketName)
6062
}

public/scalar.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1182,4 +1182,3 @@ paths:
11821182
downloadType: "minio"
11831183
'404':
11841184
description: Download job not found
1185-

0 commit comments

Comments
 (0)