handle uptime report correctly

Author: sameh-farouk

node-registrar/client/node.go

@@ -254,7 +254,9 @@ func (c *RegistrarClient) registerNode(
 	}{}
 
 	err = json.NewDecoder(resp.Body).Decode(&result)
-
+	if err != nil {
+		return 0, errors.Wrap(err, "failed to decode response body")
+	}
 	c.nodeID = result.NodeID
 	return result.NodeID, err
 }

node-registrar/client/node_test.go

@@ -99,8 +99,8 @@ func TestUpdateNode(t *testing.T) {
 		request = updateNodeSendUptimeReport
 
 		report := UptimeReport{
-			Uptime:    40 * time.Minute,
-			Timestamp: time.Now(),
+			Uptime:    40 * 60,
+			Timestamp: time.Now().Unix(),
 		}
 		err = c.ReportUptime(report)
 		require.NoError(err)

node-registrar/client/types.go

@@ -36,8 +36,8 @@ type Node struct {
 }
 
 type UptimeReport struct {
-	Uptime    time.Duration `json:"uptime"`
-	Timestamp time.Time     `json:"timestamp"`
+	Uptime    uint64 `json:"uptime"`    // in seconds
+	Timestamp int64  `json:"timestamp"` // in seconds since epoch
 }
 
 type ZosVersion struct {

node-registrar/pkg/db/farms.go

@@ -1,6 +1,8 @@
 package db
 
 import (
+	"strings"
+
 	"github.com/pkg/errors"
 	"gorm.io/gorm"
 )
@@ -41,9 +43,10 @@ func (db *Database) GetFarm(farmID uint64) (farm Farm, err error) {
 
 func (db *Database) CreateFarm(farm Farm) (uint64, error) {
 	if err := db.gormDB.Create(&farm).Error; err != nil {
-		if errors.Is(err, gorm.ErrDuplicatedKey) {
+		if strings.Contains(err.Error(), "duplicate key value") {
 			return 0, ErrRecordAlreadyExists
 		}
+		return 0, err
 	}
 
 	return farm.FarmID, nil

node-registrar/pkg/server/handlers.go

@@ -423,7 +423,7 @@ func (s *Server) updateNodeHandler(c *gin.Context) {
 
 type UptimeReportRequest struct {
 	Uptime    uint64 `json:"uptime" binding:"required"`
-	Timestamp uint64 `json:"timestamp" binding:"required"`
+	Timestamp int64  `json:"timestamp" binding:"required"`
 }
 
 // @Summary Report node uptime
@@ -473,7 +473,8 @@ func (s *Server) uptimeReportHandler(c *gin.Context) {
 	// Ensuring the timestamp_hint is within an Acceptable Range
 	err = validateTimestampHint(req.Timestamp)
 	if err != nil {
-		c.JSON(http.StatusBadRequest, gin.H{"error": "Invalid timestamp hint"})
+		// include the error message
+		c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
 		return
 	}
 
@@ -807,8 +808,8 @@ func ensureOwner(c *gin.Context, twinID uint64) {
 }
 
 // Helper function to validate timestamp hint
-func validateTimestampHint(timestampHint uint64) error {
-	hintTime := time.Unix(int64(timestampHint), 0)
+func validateTimestampHint(timestampHint int64) error {
+	hintTime := time.Unix(timestampHint, 0)
 
 	now := time.Now()
 
@@ -819,7 +820,7 @@ func validateTimestampHint(timestampHint uint64) error {
 
 	// Check if the hint is within the acceptable range
 	if hintTime.Before(earliestAllowed) || hintTime.After(latestAllowed) {
-		return errors.New("InvalidTimestampHint")
+		return fmt.Errorf("invalid timestamp hint: must be within ±%d seconds of the current time (%s)", UptimeReportTimestampHintDrift, now)
 	}
 
 	return nil