github/distribution
1
0
Fork 0
mirror of https://github.com/distribution/distribution.git synced 2025-09-02 23:45:53 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #4032 from thaJeztah/2.8_backport_ref_replace_deprecated

Browse Source 
[release/2.8 backport] reference: replace deprecated function SplitHostname
This commit is contained in:
Milos Gajdos
2023-08-31 15:20:59 +01:00
committed by GitHub
parent 27206bcd3b b57133cc21
commit 10a7e4c483
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
reference/reference.go
View File

@@ -175,7 +175,8 @@ func splitDomain(name string) (string, string) {
// hostname and name string. If no valid hostname is // hostname and name string. If no valid hostname is
// found, the hostname is empty and the full value // found, the hostname is empty and the full value
// is returned as name // is returned as name
// DEPRECATED: Use Domain or Path //
// Deprecated: Use [Domain] or [Path].
func SplitHostname(named Named) (string, string) { func SplitHostname(named Named) (string, string) {
if r, ok := named.(namedRepository); ok { if r, ok := named.(namedRepository); ok {
return r.Domain(), r.Path() return r.Domain(), r.Path()
@@ -320,11 +321,13 @@ func WithDigest(name Named, digest digest.Digest) (Canonical, error) {
// TrimNamed removes any tag or digest from the named reference. // TrimNamed removes any tag or digest from the named reference.
func TrimNamed(ref Named) Named { func TrimNamed(ref Named) Named {
domain, path := SplitHostname(ref) repo := repository{}
return repository{ if r, ok := ref.(namedRepository); ok {
domain: domain, repo.domain, repo.path = r.Domain(), r.Path()
path: path, } else {
repo.domain, repo.path = splitDomain(ref.Name())
} }
return repo
} }
func getBestReferenceType(ref reference) Reference { func getBestReferenceType(ref reference) Reference {