Merge pull request #39 from kubescape/add-instanceID-to-labels

Add instance id to labels

pkg/sbom/v1/sbom_spdx_storage_format.go

@@ -6,6 +6,7 @@ import (
 	"sync"
 
 	wlid "github.com/armosec/utils-k8s-go/wlid"
+	"github.com/kubescape/k8s-interface/k8sinterface"
 	spdxv1beta1 "github.com/kubescape/storage/pkg/apis/softwarecomposition/v1beta1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
@@ -22,6 +23,7 @@ const (
 	namespaceLabelKey         = "kubescape.io/workload-namespace"
 	kindLabelKey              = "kubescape.io/workload-kind"
 	nameLabelKey              = "kubescape.io/workload-name"
+	apiGroupLabelKey          = "kubescape.io/workload-api-group"
 	apiVersionLabelKey        = "kubescape.io/workload-api-version"
 	resourceVersionLabelKey   = "kubescape.io/workload-resource-version"
 	containerNameLabelKey     = "kubescape.io/workload-container-name"
@@ -137,11 +139,15 @@ func (sbom *SBOMData) StoreFilteredSBOMName(name string) {
 }
 
 func (sbom *SBOMData) StoreMetadata(wlidData, instanceID string) {
+	apiVersion := utils.Between(instanceID, "apiVersion-", "/namespace-")
+	group, version := k8sinterface.SplitApiVersion(apiVersion)
+
 	metadataLabel := map[string]string{
 		namespaceLabelKey:       wlid.GetNamespaceFromWlid(wlidData),
 		kindLabelKey:            wlid.GetKindFromWlid(wlidData),
 		nameLabelKey:            wlid.GetNameFromWlid(wlidData),
-		apiVersionLabelKey:      utils.Between(instanceID, "apiVersion-", "/namespace-"),
+		apiGroupLabelKey:        group,
+		apiVersionLabelKey:      version,
 		resourceVersionLabelKey: utils.Between(instanceID, "/resourceVersion-", "/containerName-"),
 		containerNameLabelKey:   utils.After(instanceID, "/containerName-"),
 	}