summaryrefslogtreecommitdiff
path: root/libpod/image/parts.go
diff options
context:
space:
mode:
authorValentin Rothberg <rothberg@redhat.com>2021-04-22 08:01:12 +0200
committerValentin Rothberg <rothberg@redhat.com>2021-05-05 11:30:12 +0200
commit0f7d54b0260c1be992ee3b9cee359ef3a9e8bd21 (patch)
tree192e52054de2abf0c92d83ecdbc71d498c2ec947 /libpod/image/parts.go
parent8eefca5a257121b177562742c972e39e1686140d (diff)
downloadpodman-0f7d54b0260c1be992ee3b9cee359ef3a9e8bd21.tar.gz
podman-0f7d54b0260c1be992ee3b9cee359ef3a9e8bd21.tar.bz2
podman-0f7d54b0260c1be992ee3b9cee359ef3a9e8bd21.zip
migrate Podman to containers/common/libimage
Migrate the Podman code base over to `common/libimage` which replaces `libpod/image` and a lot of glue code entirely. Note that I tried to leave bread crumbs for changed tests. Miscellaneous changes: * Some errors yield different messages which required to alter some tests. * I fixed some pre-existing issues in the code. Others were marked as `//TODO`s to prevent the PR from exploding. * The `NamesHistory` of an image is returned as is from the storage. Previously, we did some filtering which I think is undesirable. Instead we should return the data as stored in the storage. * Touched handlers use the ABI interfaces where possible. * Local image resolution: previously Podman would match "foo" on "myfoo". This behaviour has been changed and Podman will now only match on repository boundaries such that "foo" would match "my/foo" but not "myfoo". I consider the old behaviour to be a bug, at the very least an exotic corner case. * Futhermore, "foo:none" does *not* resolve to a local image "foo" without tag anymore. It's a hill I am (almost) willing to die on. * `image prune` prints the IDs of pruned images. Previously, in some cases, the names were printed instead. The API clearly states ID, so we should stick to it. * Compat endpoint image removal with _force_ deletes the entire not only the specified tag. Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
Diffstat (limited to 'libpod/image/parts.go')
-rw-r--r--libpod/image/parts.go104
1 files changed, 0 insertions, 104 deletions
diff --git a/libpod/image/parts.go b/libpod/image/parts.go
deleted file mode 100644
index 08421320c..000000000
--- a/libpod/image/parts.go
+++ /dev/null
@@ -1,104 +0,0 @@
-package image
-
-import (
- "strings"
-
- "github.com/containers/image/v5/docker/reference"
- "github.com/pkg/errors"
-)
-
-// imageParts describes the parts of an image's name
-type imageParts struct {
- unnormalizedRef reference.Named // WARNING: Did not go through docker.io[/library] normalization
- hasRegistry bool
-}
-
-// Registries must contain a ":" or a "." or be localhost; this helper exists for users of reference.Parse.
-// For inputs that should use the docker.io[/library] normalization, use reference.ParseNormalizedNamed instead.
-func isRegistry(name string) bool {
- return strings.ContainsAny(name, ".:") || name == "localhost"
-}
-
-// GetImageBaseName uses decompose and string splits to obtain the base
-// name of an image. Doing this here because it beats changing the
-// imageParts struct names to be exported as well.
-func GetImageBaseName(input string) (string, error) {
- decomposedImage, err := decompose(input)
- if err != nil {
- return "", err
- }
- splitImageName := strings.Split(decomposedImage.unnormalizedRef.Name(), "/")
- return splitImageName[len(splitImageName)-1], nil
-}
-
-// decompose breaks an input name into an imageParts description
-func decompose(input string) (imageParts, error) {
- imgRef, err := reference.Parse(input)
- if err != nil {
- return imageParts{}, err
- }
- unnormalizedNamed := imgRef.(reference.Named)
- // ip.unnormalizedRef, because it uses reference.Parse and not reference.ParseNormalizedNamed,
- // does not use the standard heuristics for domains vs. namespaces/repos, so we need to check
- // explicitly.
- hasRegistry := isRegistry(reference.Domain(unnormalizedNamed))
- return imageParts{
- unnormalizedRef: unnormalizedNamed,
- hasRegistry: hasRegistry,
- }, nil
-}
-
-// suspiciousRefNameTagValuesForSearch returns a "tag" value used in a previous implementation.
-// This exists only to preserve existing behavior in heuristic code; it’s dubious that that behavior is correct,
-// especially for the tag value.
-func (ip *imageParts) suspiciousRefNameTagValuesForSearch() (string, string, string) {
- registry := reference.Domain(ip.unnormalizedRef)
- imageName := reference.Path(ip.unnormalizedRef)
- // ip.unnormalizedRef, because it uses reference.Parse and not reference.ParseNormalizedNamed,
- // does not use the standard heuristics for domains vs. namespaces/repos.
- if registry != "" && !isRegistry(registry) {
- imageName = registry + "/" + imageName
- registry = ""
- }
-
- var tag string
- if tagged, isTagged := ip.unnormalizedRef.(reference.NamedTagged); isTagged {
- tag = tagged.Tag()
- } else if _, hasDigest := ip.unnormalizedRef.(reference.Digested); hasDigest {
- tag = "none"
- } else {
- tag = LatestTag
- }
- return registry, imageName, tag
-}
-
-// referenceWithRegistry returns a (normalized) reference.Named composed of ip (with !ip.hasRegistry)
-// qualified with registry.
-func (ip *imageParts) referenceWithRegistry(registry string) (reference.Named, error) {
- if ip.hasRegistry {
- return nil, errors.Errorf("internal error: referenceWithRegistry called on imageParts with a registry (%#v)", *ip)
- }
- // We could build a reference.WithName+WithTag/WithDigest here, but we need to round-trip via a string
- // and a ParseNormalizedNamed anyway to get the right normalization of docker.io/library, so
- // just use a string directly.
- qualified := registry + "/" + ip.unnormalizedRef.String()
- ref, err := reference.ParseNormalizedNamed(qualified)
- if err != nil {
- return nil, errors.Wrapf(err, "error normalizing registry+unqualified reference %#v", qualified)
- }
- return ref, nil
-}
-
-// normalizedReference returns a (normalized) reference for ip (with ip.hasRegistry)
-func (ip *imageParts) normalizedReference() (reference.Named, error) {
- if !ip.hasRegistry {
- return nil, errors.Errorf("internal error: normalizedReference called on imageParts without a registry (%#v)", *ip)
- }
- // We need to round-trip via a string to get the right normalization of docker.io/library
- s := ip.unnormalizedRef.String()
- ref, err := reference.ParseNormalizedNamed(s)
- if err != nil { // Should never happen
- return nil, errors.Wrapf(err, "error normalizing qualified reference %#v", s)
- }
- return ref, nil
-}