diff --git a/cmd/http/main.go b/cmd/http/main.go index 27e27ce..537b7af 100644 --- a/cmd/http/main.go +++ b/cmd/http/main.go @@ -14,7 +14,7 @@ import ( "github.com/kubescape/go-logger" "github.com/kubescape/go-logger/helpers" "github.com/kubescape/kubevuln/adapters" - "github.com/kubescape/kubevuln/adapters/v1" + v1 "github.com/kubescape/kubevuln/adapters/v1" "github.com/kubescape/kubevuln/config" "github.com/kubescape/kubevuln/controllers" "github.com/kubescape/kubevuln/core/ports" diff --git a/go.mod b/go.mod index b8f1528..fc8703e 100644 --- a/go.mod +++ b/go.mod @@ -24,7 +24,7 @@ require ( github.com/hashicorp/go-multierror v1.1.1 github.com/kinbiko/jsonassert v1.1.1 github.com/kubescape/go-logger v0.0.11 - github.com/kubescape/k8s-interface v0.0.120 + github.com/kubescape/k8s-interface v0.0.121 github.com/kubescape/storage v0.2.0 github.com/spdx/tools-golang v0.5.0-rc1 github.com/spf13/viper v1.15.0 diff --git a/go.sum b/go.sum index 6921fd7..21bd225 100644 --- a/go.sum +++ b/go.sum @@ -677,8 +677,8 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/kubescape/go-logger v0.0.11 h1:oucpq2S7+DT7O+UclG5IrmHado/tj6+IkYf9czVk/aY= github.com/kubescape/go-logger v0.0.11/go.mod h1:yGiKBJ2lhq/kxzY/MVYDREL9fLV3RGD6gv+UFjslaew= -github.com/kubescape/k8s-interface v0.0.120 h1:05ZFcKH364gS8CGdQpQNiJglKzAc8EdnvhOK0v4/PnA= -github.com/kubescape/k8s-interface v0.0.120/go.mod h1:ENpA9SkkS6E3PIT+AaMu/JGkuyE04aUamY+a7WLqsJQ= +github.com/kubescape/k8s-interface v0.0.121 h1:nk9NDuVPo4lWcVU7WDvJCfH6ZM4dE9gTNSr4gZHA6V4= +github.com/kubescape/k8s-interface v0.0.121/go.mod h1:ENpA9SkkS6E3PIT+AaMu/JGkuyE04aUamY+a7WLqsJQ= github.com/kubescape/storage v0.2.0 h1:WZXy4Dyjf5ltEMtk0SOD9RFL1haS9ffFPGfs1gUV1aM= github.com/kubescape/storage v0.2.0/go.mod h1:sPE749pFNoxoskBn6JTpNQyguF2rv/u2kYqzRd3MvXw= github.com/leodido/go-urn v1.2.1 h1:BqpAaACuzVSgi/VLzGZIobT2z4v53pjosyNd9Yv6n/w= @@ -942,6 +942,8 @@ github.com/wagoodman/go-progress v0.0.0-20230301185719-21920a456ad5/go.mod h1:jL github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 h1:nIPpBwaJSVYIxUFsDv3M8ofmx9yWTog9BfvIu0q41lo= github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8/go.mod h1:HUYIGzjTL3rfEspMxjDjgmT5uz5wzYJKVo23qUhYTos= github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778 h1:QldyIu/L63oPpyvQmHgvgickp1Yw510KJOqX7H24mg8= +github.com/xyproto/randomstring v1.0.5 h1:YtlWPoRdgMu3NZtP45drfy1GKoojuR7hmRcnhZqKjWU= +github.com/xyproto/randomstring v1.0.5/go.mod h1:rgmS5DeNXLivK7YprL0pY+lTuhNQW3iGxZ18UQApw/E= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= diff --git a/repositories/apiserver.go b/repositories/apiserver.go index 45ed8fe..61b8250 100644 --- a/repositories/apiserver.go +++ b/repositories/apiserver.go @@ -11,6 +11,7 @@ import ( "github.com/kubescape/go-logger" "github.com/kubescape/go-logger/helpers" "github.com/kubescape/k8s-interface/instanceidhandler/v1" + v1 "github.com/kubescape/k8s-interface/instanceidhandler/v1" "github.com/kubescape/kubevuln/core/domain" "github.com/kubescape/kubevuln/core/ports" "github.com/kubescape/storage/pkg/apis/softwarecomposition/v1beta1" @@ -106,6 +107,16 @@ func (a *APIServerStore) StoreCVE(ctx context.Context, cve domain.CVEManifest, w logger.L().Debug("skipping storing CVE manifest with empty ID", helpers.String("relevant", strconv.FormatBool(withRelevancy))) return nil } + if cve.Labels == nil { + cve.Labels = make(map[string]string) + } + + if withRelevancy { + cve.Labels[v1.ContextMetadataKey] = v1.ContextMetadataKeyFiltered + } else { + cve.Labels[v1.ContextMetadataKey] = v1.ContextMetadataKeyNonFiltered + } + name := hashFromImageID(cve.ID) manifest := v1beta1.VulnerabilityManifest{ ObjectMeta: metav1.ObjectMeta{