TrueCloudLab/coredns
16
0
Fork 2
Code Issues Pull requests 4 Projects Releases Packages Wiki Activity Actions

fix: convert key to domain (#5064)

Browse source 
fix convert key to domain when key ends with '/'
This commit is contained in:
soulfy 2022-02-01 22:45:43 +08:00 • committed by GitHub
parent 6377e6a9d9
commit 49ee97994e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
plugin/etcd/msg/path.go
View file

@ -22,6 +22,9 @@ func Path(s, prefix string) string {
// Domain is the opposite of Path. // Domain is the opposite of Path.
func Domain(s string) string { func Domain(s string) string {
l := strings.Split(s, "/") l := strings.Split(s, "/")
if l[len(l)-1] == "" {
l = l[:len(l)-1]
}
// start with 1, to strip /skydns // start with 1, to strip /skydns
for i, j := 1, len(l)-1; i < j; i, j = i+1, j-1 { for i, j := 1, len(l)-1; i < j; i, j = i+1, j-1 {
l[i], l[j] = l[j], l[i] l[i], l[j] = l[j], l[i]

12
plugin/etcd/msg/path_test.go
View file

@ -10,3 +10,15 @@ func TestPath(t *testing.T) {
} }
} }
} }
func TestDomain(t *testing.T) {
result1 := Domain("/skydns/local/cluster/staging/service/")
if result1 != "service.staging.cluster.local." {
t.Errorf("Failure to get domain from etcd key (with a trailing '/'), expect: 'service.staging.cluster.local.', actually get: '%s'", result1)
}
result2 := Domain("/skydns/local/cluster/staging/service")
if result2 != "service.staging.cluster.local." {
t.Errorf("Failure to get domain from etcd key (without trailing '/'), expect: 'service.staging.cluster.local.' actually get: '%s'", result2)
}
}