update fleetdb when a validation is successful

metal-toolbox · Aug 30, 2024 · ce66bde · ce66bde
1 parent 27b3342
commit ce66bde
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 3 deletions.
diff --git a/internal/flipflop/handler.go b/internal/flipflop/handler.go
@@ -262,7 +262,12 @@ func (cth *ConditionTaskHandler) validateFirmware(ctx context.Context) error {
 			return cth.failedWithError(ctx, "failed to retrieve host boot status", err)
 		}
 		if booted {
-			// TODO: record successful result in fleetdb before returning
+			done := time.Now()
+			srvID := cth.task.Parameters.AssetID
+			fwID := cth.task.Parameters.ValidateFirmwareID
+			if dbErr := cth.store.ValidateFirmwareSet(ctx, srvID, fwID, done); dbErr != nil {
+				return cth.failedWithError(ctx, "marking firmware set validated", dbErr)
+			}
 			return nil
 		}
 	}

diff --git a/internal/store/fleetdb/client.go b/internal/store/fleetdb/client.go
@@ -85,8 +85,8 @@ func newFleetDBClientWithOAuthOtel(ctx context.Context, cfg *Config, logger *log
 		return nil, err
 	}
 
-	// clientID defaults to 'alloy'
-	clientID := "alloy"
+	// clientID defaults to 'flipflop'
+	clientID := "flipflop"
 
 	if cfg.OidcClientID != "" {
 		clientID = cfg.OidcClientID

diff --git a/internal/store/fleetdb/fleetdb.go b/internal/store/fleetdb/fleetdb.go
@@ -5,6 +5,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"net"
+	"time"
 
 	"github.com/google/uuid"
 	"github.com/metal-toolbox/flipflop/internal/model"
@@ -180,3 +181,8 @@ func serverAttributes(attributes []fleetdbapi.Attributes) (map[string]string, er
 
 	return sAttributes, nil
 }
+
+// ValidateFirmwareSet reaches out to FleetDB to record that this firmware set has been successfully tested.
+func (s *Store) ValidateFirmwareSet(ctx context.Context, srvID, fwID uuid.UUID, done time.Time) error {
+	return s.api.ValidateFirmwareSet(ctx, srvID, fwID, done)
+}
diff --git a/internal/store/store.go b/internal/store/store.go
@@ -2,7 +2,9 @@ package store
 
 import (
 	"context"
+	"time"
 
+	"github.com/google/uuid"
 	"github.com/metal-toolbox/flipflop/internal/model"
 	"github.com/metal-toolbox/flipflop/internal/store/fleetdb"
 	"github.com/pkg/errors"
@@ -12,6 +14,8 @@ import (
 type Repository interface {
 	// AssetByID returns asset based on the identifier.
 	AssetByID(ctx context.Context, assetID string) (*model.Asset, error)
+	// ValidateFirmwareSet marks the set as successfully tested
+	ValidateFirmwareSet(context.Context, uuid.UUID, uuid.UUID, time.Time) error
 }
 
 func NewRepository(ctx context.Context, storeKind model.StoreKind, cfg *fleetdb.Config, logger *logrus.Logger) (Repository, error) {