Skip to content

fix(image): avoid repeating registryURL in image.GetFullNameWithoutTag and GetFullNameWithTag func #1310

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 31, 2025
Merged

fix(image): avoid repeating registryURL in image.GetFullNameWithoutTag and GetFullNameWithTag func #1310

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions registry-scanner/pkg/image/image.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,9 @@ func (img *ContainerImage) String() string {
func (img *ContainerImage) GetFullNameWithoutTag() string {
str := ""
if img.RegistryURL != "" {
str += img.RegistryURL + "/"
if !strings.HasPrefix(img.ImageName, img.RegistryURL+"/") {
str += img.RegistryURL + "/"
}
}
str += img.ImageName
return str
Expand All @@ -91,7 +93,9 @@ func (img *ContainerImage) GetFullNameWithoutTag() string {
func (img *ContainerImage) GetFullNameWithTag() string {
str := ""
if img.RegistryURL != "" {
str += img.RegistryURL + "/"
if !strings.HasPrefix(img.ImageName, img.RegistryURL+"/") {
str += img.RegistryURL + "/"
}
}
str += img.ImageName
if img.ImageTag != nil {
Expand Down
7 changes: 7 additions & 0 deletions registry-scanner/pkg/image/image_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,13 @@ func Test_ParseImageTags(t *testing.T) {
assert.Equal(t, "0.1", image.ImageTag.TagName)
assert.Equal(t, "docker.io/jannfis/test-image:0.1", image.GetFullNameWithTag())
assert.Equal(t, "docker.io/jannfis/test-image", image.GetFullNameWithoutTag())

// if the image name starts with registryURL, GetFullNameWithoutTag and GetFullNameWithTag
// should return the correct full image name without repeating registryURL.
// Wrong full image name: docker.io/docker.io/jannfis/test-image
image.ImageName = "docker.io/jannfis/test-image"
assert.Equal(t, "docker.io/jannfis/test-image:0.1", image.GetFullNameWithTag())
assert.Equal(t, "docker.io/jannfis/test-image", image.GetFullNameWithoutTag())
})

t.Run("Parse valid image name with digest tag", func(t *testing.T) {
Expand Down