Skip to content

Commit

Permalink
don't use imagetag + imagehash for scanid
Browse files Browse the repository at this point in the history
Signed-off-by: Matthias Bertschy <matthias.bertschy@gmail.com>
  • Loading branch information
matthyx committed May 22, 2023
1 parent f3ef8d8 commit 98ab02f
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
5 changes: 4 additions & 1 deletion core/services/scan.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@ package services

import (
"context"
"crypto/sha256"
"errors"
"fmt"
"os"
"time"

Expand Down Expand Up @@ -280,7 +282,8 @@ func generateScanID(workload domain.ScanCommand) string {
return workload.InstanceID
}
if workload.ImageTag != "" && workload.ImageHash != "" {
return workload.ImageTag + workload.ImageHash
sum := sha256.Sum256([]byte(workload.ImageTag + workload.ImageHash))
return fmt.Sprintf("%x", sum)
}
return uuid.New().String()
}
Expand Down
2 changes: 1 addition & 1 deletion core/services/scan_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -518,7 +518,7 @@ func Test_generateScanID(t *testing.T) {
ImageHash: "sha256:6f9c1c5b5b1b2b3b4b5b6b7b8b9b0b1b2b3b4b5b6b7b8b9b0b1b2b3b4b5b6b7b",
},
},
want: "k8s.gcr.io/kube-proxy:v1.24.3sha256:6f9c1c5b5b1b2b3b4b5b6b7b8b9b0b1b2b3b4b5b6b7b8b9b0b1b2b3b4b5b6b7b",
want: "2d0ee020566e8ff66542c5cd9e324111731c6a49d237fea3bd880448dac1a37f",
},
{
name: "generate scanID with instanceID",
Expand Down

0 comments on commit 98ab02f

Please sign in to comment.