Skip to content

[release/2.8 backport] reference: replace deprecated function SplitHostname #4032

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
milosgajdos merged 2 commits into from
Aug 31, 2023
Merged

[release/2.8 backport] reference: replace deprecated function SplitHostname #4032

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2c4bf1a
replace deprecated function
Sep 26, 2021
b57133c
referene: fix formatting of "deprecated" comment.
thaJeztah Nov 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions reference/reference.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,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()
Expand Down Expand Up @@ -320,11 +321,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 {
Expand Down