get registry and repository from full name if missing

containerscan/commonContainerScanSummaryResultMethods.go

@@ -51,10 +51,40 @@ func (summary *CommonContainerScanSummaryResult) GetStatus() string {
 }
 
 func (summary *CommonContainerScanSummaryResult) GetRegistry() string {
-	return summary.Registry
+	if summary.Registry != "" {
+		return summary.Registry
+	}
+	if summary.ImageID != "" {
+		return getRegistryFromImageID(summary.ImageID)
+	}
+
+	if summary.ImageTag != "" {
+		return getRegistryFromImageID(summary.ImageTag)
+	}
+	return ""
+}
+
+func (summary *CommonContainerScanSummaryResult) GetRepository() string {
+	if summary.ImageID != "" {
+		return getRepositoryFromImageID(summary.ImageID)
+	}
+
+	if summary.ImageTag != "" {
+		return getRepositoryFromImageID(summary.ImageTag)
+	}
+	return ""
 }
 
 func (summary *CommonContainerScanSummaryResult) GetImageTageSuffix() string {
+	if summary.ImageTagSuffix != "" {
+		return summary.ImageTagSuffix
+	}
+	if summary.ImageID != "" {
+		return getImageTagFromImageID(summary.ImageID)
+	}
+	if summary.ImageTag != "" {
+		return getImageTagFromImageID(summary.ImageTag)
+	}
 	return summary.ImageTagSuffix
 }
 

containerscan/image_id_parsers.go

@@ -0,0 +1,72 @@
+package containerscan
+
+import (
+	"strings"
+)
+
+func getRegistryFromImageID(imageID string) string {
+	var registryAndRepo string
+	atParts := strings.Split(imageID, "@")
+
+	if len(atParts) > 1 {
+		registryAndRepo = atParts[0]
+	} else {
+		colonParts := strings.Split(imageID, ":")
+		if len(colonParts) == 0 {
+			return ""
+		}
+		registryAndRepo = colonParts[0]
+	}
+
+	registryAndRepoParts := strings.SplitN(registryAndRepo, "/", 2)
+
+	if len(registryAndRepoParts) < 2 {
+		return ""
+	}
+	if strings.Contains(registryAndRepoParts[0], ".") {
+		return registryAndRepoParts[0]
+	}
+
+	return ""
+}
+
+func getRepositoryFromImageID(imageID string) string {
+	var registryAndRepo string
+	atParts := strings.Split(imageID, "@")
+
+	if len(atParts) > 1 {
+		registryAndRepo = atParts[0]
+	} else {
+		colonParts := strings.Split(imageID, ":")
+		if len(colonParts) == 0 {
+			return ""
+		}
+		registryAndRepo = colonParts[0]
+	}
+	if !strings.Contains(registryAndRepo, ".") {
+		return registryAndRepo
+	}
+
+	registryAndRepoParts := strings.SplitN(registryAndRepo, "/", 2)
+
+	if len(registryAndRepoParts) < 2 {
+		return ""
+	}
+
+	return registryAndRepoParts[1]
+}
+
+func getImageTagFromImageID(imageID string) string {
+	parts := strings.Split(imageID, ":")
+	isHash := strings.Contains(imageID, "@")
+	if isHash {
+		parts = strings.Split(imageID, "@")
+	}
+
+	// The tag is expected to be after the last colon
+	if len(parts) > 1 {
+		return parts[len(parts)-1]
+	}
+
+	return "" // return an empty string if imageID doesn't contain a tag
+}

containerscan/image_id_parsers_test.go

@@ -0,0 +1,129 @@
+package containerscan
+
+import (
+	"testing"
+)
+
+func TestGetRegistryFromImageID(t *testing.T) {
+	tests := []struct {
+		name     string
+		imageID  string
+		expected string
+	}{
+		{
+			name:     "Valid image ID with hash",
+			imageID:  "docker.io/library/alpine@sha256:2345",
+			expected: "docker.io",
+		},
+		{
+			name:     "Valid image ID with tag",
+			imageID:  "quay.io/kubescape/gateway:v0.1.13",
+			expected: "quay.io",
+		},
+		{
+			name:     "No registry in image ID",
+			imageID:  "library/alpine@sha256:2345",
+			expected: "",
+		},
+		{
+			name:     "Empty image ID",
+			imageID:  "",
+			expected: "",
+		},
+		{
+			name:     "Image ID without hash",
+			imageID:  "my.registry.io/library/alpine",
+			expected: "my.registry.io",
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			result := getRegistryFromImageID(tt.imageID)
+			if result != tt.expected {
+				t.Errorf("got %q, want %q", result, tt.expected)
+			}
+		})
+	}
+}
+
+func TestGetRepositoryFromImageID(t *testing.T) {
+	tests := []struct {
+		name     string
+		imageID  string
+		expected string
+	}{
+		{
+			name:     "Valid image ID with hash",
+			imageID:  "docker.io/library/alpine@sha256:2345",
+			expected: "library/alpine",
+		},
+		{
+			name:     "Valid image ID with tag",
+			imageID:  "quay.io/kubescape/gateway:v0.1.13",
+			expected: "kubescape/gateway",
+		},
+		{
+			name:     "No registry in image ID",
+			imageID:  "library/alpine@sha256:2345",
+			expected: "library/alpine",
+		},
+		{
+			name:     "Empty image ID",
+			imageID:  "",
+			expected: "",
+		},
+		{
+			name:     "Image ID without hash",
+			imageID:  "my.registry.io/library/alpine",
+			expected: "library/alpine",
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			result := getRepositoryFromImageID(tt.imageID)
+			if result != tt.expected {
+				t.Errorf("got %q, want %q", result, tt.expected)
+			}
+		})
+	}
+}
+
+func TestGetImageTagFromImageID(t *testing.T) {
+	tests := []struct {
+		name     string
+		imageID  string
+		expected string
+	}{
+		{
+			name:     "Valid image ID with hash",
+			imageID:  "docker.io/library/alpine@sha256:2345",
+			expected: "sha256:2345",
+		},
+		{
+			name:     "Valid image ID with tag",
+			imageID:  "quay.io/kubescape/gateway:v0.1.13",
+			expected: "v0.1.13",
+		},
+		{
+			name:     "No tag in image ID",
+			imageID:  "docker.io/library/alpine",
+			expected: "",
+		},
+		{
+			name:     "Empty image ID",
+			imageID:  "",
+			expected: "",
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			result := getImageTagFromImageID(tt.imageID)
+			if result != tt.expected {
+				t.Errorf("got %q, want %q", result, tt.expected)
+			}
+		})
+	}
+}

containerscan/interfaces.go

@@ -39,6 +39,7 @@ type ContainerScanSummaryResult interface {
 	GetContainerName() string
 	GetStatus() string
 	GetRegistry() string
+	GetRepository() string
 	GetImageTageSuffix() string
 	GetVersion() string
 	GetCustomerGUID() string