From 79d19015492357887313f21c64d6bfa2202549e4 Mon Sep 17 00:00:00 2001 From: zounengren Date: Mon, 27 Sep 2021 04:29:46 +0800 Subject: [PATCH 1/2] replace deprecated function Signed-off-by: Zou Nengren Signed-off-by: Sebastiaan van Stijn --- reference/reference.go | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/reference/reference.go b/reference/reference.go index b6aa060d..fa7ceadb 100644 --- a/reference/reference.go +++ b/reference/reference.go @@ -322,11 +322,13 @@ func WithDigest(name Named, digest digest.Digest) (Canonical, error) { // TrimNamed removes any tag or digest from the named reference. func TrimNamed(ref Named) Named { - domain, path := SplitHostname(ref) - return repository{ - domain: domain, - path: path, + repo := repository{} + if r, ok := ref.(namedRepository); ok { + repo.domain, repo.path = r.Domain(), r.Path() + } else { + repo.domain, repo.path = splitDomain(ref.Name()) } + return repo } func getBestReferenceType(ref reference) Reference { From 3c71f4933db1c49201765df66faf5dc6dc9ba884 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Sun, 6 Nov 2022 22:52:01 +0100 Subject: [PATCH 2/2] referene: fix formatting of "deprecated" comment. Go requires "deprecated" comments to have an empty line before them, and to not be all-caps. This updates to the comment so that it's correctly picked up as deprecated. Signed-off-by: Sebastiaan van Stijn --- reference/reference.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/reference/reference.go b/reference/reference.go index fa7ceadb..3499fbf8 100644 --- a/reference/reference.go +++ b/reference/reference.go @@ -177,7 +177,8 @@ func splitDomain(name string) (string, string) { // hostname and name string. If no valid hostname is // found, the hostname is empty and the full value // is returned as name -// DEPRECATED: Use Domain or Path +// +// Deprecated: Use [Domain] or [Path]. func SplitHostname(named Named) (string, string) { if r, ok := named.(namedRepository); ok { return r.Domain(), r.Path()