Merge pull request #5 from thaJeztah/rm_deprecated

milosgajdos · web-flow · commit a3fb784683c9 · 2023-09-01T13:24:49.000+01:00
diff --git a/normalize_test.go b/normalize_test.go
@@ -466,62 +466,62 @@ func TestNormalizedSplitHostname(t *testing.T) {
 	tests := []struct {
 		input  string
 		domain string
-		name   string
+		path   string
 	}{
 		{
 			input:  "test.com/foo",
 			domain: "test.com",
-			name:   "foo",
+			path:   "foo",
 		},
 		{
 			input:  "test_com/foo",
 			domain: "docker.io",
-			name:   "test_com/foo",
+			path:   "test_com/foo",
 		},
 		{
 			input:  "docker/migrator",
 			domain: "docker.io",
-			name:   "docker/migrator",
+			path:   "docker/migrator",
 		},
 		{
 			input:  "test.com:8080/foo",
 			domain: "test.com:8080",
-			name:   "foo",
+			path:   "foo",
 		},
 		{
 			input:  "test-com:8080/foo",
 			domain: "test-com:8080",
-			name:   "foo",
+			path:   "foo",
 		},
 		{
 			input:  "foo",
 			domain: "docker.io",
-			name:   "library/foo",
+			path:   "library/foo",
 		},
 		{
 			input:  "xn--n3h.com/foo",
 			domain: "xn--n3h.com",
-			name:   "foo",
+			path:   "foo",
 		},
 		{
 			input:  "xn--n3h.com:18080/foo",
 			domain: "xn--n3h.com:18080",
-			name:   "foo",
+			path:   "foo",
 		},
 		{
 			input:  "docker.io/foo",
 			domain: "docker.io",
-			name:   "library/foo",
+			path:   "library/foo",
 		},
 		{
 			input:  "docker.io/library/foo",
 			domain: "docker.io",
-			name:   "library/foo",
+			path:   "library/foo",
 		},
 		{
 			input:  "docker.io/library/foo/bar",
 			domain: "docker.io",
-			name:   "library/foo/bar",
+			path:   "library/foo/bar",
 		},
 	}
 	for _, tc := range tests {
@@ -532,12 +532,12 @@ func TestNormalizedSplitHostname(t *testing.T) {
 			if err != nil {
 				t.Errorf("error parsing name: %s", err)
 			}
-			domain, name := SplitHostname(named) //nolint:staticcheck // Ignore SA1019: SplitHostname is deprecated.
-			if domain != tc.domain {
+
+			if domain := Domain(named); domain != tc.domain {
 				t.Errorf("unexpected domain: got %q, expected %q", domain, tc.domain)
 			}
-			if name != tc.name {
-				t.Errorf("unexpected name: got %q, expected %q", name, tc.name)
+			if path := Path(named); path != tc.path {
+				t.Errorf("unexpected name: got %q, expected %q", path, tc.path)
 			}
 		})
 	}
diff --git a/reference.go b/reference.go
@@ -165,6 +165,9 @@ func Path(named Named) (name string) {
 	return path
 }
 
+// splitDomain splits a named reference into a hostname and path string.
+// If no valid hostname is found, the hostname is empty and the full value
+// is returned as name
 func splitDomain(name string) (string, string) {
 	match := anchoredNameRegexp.FindStringSubmatch(name)
 	if len(match) != 3 {
@@ -173,19 +176,6 @@ func splitDomain(name string) (string, string) {
 	return match[1], match[2]
 }
 
-// SplitHostname splits a named reference into a
-// 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].
-func SplitHostname(named Named) (string, string) {
-	if r, ok := named.(namedRepository); ok {
-		return r.Domain(), r.Path()
-	}
-	return splitDomain(named.Name())
-}
-
 // Parse parses s and returns a syntactically valid Reference.
 // If an error was encountered it is returned, along with a nil Reference.
 func Parse(s string) (Reference, error) {
diff --git a/reference_test.go b/reference_test.go
@@ -291,8 +291,7 @@ func TestReferenceParse(t *testing.T) {
 				if named.Name() != tc.repository {
 					t.Errorf("unexpected repository: got %q, expected %q", named.Name(), tc.repository)
 				}
-				domain, _ := SplitHostname(named)
-				if domain != tc.domain {
+				if domain := Domain(named); domain != tc.domain {
 					t.Errorf("unexpected domain: got %q, expected %q", domain, tc.domain)
 				}
 			} else if tc.repository != "" || tc.domain != "" {
@@ -373,42 +372,42 @@ func TestWithNameFailure(t *testing.T) {
 	}
 }
 
-func TestSplitHostname(t *testing.T) {
+func TestDomainAndPath(t *testing.T) {
 	t.Parallel()
 	tests := []struct {
 		input  string
 		domain string
-		name   string
+		path   string
 	}{
 		{
 			input:  "test.com/foo",
 			domain: "test.com",
-			name:   "foo",
+			path:   "foo",
 		},
 		{
 			input:  "test_com/foo",
 			domain: "",
-			name:   "test_com/foo",
+			path:   "test_com/foo",
 		},
 		{
 			input:  "test:8080/foo",
 			domain: "test:8080",
-			name:   "foo",
+			path:   "foo",
 		},
 		{
 			input:  "test.com:8080/foo",
 			domain: "test.com:8080",
-			name:   "foo",
+			path:   "foo",
 		},
 		{
 			input:  "test-com:8080/foo",
 			domain: "test-com:8080",
-			name:   "foo",
+			path:   "foo",
 		},
 		{
 			input:  "xn--n3h.com:18080/foo",
 			domain: "xn--n3h.com:18080",
-			name:   "foo",
+			path:   "foo",
 		},
 	}
 	for _, tc := range tests {
@@ -419,12 +418,11 @@ func TestSplitHostname(t *testing.T) {
 			if err != nil {
 				t.Errorf("error parsing name: %s", err)
 			}
-			domain, name := SplitHostname(named)
-			if domain != tc.domain {
+			if domain := Domain(named); domain != tc.domain {
 				t.Errorf("unexpected domain: got %q, expected %q", domain, tc.domain)
 			}
-			if name != tc.name {
-				t.Errorf("unexpected name: got %q, expected %q", name, tc.name)
+			if path := Path(named); path != tc.path {
+				t.Errorf("unexpected name: got %q, expected %q", path, tc.path)
 			}
 		})
 	}
@@ -681,18 +679,18 @@ func TestParseNamed(t *testing.T) {
 	tests := []struct {
 		input  string
 		domain string
-		name   string
+		path   string
 		err    error
 	}{
 		{
 			input:  "test.com/foo",
 			domain: "test.com",
-			name:   "foo",
+			path:   "foo",
 		},
 		{
 			input:  "test:8080/foo",
 			domain: "test:8080",
-			name:   "foo",
+			path:   "foo",
 		},
 		{
 			input: "test_com/foo",
@@ -713,7 +711,7 @@ func TestParseNamed(t *testing.T) {
 		{
 			input:  "docker.io/library/foo",
 			domain: "docker.io",
-			name:   "library/foo",
+			path:   "library/foo",
 		},
 		// Ambiguous case, parser will add "library/" to foo
 		{
@@ -739,12 +737,11 @@ func TestParseNamed(t *testing.T) {
 				return
 			}
 
-			domain, name := SplitHostname(named)
-			if domain != tc.domain {
+			if domain := Domain(named); domain != tc.domain {
 				t.Errorf("unexpected domain: got %q, expected %q", domain, tc.domain)
 			}
-			if name != tc.name {
-				t.Errorf("unexpected name: got %q, expected %q", name, tc.name)
+			if path := Path(named); path != tc.path {
+				t.Errorf("unexpected name: got %q, expected %q", path, tc.path)
 			}
 		})
 	}

Original file line number	Diff line number	Diff line change
`@@ -291,8 +291,7 @@ func TestReferenceParse(t *testing.T) {`
`291`	`291`	`if named.Name() != tc.repository {`
`292`	`292`	`t.Errorf("unexpected repository: got %q, expected %q", named.Name(), tc.repository)`
`293`	`293`	`}`
`294`		`- domain, _ := SplitHostname(named)`
`295`		`- if domain != tc.domain {`
	`294`	`+ if domain := Domain(named); domain != tc.domain {`
`296`	`295`	`t.Errorf("unexpected domain: got %q, expected %q", domain, tc.domain)`
`297`	`296`	`}`
`298`	`297`	`} else if tc.repository != "" \|\| tc.domain != "" {`
`@@ -373,42 +372,42 @@ func TestWithNameFailure(t *testing.T) {`
`373`	`372`	`}`
`374`	`373`	`}`
`375`	`374`
`376`		`-func TestSplitHostname(t *testing.T) {`
	`375`	`+func TestDomainAndPath(t *testing.T) {`
`377`	`376`	`t.Parallel()`
`378`	`377`	`tests := []struct {`
`379`	`378`	`input string`
`380`	`379`	`domain string`
`381`		`- name string`
	`380`	`+ path string`
`382`	`381`	`}{`
`383`	`382`	`{`
`384`	`383`	`input: "test.com/foo",`
`385`	`384`	`domain: "test.com",`
`386`		`- name: "foo",`
	`385`	`+ path: "foo",`
`387`	`386`	`},`
`388`	`387`	`{`
`389`	`388`	`input: "test_com/foo",`
`390`	`389`	`domain: "",`
`391`		`- name: "test_com/foo",`
	`390`	`+ path: "test_com/foo",`
`392`	`391`	`},`
`393`	`392`	`{`
`394`	`393`	`input: "test:8080/foo",`
`395`	`394`	`domain: "test:8080",`
`396`		`- name: "foo",`
	`395`	`+ path: "foo",`
`397`	`396`	`},`
`398`	`397`	`{`
`399`	`398`	`input: "test.com:8080/foo",`
`400`	`399`	`domain: "test.com:8080",`
`401`		`- name: "foo",`
	`400`	`+ path: "foo",`
`402`	`401`	`},`
`403`	`402`	`{`
`404`	`403`	`input: "test-com:8080/foo",`
`405`	`404`	`domain: "test-com:8080",`
`406`		`- name: "foo",`
	`405`	`+ path: "foo",`
`407`	`406`	`},`
`408`	`407`	`{`
`409`	`408`	`input: "xn--n3h.com:18080/foo",`
`410`	`409`	`domain: "xn--n3h.com:18080",`
`411`		`- name: "foo",`
	`410`	`+ path: "foo",`
`412`	`411`	`},`
`413`	`412`	`}`
`414`	`413`	`for _, tc := range tests {`
`@@ -419,12 +418,11 @@ func TestSplitHostname(t *testing.T) {`
`419`	`418`	`if err != nil {`
`420`	`419`	`t.Errorf("error parsing name: %s", err)`
`421`	`420`	`}`
`422`		`- domain, name := SplitHostname(named)`
`423`		`- if domain != tc.domain {`
	`421`	`+ if domain := Domain(named); domain != tc.domain {`
`424`	`422`	`t.Errorf("unexpected domain: got %q, expected %q", domain, tc.domain)`
`425`	`423`	`}`
`426`		`- if name != tc.name {`
`427`		`- t.Errorf("unexpected name: got %q, expected %q", name, tc.name)`
	`424`	`+ if path := Path(named); path != tc.path {`
	`425`	`+ t.Errorf("unexpected name: got %q, expected %q", path, tc.path)`
`428`	`426`	`}`
`429`	`427`	`})`
`430`	`428`	`}`
`@@ -681,18 +679,18 @@ func TestParseNamed(t *testing.T) {`
`681`	`679`	`tests := []struct {`
`682`	`680`	`input string`
`683`	`681`	`domain string`
`684`		`- name string`
	`682`	`+ path string`
`685`	`683`	`err error`
`686`	`684`	`}{`
`687`	`685`	`{`
`688`	`686`	`input: "test.com/foo",`
`689`	`687`	`domain: "test.com",`
`690`		`- name: "foo",`
	`688`	`+ path: "foo",`
`691`	`689`	`},`
`692`	`690`	`{`
`693`	`691`	`input: "test:8080/foo",`
`694`	`692`	`domain: "test:8080",`
`695`		`- name: "foo",`
	`693`	`+ path: "foo",`
`696`	`694`	`},`
`697`	`695`	`{`
`698`	`696`	`input: "test_com/foo",`
`@@ -713,7 +711,7 @@ func TestParseNamed(t *testing.T) {`
`713`	`711`	`{`
`714`	`712`	`input: "docker.io/library/foo",`
`715`	`713`	`domain: "docker.io",`
`716`		`- name: "library/foo",`
	`714`	`+ path: "library/foo",`
`717`	`715`	`},`
`718`	`716`	`// Ambiguous case, parser will add "library/" to foo`
`719`	`717`	`{`
`@@ -739,12 +737,11 @@ func TestParseNamed(t *testing.T) {`
`739`	`737`	`return`
`740`	`738`	`}`
`741`	`739`
`742`		`- domain, name := SplitHostname(named)`
`743`		`- if domain != tc.domain {`
	`740`	`+ if domain := Domain(named); domain != tc.domain {`
`744`	`741`	`t.Errorf("unexpected domain: got %q, expected %q", domain, tc.domain)`
`745`	`742`	`}`
`746`		`- if name != tc.name {`
`747`		`- t.Errorf("unexpected name: got %q, expected %q", name, tc.name)`
	`743`	`+ if path := Path(named); path != tc.path {`
	`744`	`+ t.Errorf("unexpected name: got %q, expected %q", path, tc.path)`
`748`	`745`	`}`
`749`	`746`	`})`
`750`	`747`	`}`