Store summary cr objects (#141)

* store workload name in the summary object Signed-off-by: rcohencyberarmor <rcohen@armosec.io> * change error Signed-off-by: rcohencyberarmor <rcohen@armosec.io> * get name from instance id Signed-off-by: rcohencyberarmor <rcohen@armosec.io> * should return err Signed-off-by: rcohencyberarmor <rcohen@armosec.io> * add to test desired input Signed-off-by: rcohencyberarmor <rcohen@armosec.io> --------- Signed-off-by: rcohencyberarmor <rcohen@armosec.io> Co-authored-by: rcohencyberarmor <rcohen@armosec.io>
kubescape · Aug 17, 2023 · 5b7b4da · 5b7b4da
1 parent 50b17cb
commit 5b7b4da
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 10 deletions.
diff --git a/repositories/apiserver.go b/repositories/apiserver.go
@@ -314,7 +314,11 @@ func getCVESummaryK8sResourceName(ctx context.Context) (string, error) {
 	if !ok {
 		return "", domain.ErrCastingWorkload
 	}
-	return workload.ImageSlug, nil
+	instanceID, err := instanceidhandler.GenerateInstanceIDFromString(workload.InstanceID)
+	if err != nil {
+		return "", err
+	}
+	return instanceID.GetSlug()
 }
 
 func (a *APIServerStore) storeCVESummary(ctx context.Context, cve domain.CVEManifest, withRelevancy bool) error {

diff --git a/repositories/apiserver_test.go b/repositories/apiserver_test.go
@@ -112,7 +112,7 @@ func TestAPIServerStore_GetCVE(t *testing.T) {
 	}
 	workload := domain.ScanCommand{
 		ImageHash:     "sha256:ead0a4a53df89fd173874b46093b6e62d8c72967bbf606d672c9e8c9b601a4fc",
-		InstanceID:    "",
+		InstanceID:    "apiVersion-apps/v1/namespace-kubescape/kind-ReplicaSet/name-kubevuln-65bfbfdcdd/containerName-kubevuln",
 		Wlid:          "wlid://cluster-aaa/namespace-anyNamespaceJob/job-anyJob",
 		ImageTag:      "registry.k8s.io/coredns/coredns:v1.10.1",
 		ContainerName: "anyJobContName",
@@ -147,7 +147,7 @@ func TestAPIServerStore_UpdateCVE(t *testing.T) {
 	}
 	workload := domain.ScanCommand{
 		ImageHash:     "sha256:ead0a4a53df89fd173874b46093b6e62d8c72967bbf606d672c9e8c9b601a4fc",
-		InstanceID:    "",
+		InstanceID:    "apiVersion-apps/v1/namespace-kubescape/kind-ReplicaSet/name-kubevuln-65bfbfdcdd/containerName-kubevuln",
 		Wlid:          "wlid://cluster-aaa/namespace-anyNamespaceJob/job-anyJob",
 		ImageTag:      "registry.k8s.io/coredns/coredns:v1.10.1",
 		ContainerName: "anyJobContName",
@@ -592,36 +592,43 @@ func TestAPIServerStore_enrichSummaryManifestObjectAnnotations(t *testing.T) {
 func TestAPIServerStore_getCVESummaryK8sResourceName(t *testing.T) {
 	tests := []struct {
 		workload domain.ScanCommand
+		expRes   string
 	}{
 		{
 			workload: domain.ScanCommand{
-				ImageSlug: "default-replicaset-nginx-77b4fdf86c-6e03-a89e",
+				InstanceID: "apiVersion-apps/v1/namespace-default/kind-ReplicaSet/name-nginx-77b4fdf86c/containerName-nginx",
 			},
+			expRes: "default-replicaset-nginx-77b4fdf86c-6e03-a89e",
 		},
 		{
 			workload: domain.ScanCommand{
-				ImageSlug: "kubescape-replicaset-gateway-66967b649-495e-df93",
+				InstanceID: "apiVersion-apps/v1/namespace-kubescape/kind-ReplicaSet/name-otel-collector-76bb986488/containerName-otel-collector",
 			},
+			expRes: "kubescape-replicaset-otel-collector-76bb986488-6d83-cca3",
 		},
 		{
 			workload: domain.ScanCommand{
-				ImageSlug: "kubescape-replicaset-kubescape-5d4bf4589c-7b8d-5074",
+				InstanceID: "apiVersion-apps/v1/namespace-kubescape/kind-ReplicaSet/name-gateway-66967b649/containerName-gateway",
 			},
+			expRes: "kubescape-replicaset-gateway-66967b649-495e-df93",
 		},
 		{
 			workload: domain.ScanCommand{
-				ImageSlug: "kubescape-replicaset-kubevuln-988fd7dbd-468f-8953",
+				InstanceID: "apiVersion-apps/v1/namespace-kubescape/kind-StatefulSet/name-kollector/containerName-kollector",
 			},
+			expRes: "kubescape-statefulset-kollector-c1be-77d8",
 		},
 		{
 			workload: domain.ScanCommand{
-				ImageSlug: "kubescape-replicaset-operator-647f75985c-ff5d-6454",
+				InstanceID: "apiVersion-apps/v1/namespace-kubescape/kind-ReplicaSet/name-kubescape-5d4bf4589c/containerName-kubescape",
 			},
+			expRes: "kubescape-replicaset-kubescape-5d4bf4589c-7b8d-5074",
 		},
 		{
 			workload: domain.ScanCommand{
-				ImageSlug: "kubescape-replicaset-storage-5ff864df8f-fc62-4b1c",
+				InstanceID: "apiVersion-apps/v1/namespace-kubescape/kind-ReplicaSet/name-kubevuln-65bfbfdcdd/containerName-kubevuln",
 			},
+			expRes: "kubescape-replicaset-kubevuln-65bfbfdcdd-9730-b4bb",
 		},
 	}
 
@@ -638,7 +645,7 @@ func TestAPIServerStore_getCVESummaryK8sResourceName(t *testing.T) {
 		ctx := context.WithValue(context.Background(), domain.WorkloadKey{}, tests[i].workload)
 		name, err := getCVESummaryK8sResourceName(ctx)
 		assert.Equal(t, err, nil)
-		assert.Equal(t, tests[i].workload.ImageSlug, name)
+		assert.Equal(t, tests[i].expRes, name)
 	}
 
 	for i := range testsErrorCases {