WIP

internal/factsengine/gatherers/_todo/packageversion.go → internal/factsengine/gatherers/packageversion.go

@@ -3,28 +3,29 @@ package gatherers
 import (
 	log "github.com/sirupsen/logrus"
 	"github.com/trento-project/agent/internal/factsengine/entities"
+	"github.com/trento-project/agent/internal/utils"
 )
 
 const (
 	PackageVersionGathererName = "package_version"
 )
 
 type PackageVersionGatherer struct {
-	executor CommandExecutor
+	executor utils.CommandExecutor
 }
 
 func NewDefaultPackageVersionGatherer() *PackageVersionGatherer {
-	return NewPackageVersionGatherer(Executor{})
+	return NewPackageVersionGatherer(utils.Executor{})
 }
 
-func NewPackageVersionGatherer(executor CommandExecutor) *PackageVersionGatherer {
+func NewPackageVersionGatherer(executor utils.CommandExecutor) *PackageVersionGatherer {
 	return &PackageVersionGatherer{
 		executor: executor,
 	}
 }
 
-func (g *PackageVersionGatherer) Gather(factsRequests []entities.FactRequest) ([]entities.FactsGatheredItem, error) {
-	facts := []entities.FactsGatheredItem{}
+func (g *PackageVersionGatherer) Gather(factsRequests []entities.FactRequest) ([]entities.Fact, error) {
+	facts := []entities.Fact{}
 	log.Infof("Starting Package versions facts gathering process")
 
 	for _, factReq := range factsRequests {
@@ -34,7 +35,8 @@ func (g *PackageVersionGatherer) Gather(factsRequests []entities.FactRequest) ([
 			// TODO: Decide together with Wanda how to deal with errors. `err` field in the fact result?
 			log.Errorf("Error getting version of package: %s", factReq.Argument)
 		}
-		fact := entities.NewFactGatheredWithRequest(factReq, string(version))
+
+		fact := entities.NewFactGatheredWithRequest(factReq, entities.ParseStringToFactValue(string(version)))
 		facts = append(facts, fact)
 	}