summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiloslav Trmač <mitr@redhat.com>2019-01-09 18:47:09 +0100
committerMiloslav Trmač <mitr@redhat.com>2019-01-14 04:07:23 +0100
commit3d98c42a3f7822bf608834505adcffec7f75bf28 (patch)
tree11d29f96b8fb1d18a85abd8d77572cb7dc22e261
parentc19294c0113e4ddea7005bab5d8a31f7ecd6c120 (diff)
downloadpodman-3d98c42a3f7822bf608834505adcffec7f75bf28.tar.gz
podman-3d98c42a3f7822bf608834505adcffec7f75bf28.tar.bz2
podman-3d98c42a3f7822bf608834505adcffec7f75bf28.zip
Inline imageParts.assembleWithTransport into callers
imageParts.transport is a constant, and the design of imageParts is not transport-independent in any sense; we will want to eliminate the transport member entirely. As a first step, drop assembleWithTransport and inline an exact equivalent into all callers. Should not change behavior. Signed-off-by: Miloslav Trmač <mitr@redhat.com>
-rw-r--r--libpod/image/parts.go5
-rw-r--r--libpod/image/parts_test.go18
-rw-r--r--libpod/image/pull.go4
3 files changed, 10 insertions, 17 deletions
diff --git a/libpod/image/parts.go b/libpod/image/parts.go
index 289a02e1f..cf774030b 100644
--- a/libpod/image/parts.go
+++ b/libpod/image/parts.go
@@ -87,8 +87,3 @@ func (ip *imageParts) assemble() string {
}
return spec
}
-
-// assemble concatenates an image's parts with transport into a string
-func (ip *imageParts) assembleWithTransport() string {
- return fmt.Sprintf("%s%s", ip.transport, ip.assemble())
-}
diff --git a/libpod/image/parts_test.go b/libpod/image/parts_test.go
index 518538f0b..3ff175f0e 100644
--- a/libpod/image/parts_test.go
+++ b/libpod/image/parts_test.go
@@ -14,39 +14,38 @@ func TestDecompose(t *testing.T) {
transport, registry, name, tag string
isTagged, hasRegistry bool
assembled string
- assembledWithTransport string
}{
- {"#", "", "", "", "", false, false, "", ""}, // Entirely invalid input
+ {"#", "", "", "", "", false, false, ""}, // Entirely invalid input
{ // Fully qualified docker.io, name-only input
"docker.io/library/busybox", "docker://", "docker.io", "library/busybox", "latest", false, true,
- "docker.io/library/busybox:latest", "docker://docker.io/library/busybox:latest",
+ "docker.io/library/busybox:latest",
},
{ // Fully qualified example.com, name-only input
"example.com/ns/busybox", "docker://", "example.com", "ns/busybox", "latest", false, true,
- "example.com/ns/busybox:latest", "docker://example.com/ns/busybox:latest",
+ "example.com/ns/busybox:latest",
},
{ // Unqualified single-name input
"busybox", "docker://", "", "busybox", "latest", false, false,
- "busybox:latest", "docker://busybox:latest",
+ "busybox:latest",
},
{ // Unqualified namespaced input
"ns/busybox", "docker://", "", "ns/busybox", "latest", false, false,
- "ns/busybox:latest", "docker://ns/busybox:latest",
+ "ns/busybox:latest",
},
{ // name:tag
"example.com/ns/busybox:notlatest", "docker://", "example.com", "ns/busybox", "notlatest", true, true,
- "example.com/ns/busybox:notlatest", "docker://example.com/ns/busybox:notlatest",
+ "example.com/ns/busybox:notlatest",
},
{ // name@digest
// FIXME? .tag == "none"
"example.com/ns/busybox" + digestSuffix, "docker://", "example.com", "ns/busybox", "none", false, true,
// FIXME: this drops the digest and replaces it with an incorrect tag.
- "example.com/ns/busybox:none", "docker://example.com/ns/busybox:none",
+ "example.com/ns/busybox:none",
},
{ // name:tag@digest
"example.com/ns/busybox:notlatest" + digestSuffix, "docker://", "example.com", "ns/busybox", "notlatest", true, true,
// FIXME: This drops the digest
- "example.com/ns/busybox:notlatest", "docker://example.com/ns/busybox:notlatest",
+ "example.com/ns/busybox:notlatest",
},
} {
parts, err := decompose(c.input)
@@ -61,7 +60,6 @@ func TestDecompose(t *testing.T) {
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)
- assert.Equal(t, c.assembledWithTransport, parts.assembleWithTransport(), c.input)
}
}
}
diff --git a/libpod/image/pull.go b/libpod/image/pull.go
index 09935fe7c..82fe0fdd6 100644
--- a/libpod/image/pull.go
+++ b/libpod/image/pull.go
@@ -288,7 +288,7 @@ func (ir *Runtime) pullGoalFromPossiblyUnqualifiedName(inputName string) (*pullG
if hasShaInInputName(inputName) {
imageName = fmt.Sprintf("%s%s", decomposedImage.transport, inputName)
} else {
- imageName = decomposedImage.assembleWithTransport()
+ imageName = fmt.Sprintf("%s%s", decomposedImage.transport, decomposedImage.assemble())
}
srcRef, err := alltransports.ParseImageName(imageName)
if err != nil {
@@ -318,7 +318,7 @@ func (ir *Runtime) pullGoalFromPossiblyUnqualifiedName(inputName string) (*pullG
var refPairs []pullRefPair
for _, registry := range searchRegistries {
decomposedImage.registry = registry
- imageName := decomposedImage.assembleWithTransport()
+ imageName := fmt.Sprintf("%s%s", decomposedImage.transport, decomposedImage.assemble())
if hasShaInInputName(inputName) {
imageName = fmt.Sprintf("%s%s/%s", decomposedImage.transport, registry, inputName)
}