opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-23 02:18:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove no longer used imageParts.assemble()

Browse Source 
Should not change behavior.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
This commit is contained in:
Miloslav Trmač
2019-01-09 21:11:32 +01:00
parent 633501b1b7
commit e5c764ec3c
2 changed files with 2 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
libpod/image/parts.go
View File

@ -1,7 +1,6 @@
package image
import (
"fmt"
"strings"
"github.com/containers/image/docker/reference"
@ -93,13 +92,3 @@ func (ip *imageParts) referenceWithRegistry(registry string) (reference.Named, e
}
return ref, nil
}
// assemble concatenates an image's parts into a string
func (ip *imageParts) assemble() string {
spec := fmt.Sprintf("%s:%s", ip.name, ip.tag)
if ip.registry != "" {
spec = fmt.Sprintf("%s/%s", ip.registry, spec)
}
return spec
}

15
libpod/image/parts_test.go
View File

@ -14,43 +14,33 @@ func TestDecompose(t *testing.T) {
input string
registry, name, tag string
isTagged, hasRegistry bool
assembled string
}{
{"#", "", "", "", false, false, ""}, // Entirely invalid input
{"#", "", "", "", false, false}, // Entirely invalid input
{ // Fully qualified docker.io, name-only input
"docker.io/library/busybox", "docker.io", "library/busybox", "latest", false, true,
"docker.io/library/busybox:latest",
},
{ // Fully qualified example.com, name-only input
"example.com/ns/busybox", "example.com", "ns/busybox", "latest", false, true,
"example.com/ns/busybox:latest",
},
{ // Unqualified single-name input
"busybox", "", "busybox", "latest", false, false,
"busybox:latest",
},
{ // Unqualified namespaced input
"ns/busybox", "", "ns/busybox", "latest", false, false,
"ns/busybox:latest",
},
{ // name:tag
"example.com/ns/busybox:notlatest", "example.com", "ns/busybox", "notlatest", true, true,
"example.com/ns/busybox:notlatest",
},
{ // name@digest
// FIXME? .tag == "none"
"example.com/ns/busybox" + digestSuffix, "example.com", "ns/busybox", "none", false, true,
// FIXME: this drops the digest and replaces it with an incorrect tag.
"example.com/ns/busybox:none",
},
{ // name:tag@digest
"example.com/ns/busybox:notlatest" + digestSuffix, "example.com", "ns/busybox", "notlatest", true, true,
// FIXME: This drops the digest
"example.com/ns/busybox:notlatest",
},
} {
parts, err := decompose(c.input)
if c.assembled == "" {
if c.name == "" {
assert.Error(t, err, c.input)
} else {
assert.NoError(t, err, c.input)
@ -59,7 +49,6 @@ func TestDecompose(t *testing.T) {
assert.Equal(t, c.tag, parts.tag, c.input)
assert.Equal(t, c.isTagged, parts.isTagged, c.input)
assert.Equal(t, c.hasRegistry, parts.hasRegistry, c.input)
assert.Equal(t, c.assembled, parts.assemble(), c.input)
}
}
}