compare components

Author: Alva8756

internal/fleetdb/fleetdb.go

@@ -5,17 +5,18 @@ import (
 	"fmt"
 
 	"github.com/google/uuid"
-	"github.com/metal-toolbox/alloy/types"
 	"github.com/metal-toolbox/component-inventory/internal/app"
 	"github.com/metal-toolbox/component-inventory/internal/inventoryconverter"
 	fleetdb "github.com/metal-toolbox/fleetdb/pkg/api/v1"
+	rivets "github.com/metal-toolbox/rivets/types"
 	"go.uber.org/zap"
 )
 
 type Client interface {
 	GetServer(context.Context, uuid.UUID) (*fleetdb.Server, *fleetdb.ServerResponse, error)
 	GetComponents(context.Context, uuid.UUID, *fleetdb.PaginationParams) (fleetdb.ServerComponentSlice, *fleetdb.ServerResponse, error)
-	UpdateServerInventory(context.Context, *fleetdb.Server, *types.InventoryDevice, *zap.Logger, bool) error
+	UpdateServerInventory(context.Context, *fleetdb.Server, *rivets.Server, *zap.Logger, bool) error
+	GetInventoryConverter() *inventoryconverter.InventoryConverter
 }
 
 // Creates a new Client, with reasonable defaults
@@ -59,17 +60,14 @@ func (fc fleetDBClient) GetComponents(ctx context.Context, id uuid.UUID, params
 	return fc.client.GetComponents(ctx, id, params)
 }
 
