Mirrors/coredns
1
0
Fork 0
mirror of https://github.com/coredns/coredns.git synced 2025-11-01 10:43:17 -04:00
Code Issues Packages Projects Releases Wiki Activity

K8s remove string ops (#2119)

Browse Source 
* plugin/kubernetes: remove bunch a string ops

This removes a bunch of appends to where not needed, makes dnsutil.Join
take variadic args which removes the need to wrap in a new string slice.

Signed-off-by: Miek Gieben <miek@miek.nl>

* Fix calls to dnsutil.Join

Signed-off-by: Miek Gieben <miek@miek.nl>

* Revert these

Signed-off-by: Miek Gieben <miek@miek.nl>
This commit is contained in:
Miek Gieben
2018-09-22 15:12:02 +01:00
committed by GitHub
parent b3d69f1c7f
commit 9546b606cb
11 changed files with 31 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
plugin/pkg/dnsutil/join.go
View File

@@ -8,12 +8,10 @@ import (
// Join joins labels to form a fully qualified domain name. If the last label is
// the root label it is ignored. Not other syntax checks are performed.
func Join(labels []string) string {
func Join(labels ...string) string {
ll := len(labels)
if labels[ll-1] == "." {
s := strings.Join(labels[:ll-1], ".")
return dns.Fqdn(s)
return strings.Join(labels[:ll-1], ".") + "."
}
s := strings.Join(labels, ".")
return dns.Fqdn(s)
return dns.Fqdn(strings.Join(labels, "."))
}

3
plugin/pkg/dnsutil/join_test.go
View File

@@ -9,11 +9,12 @@ func TestJoin(t *testing.T) {
}{
{[]string{"bla", "bliep", "example", "org"}, "bla.bliep.example.org."},
{[]string{"example", "."}, "example."},
{[]string{"example", "org."}, "example.org."}, // technically we should not be called like this.
{[]string{"."}, "."},
}
for i, tc := range tests {
if x := Join(tc.in); x != tc.out {
if x := Join(tc.in...); x != tc.out {
t.Errorf("Test %d, expected %s, got %s", i, tc.out, x)
}
}