From 76123f9a1aba91bce821dab3175c760e0d996b66 Mon Sep 17 00:00:00 2001 From: Ramiz Polic Date: Fri, 9 Feb 2024 12:52:03 +0100 Subject: [PATCH] feat: use proper util package --- cli/analyzer/windows/registry.go | 6 +++--- cli/utils/utils.go | 8 -------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/cli/analyzer/windows/registry.go b/cli/analyzer/windows/registry.go index 76700ebf0..ea8398250 100644 --- a/cli/analyzer/windows/registry.go +++ b/cli/analyzer/windows/registry.go @@ -25,12 +25,12 @@ import ( "strconv" "strings" + "github.com/openclarity/vmclarity/core/to" + cdx "github.com/CycloneDX/cyclonedx-go" "github.com/google/uuid" log "github.com/sirupsen/logrus" - "github.com/openclarity/vmclarity/cli/utils" - "www.velocidex.com/golang/regparser" ) @@ -177,7 +177,7 @@ func (r *Registry) GetUpdates() ([]string, error) { } } - return utils.StringKeyMapToArray(updates), nil + return to.Keys(updates), nil } // GetUsersApps returns installed apps from the registry for all users. This diff --git a/cli/utils/utils.go b/cli/utils/utils.go index 06f9ddd0c..42d81de25 100644 --- a/cli/utils/utils.go +++ b/cli/utils/utils.go @@ -115,14 +115,6 @@ func RunCommandAndParseOutputLineByLine(cmd *exec.Cmd, pfn, ecFn processFn) erro return nil } -func StringKeyMapToArray[T any](m map[string]T) []T { - ret := make([]T, 0, len(m)) - for _, t := range m { - ret = append(ret, t) - } - return ret -} - func GetVulnerabilityTotalsPerSeverity(vulnerabilities *[]apitypes.Vulnerability) *apitypes.VulnerabilityScanSummary { ret := &apitypes.VulnerabilityScanSummary{ TotalCriticalVulnerabilities: to.Ptr(0),