reference: Replace EnsureTagged with TagNameOnly

The common use case for this function is to add a default tag if the
reference only has a name. The current behavior only adds the default
tag if there is no *tag*, which requires most callers to check for a
digest. Change the behavior to only add default tags to name-only
references, and change the name to reflect this. The documentation
already described the new behavior, so it does not need to be changed.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
pull/2173/head
Aaron Lehmann 2017-01-26 11:46:00 -08:00
parent 7a0972304e
commit 245ca4659e
1 changed files with 4 additions and 5 deletions

View File

@ -123,11 +123,10 @@ func (c canonicalReference) Familiar() Named {
} }
} }
// EnsureTagged adds the default tag "latest" to a reference if it only has // TagNameOnly adds the default tag "latest" to a reference if it only has
// a repo name. // a repo name.
func EnsureTagged(ref Named) NamedTagged { func TagNameOnly(ref Named) Named {
namedTagged, ok := ref.(NamedTagged) if IsNameOnly(ref) {
if !ok {
namedTagged, err := WithTag(ref, defaultTag) namedTagged, err := WithTag(ref, defaultTag)
if err != nil { if err != nil {
// Default tag must be valid, to create a NamedTagged // Default tag must be valid, to create a NamedTagged
@ -137,7 +136,7 @@ func EnsureTagged(ref Named) NamedTagged {
} }
return namedTagged return namedTagged
} }
return namedTagged return ref
} }
// ParseAnyReference parses a reference string as a possible identifier, // ParseAnyReference parses a reference string as a possible identifier,