feat: use fiber handler utils in existing handlers + add payload validation

Author: Swop

internal/server/handlers/acquire.go

@@ -1,29 +1,41 @@
 package handlers
 
 import (
-	"fmt"
 	"github.com/ankorstore/gh-action-mq-lease-service/internal/lease"
+	"github.com/go-playground/validator/v10"
 	"github.com/gofiber/fiber/v2"
-	"github.com/rs/zerolog/log"
 )
 
-func Acquire(orchestrator lease.LeaseProviderOrchestrator) func(c *fiber.Ctx) error {
+func Acquire(orchestrator lease.ProviderOrchestrator) func(c *fiber.Ctx) error {
+	type acquireRequest struct {
+		HeadSHA  string `json:"head_sha" validate:"required,min=1"`
+		Priority int    `json:"priority" validate:"required,number,min=1"`
+	}
+
+	validate := validator.New()
+
 	return func(c *fiber.Ctx) error {
-		leaseRequest := &lease.LeaseRequest{}
-
-		if err := c.BodyParser(leaseRequest); err != nil {
-			errMsg := "Error when parsing acquire request body"
-			log.Error().Err(err).Msg(errMsg)
-			return c.Status(fiber.StatusUnprocessableEntity).JSON(fiber.Map{
-				"error": errMsg,
-			})
+		provider, fiberErr := getLeaseProviderOrFail(c, orchestrator)
+		if provider == nil {
+			return fiberErr
 		}
 
-		fmt.Println(leaseRequest)
+		input := new(acquireRequest)
+		if ok, err := parseBodyOrFail(c, input); !ok {
+			return err
+		}
+		if ok, err := validateInputOrFail(c, validate, input); !ok {
+			return err
+		}
+
+		leaseRequest := &lease.Request{
+			HeadSHA:  input.HeadSHA,
+			Priority: input.Priority,
+		}
 
-		leaseRequestResponse, err := orchestrator.Get(c.Params("owner"), c.Params("repo"), c.Params("baseRef")).Acquire(leaseRequest)
+		leaseRequestResponse, err := provider.Acquire(c.UserContext(), leaseRequest)
 		if err != nil {
-			return c.SendStatus(fiber.StatusConflict)
+			return apiError(c, fiber.StatusConflict, "Couldn't acquire the lock", err.Error())
 		}
 
 		return c.Status(fiber.StatusOK).JSON(leaseRequestResponse)

internal/server/handlers/provider_details.go

@@ -5,9 +5,12 @@ import (
 	"github.com/gofiber/fiber/v2"
 )
 
-func ProviderDetails(orchestrator lease.LeaseProviderOrchestrator) func(c *fiber.Ctx) error {
+func ProviderDetails(orchestrator lease.ProviderOrchestrator) func(c *fiber.Ctx) error {
 	return func(c *fiber.Ctx) error {
-		provider := orchestrator.Get(c.Params("owner"), c.Params("repo"), c.Params("baseRef"))
+		provider, fiberErr := getLeaseProviderOrFail(c, orchestrator)
+		if provider == nil {
+			return fiberErr
+		}
 		return c.Status(fiber.StatusOK).JSON(provider.GetKnown())
 	}
 }

internal/server/handlers/provider_list.go

@@ -0,0 +1,16 @@
+package handlers
+
+import (
+	"github.com/ankorstore/gh-action-mq-lease-service/internal/lease"
+	"github.com/gofiber/fiber/v2"
+)
+
+func ProviderList(orchestrator lease.ProviderOrchestrator) func(c *fiber.Ctx) error {
+	return func(c *fiber.Ctx) error {
+		list := fiber.Map{}
+		for id, provider := range orchestrator.GetAll() {
+			list[id] = provider.GetKnown()
+		}
+		return c.Status(fiber.StatusOK).JSON(list)
+	}
+}

internal/server/handlers/release.go

@@ -2,27 +2,41 @@ package handlers
 
 import (
 	"github.com/ankorstore/gh-action-mq-lease-service/internal/lease"
+	"github.com/go-playground/validator/v10"
 	"github.com/gofiber/fiber/v2"
-	"github.com/rs/zerolog/log"
 )
 
-func Release(orchestrator lease.LeaseProviderOrchestrator) func(c *fiber.Ctx) error {
+func Release(orchestrator lease.ProviderOrchestrator) func(c *fiber.Ctx) error {
+	type releaseRequest struct {
+		HeadSHA  string `json:"head_sha" validate:"required,min=1"`
+		Priority int    `json:"priority" validate:"required,number,min=1"`
+		Status   string `json:"status" validate:"required,oneof=success failure"`
+	}
+
+	validate := validator.New()
+
 	return func(c *fiber.Ctx) error {
-		leaseRequest := &lease.LeaseRequest{}
+		provider, fiberErr := getLeaseProviderOrFail(c, orchestrator)
+		if provider == nil {
+			return fiberErr
+		}
 
-		if err := c.BodyParser(leaseRequest); err != nil {
-			errMsg := "Error when parsing acquire request body"
-			log.Error().Err(err).Msg(errMsg)
-			return c.Status(fiber.StatusUnprocessableEntity).JSON(fiber.Map{
-				"error": errMsg,
-			})
+		input := new(releaseRequest)
+		if ok, err := parseBodyOrFail(c, input); !ok {
+			return err
+		}
+		if ok, err := validateInputOrFail(c, validate, input); !ok {
+			return err
+		}
+		leaseRequest := &lease.Request{
+			HeadSHA:  input.HeadSHA,
+			Priority: input.Priority,
+			Status:   &input.Status,
 		}
 
-		leaseRequestResponse, err := orchestrator.Get(c.Params("owner"), c.Params("repo"), c.Params("baseRef")).Release(leaseRequest)
+		leaseRequestResponse, err := provider.Release(c.UserContext(), leaseRequest)
 		if err != nil {
-			return c.Status(fiber.StatusBadRequest).JSON(fiber.Map{
-				"error": err.Error(),
-			})
+			return apiError(c, fiber.StatusBadRequest, "Couldn't release the lock", err.Error())
 		}
 
 		return c.Status(fiber.StatusOK).JSON(leaseRequestResponse)