use reference.Parse to parse imageID

Signed-off-by: Matthias Bertschy <matthias.bertschy@gmail.com>
kubescape · Aug 7, 2023 · b854b27 · b854b27
1 parent ed5a4ae
commit b854b27
Showing 1 changed file with 11 additions and 4 deletions.
diff --git a/internal/tools/tools.go b/internal/tools/tools.go
@@ -48,10 +48,17 @@ func sanitize(s string) string {
 // Each label is sanitized and verified to be a valid DNS1123 label.
 func LabelsFromImageID(imageID string) map[string]string {
 	labels := map[string]string{}
-	match := reference.ReferenceRegexp.FindStringSubmatch(imageID)
-	labels[instanceidhandler.ImageIDMetadataKey] = sanitize(match[0])
-	labels[instanceidhandler.ImageNameMetadataKey] = sanitize(match[1])
-	labels[instanceidhandler.ImageTagMetadataKey] = sanitize(match[2])
+	ref, err := reference.Parse(imageID)
+	if err != nil {
+		return labels
+	}
+	if named, ok := ref.(reference.Named); ok {
+		labels[instanceidhandler.ImageIDMetadataKey] = sanitize(named.String())
+		labels[instanceidhandler.ImageNameMetadataKey] = sanitize(named.Name())
+	}
+	if tagged, ok := ref.(reference.Tagged); ok {
+		labels[instanceidhandler.ImageTagMetadataKey] = sanitize(tagged.Tag())
+	}
 	// prune invalid labels
 	for key, value := range labels {
 		if errs := validation.IsDNS1123Label(value); len(errs) != 0 {