Skip to content

Commit a3fb784

Browse files
milosgajdosmilosgajdos
authored
Merge pull request #5 from thaJeztah/rm_deprecated
2 parents 49c2849 + 4894124 commit a3fb784

3 files changed

Lines changed: 38 additions & 51 deletions

File tree

‎normalize_test.go‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -466,62 +466,62 @@ func TestNormalizedSplitHostname(t *testing.T) {
466466
tests := []struct {
467467
input string
468468
domain string
469-
name string
469+
path string
470470
}{
471471
{
472472
input: "test.com/foo",
473473
domain: "test.com",
474-
name: "foo",
474+
path: "foo",
475475
},
476476
{
477477
input: "test_com/foo",
478478
domain: "docker.io",
479-
name: "test_com/foo",
479+
path: "test_com/foo",
480480
},
481481
{
482482
input: "docker/migrator",
483483
domain: "docker.io",
484-
name: "docker/migrator",
484+
path: "docker/migrator",
485485
},
486486
{
487487
input: "test.com:8080/foo",
488488
domain: "test.com:8080",
489-
name: "foo",
489+
path: "foo",
490490
},
491491
{
492492
input: "test-com:8080/foo",
493493
domain: "test-com:8080",
494-
name: "foo",
494+
path: "foo",
495495
},
496496
{
497497
input: "foo",
498498
domain: "docker.io",
499-
name: "library/foo",
499+
path: "library/foo",
500500
},
501501
{
502502
input: "xn--n3h.com/foo",
503503
domain: "xn--n3h.com",
504-
name: "foo",
504+
path: "foo",
505505
},
506506
{
507507
input: "xn--n3h.com:18080/foo",
508508
domain: "xn--n3h.com:18080",
509-
name: "foo",
509+
path: "foo",
510510
},
511511
{
512512
input: "docker.io/foo",
513513
domain: "docker.io",
514-
name: "library/foo",
514+
path: "library/foo",
515515
},
516516
{
517517
input: "docker.io/library/foo",
518518
domain: "docker.io",
519-
name: "library/foo",
519+
path: "library/foo",
520520
},
521521
{
522522
input: "docker.io/library/foo/bar",
523523
domain: "docker.io",
524-
name: "library/foo/bar",
524+
path: "library/foo/bar",
525525
},
526526
}
527527
for _, tc := range tests {
@@ -532,12 +532,12 @@ func TestNormalizedSplitHostname(t *testing.T) {
532532
if err != nil {
533533
t.Errorf("error parsing name: %s", err)
534534
}
535-
domain, name := SplitHostname(named) //nolint:staticcheck // Ignore SA1019: SplitHostname is deprecated.
536-
if domain != tc.domain {
535+
536+
if domain := Domain(named); domain != tc.domain {
537537
t.Errorf("unexpected domain: got %q, expected %q", domain, tc.domain)
538538
}
539-
if name != tc.name {
540-
t.Errorf("unexpected name: got %q, expected %q", name, tc.name)
539+
if path := Path(named); path != tc.path {
540+
t.Errorf("unexpected name: got %q, expected %q", path, tc.path)
541541
}
542542
})
543543
}

‎reference.go‎

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,9 @@ func Path(named Named) (name string) {
165165
return path
166166
}
167167

168+
// splitDomain splits a named reference into a hostname and path string.
169+
// If no valid hostname is found, the hostname is empty and the full value
170+
// is returned as name
168171
func splitDomain(name string) (string, string) {
169172
match := anchoredNameRegexp.FindStringSubmatch(name)
170173
if len(match) != 3 {
@@ -173,19 +176,6 @@ func splitDomain(name string) (string, string) {
173176
return match[1], match[2]
174177
}
175178

176-
// SplitHostname splits a named reference into a
177-
// hostname and name string. If no valid hostname is
178-
// found, the hostname is empty and the full value
179-
// is returned as name
180-
//
181-
// Deprecated: Use [Domain] or [Path].
182-
func SplitHostname(named Named) (string, string) {
183-
if r, ok := named.(namedRepository); ok {
184-
return r.Domain(), r.Path()
185-
}
186-
return splitDomain(named.Name())
187-
}
188-
189179
// Parse parses s and returns a syntactically valid Reference.
190180
// If an error was encountered it is returned, along with a nil Reference.
191181
func Parse(s string) (Reference, error) {

‎reference_test.go‎

Lines changed: 19 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -291,8 +291,7 @@ func TestReferenceParse(t *testing.T) {
291291
if named.Name() != tc.repository {
292292
t.Errorf("unexpected repository: got %q, expected %q", named.Name(), tc.repository)
293293
}
294-
domain, _ := SplitHostname(named)
295-
if domain != tc.domain {
294+
if domain := Domain(named); domain != tc.domain {
296295
t.Errorf("unexpected domain: got %q, expected %q", domain, tc.domain)
297296
}
298297
} else if tc.repository != "" || tc.domain != "" {
@@ -373,42 +372,42 @@ func TestWithNameFailure(t *testing.T) {
373372
}
374373
}
375374

376-
func TestSplitHostname(t *testing.T) {
375+
func TestDomainAndPath(t *testing.T) {
377376
t.Parallel()
378377
tests := []struct {
379378
input string
380379
domain string
381-
name string
380+
path string
382381
}{
383382
{
384383
input: "test.com/foo",
385384
domain: "test.com",
386-
name: "foo",
385+
path: "foo",
387386
},
388387
{
389388
input: "test_com/foo",
390389
domain: "",
391-
name: "test_com/foo",
390+
path: "test_com/foo",
392391
},
393392
{
394393
input: "test:8080/foo",
395394
domain: "test:8080",
396-
name: "foo",
395+
path: "foo",
397396
},
398397
{
399398
input: "test.com:8080/foo",
400399
domain: "test.com:8080",
401-
name: "foo",
400+
path: "foo",
402401
},
403402
{
404403
input: "test-com:8080/foo",
405404
domain: "test-com:8080",
406-
name: "foo",
405+
path: "foo",
407406
},
408407
{
409408
input: "xn--n3h.com:18080/foo",
410409
domain: "xn--n3h.com:18080",
411-
name: "foo",
410+
path: "foo",
412411
},
413412
}
414413
for _, tc := range tests {
@@ -419,12 +418,11 @@ func TestSplitHostname(t *testing.T) {
419418
if err != nil {
420419
t.Errorf("error parsing name: %s", err)
421420
}
422-
domain, name := SplitHostname(named)
423-
if domain != tc.domain {
421+
if domain := Domain(named); domain != tc.domain {
424422
t.Errorf("unexpected domain: got %q, expected %q", domain, tc.domain)
425423
}
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)
428426
}
429427
})
430428
}
@@ -681,18 +679,18 @@ func TestParseNamed(t *testing.T) {
681679
tests := []struct {
682680
input string
683681
domain string
684-
name string
682+
path string
685683
err error
686684
}{
687685
{
688686
input: "test.com/foo",
689687
domain: "test.com",
690-
name: "foo",
688+
path: "foo",
691689
},
692690
{
693691
input: "test:8080/foo",
694692
domain: "test:8080",
695-
name: "foo",
693+
path: "foo",
696694
},
697695
{
698696
input: "test_com/foo",
@@ -713,7 +711,7 @@ func TestParseNamed(t *testing.T) {
713711
{
714712
input: "docker.io/library/foo",
715713
domain: "docker.io",
716-
name: "library/foo",
714+
path: "library/foo",
717715
},
718716
// Ambiguous case, parser will add "library/" to foo
719717
{
@@ -739,12 +737,11 @@ func TestParseNamed(t *testing.T) {
739737
return
740738
}
741739

742-
domain, name := SplitHostname(named)
743-
if domain != tc.domain {
740+
if domain := Domain(named); domain != tc.domain {
744741
t.Errorf("unexpected domain: got %q, expected %q", domain, tc.domain)
745742
}
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)
748745
}
749746
})
750747
}

0 commit comments

Comments
 (0)