-func (fc fleetDBClient) UpdateServerInventory(ctx context.Context, server *fleetdb.Server, dev *types.InventoryDevice, log *zap.Logger, inband bool) error {
-	log.Info("update server inventory", zap.String("server", server.Name))
-	rivetsServer, err := fc.inventoryConverterInstance.ToRivetsServer(server.UUID.String(), server.FacilityCode, dev.Inv, dev.BiosCfg)
-	if err != nil {
-		log.Error("convert inventory fail", zap.String("server", server.Name), zap.String("err", err.Error()))
-		return err
-	}
-	_, err = fc.client.SetServerInventory(ctx, server.UUID, rivetsServer, inband)
-	if err != nil {
+func (fc fleetDBClient) UpdateServerInventory(ctx context.Context, server *fleetdb.Server, rivetsServer *rivets.Server, log *zap.Logger, inband bool) error {
+	if _, err := fc.client.SetServerInventory(ctx, server.UUID, rivetsServer, inband); err != nil {
 		log.Error("set inventory fail", zap.String("server", server.Name), zap.String("err", err.Error()))
 		return err
 	}
 	return nil
 }
+
+func (fc fleetDBClient) GetInventoryConverter() *inventoryconverter.InventoryConverter {
+	return fc.inventoryConverterInstance
+}

pkg/api/routes/components.go

@@ -2,6 +2,7 @@ package routes
 
 import (
 	"context"
+	"strings"
 	"time"
 
 	"github.com/google/uuid"
@@ -14,6 +15,15 @@ import (
 
 var fleetDBTimeout = 3 * time.Minute
 
+type cmpResult int
+
+const (
+	NOT_FOUND cmpResult = iota
+	ERROR_FETCH
+	GAP
+	SAME
+)
+
 // this is a map of "component_type_name" to the actual inventory data for each component
 type serverComponents map[string][]*rivets.Component
 
@@ -47,3 +57,44 @@ func fetchServerComponents(client internalfleetdb.Client, srvid uuid.UUID, l *za
 	}
 	return comps, nil
 }
+
+func verifyComponent(c internalfleetdb.Client, server *fleetdb.Server, dev *rivets.Server, log *zap.Logger) cmpResult {
+	fleetComponentsMap, err := fetchServerComponents(c, server.UUID, log)
+	if err != nil {
+		if strings.Contains(err.Error(), "404") {
+			// The server doesn't have components, we can create it.
+			return NOT_FOUND
+		}
+		return ERROR_FETCH
+	}
+
+	alloyComponentsMap := make(map[string][]*rivets.Component)
+	for _, component := range dev.Components {
+		slug := component.Name
+		if _, ok := alloyComponentsMap[slug]; !ok {
+			alloyComponentsMap[slug] = make([]*rivets.Component, 0)
+		}
+		alloyComponentsMap[slug] = append(alloyComponentsMap[slug], component)
+	}
+
+	var diff strings.Builder
+	for slug, fleetComponents := range fleetComponentsMap {
+		if alloyComponents, ok := alloyComponentsMap[slug]; ok {
+			compareComponents(fleetComponents, alloyComponents, &diff)
+			continue
+		}
+		// diff.WriteString("-", fleetComponents)
+	}
+
+	for slug, alloyComponents := range alloyComponentsMap {
+		if _, ok := alloyComponentsMap[slug]; ok {
+			continue
+		}
+		// diff.WriteString("+", fleetComponents)
+	}
+
+	return SAME
+}
+
+func compareComponents(src []*rivets.Component, tgt []*rivets.Component, diff *strings.Builder) {
+}

pkg/api/routes/inventory.go

@@ -3,7 +3,6 @@ package routes
 import (
 	"context"
 	"fmt"
-	"strings"
 
 	"github.com/metal-toolbox/alloy/types"
 	internalfleetdb "github.com/metal-toolbox/component-inventory/internal/fleetdb"
@@ -13,33 +12,29 @@ import (
 
 func processInband(ctx context.Context, c internalfleetdb.Client, server *fleetdb.Server, dev *types.InventoryDevice, log *zap.Logger) error { //nolint
 	log.Info("processing", zap.String("server", server.Name), zap.String("device", dev.Inv.Serial))
-	if err := verifyComponent(c, server, dev, log); err != nil {
+	rivetsServer, err := c.GetInventoryConverter().ToRivetsServer(server.UUID.String(), server.FacilityCode, dev.Inv, dev.BiosCfg)
+	if err != nil {
+		log.Error("convert inventory fail", zap.String("server", server.Name), zap.String("err", err.Error()))
 		return err
 	}
-	return c.UpdateServerInventory(ctx, server, dev, log, true)
+
+	if cmp := verifyComponent(c, server, rivetsServer, log); cmp == SAME || cmp == ERROR_FETCH {
+		log.Error("verify component", zap.String("server", server.Name), zap.String("err", cmp))
+		return fmt.Errorf("failed to verify components %v", cmp)
+	}
+	return c.UpdateServerInventory(ctx, server, rivetsServer, log, true)
 }
 
 func processOutofband(ctx context.Context, c internalfleetdb.Client, server *fleetdb.Server, dev *types.InventoryDevice, log *zap.Logger) error { //nolint
 	log.Info("processing", zap.String("server", server.Name), zap.String("device", dev.Inv.Serial))
-	if err := verifyComponent(c, server, dev, log); err != nil {
-		log.Error("verify component", zap.String("server", server.Name), zap.String("err", err.Error()))
+	rivetsServer, err := c.GetInventoryConverter().ToRivetsServer(server.UUID.String(), server.FacilityCode, dev.Inv, dev.BiosCfg)
+	if err != nil {
+		log.Error("convert inventory fail", zap.String("server", server.Name), zap.String("err", err.Error()))
 		return err
 	}
-	return c.UpdateServerInventory(ctx, server, dev, log, false)
-}
-
-func verifyComponent(c internalfleetdb.Client, server *fleetdb.Server, dev *types.InventoryDevice, log *zap.Logger) error {
-	components, err := fetchServerComponents(c, server.UUID, log)
-	if err != nil {
-		if strings.Contains(err.Error(), "404") {
-			// The server doesn't have components, we can create it.
-			return nil
-		}
+	if cmp := verifyComponent(c, server, rivetsServer, log); cmp == SAME || cmp == ERROR_FETCH {
+		log.Error("verify component", zap.String("server", server.Name), zap.String("err", cmp))
 		return err
 	}
-	return isBadComponents(components, dev)
-}
-
-func isBadComponents(_ serverComponents, _ *types.InventoryDevice) error {
-	return fmt.Errorf("unimplement")
+	return c.UpdateServerInventory(ctx, server, rivetsServer, log, false)
 }

pkg/api/routes/routes.go

@@ -225,7 +225,7 @@ func composeInventoryHandler(theApp *app.App, fn inventoryHandler) gin.HandlerFu
 		}
 
 		if dev.Inv == nil {
-			reject(ctx, http.StatusBadRequest, "empty inventory")
+			reject(ctx, http.StatusBadRequest, "empty inventory", "")
 			return
 		}