Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

pkg/flags: fix UniqueURLs'Set to remove duplicates in UniqueURLs'uss

Browse Source 
From the name of func 'UniqueURLsFromFlag', we can tell that UniqueURLs'uss
should not have duplicates. The current implemention of UniqueURLs'Set
has a bug to make it unique.

Fixes: #16307.

Signed-off-by: Jes Cok <xigua67damn@gmail.com>
This commit is contained in:
Jes Cok 2023-07-26 22:17:39 +08:00
parent 6aad5084b0
commit 4f78cc0810
2 changed files with 33 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/flags/unique_urls.go
View File

@ -50,7 +50,11 @@ func (us *UniqueURLs) Set(s string) error {
us.Values = make(map[string]struct{}) us.Values = make(map[string]struct{})
us.uss = make([]url.URL, 0) us.uss = make([]url.URL, 0)
for _, v := range ss { for _, v := range ss {
us.Values[v.String()] = struct{}{} x := v.String()
if _, exists := us.Values[x]; exists {
continue
}
us.Values[x] = struct{}{}
us.uss = append(us.uss, v) us.uss = append(us.uss, v)
} }
return nil return nil

33
pkg/flags/unique_urls_test.go
View File

@ -15,8 +15,11 @@
package flags package flags
import ( import (
"reflect" "flag"
"strings"
"testing" "testing"
"github.com/stretchr/testify/require"
) )
func TestNewUniqueURLsWithExceptions(t *testing.T) { func TestNewUniqueURLsWithExceptions(t *testing.T) {
@ -83,11 +86,29 @@ func TestNewUniqueURLsWithExceptions(t *testing.T) {
} }
for i := range tests { for i := range tests {
uv := NewUniqueURLsWithExceptions(tests[i].s, tests[i].exception) uv := NewUniqueURLsWithExceptions(tests[i].s, tests[i].exception)
if !reflect.DeepEqual(tests[i].exp, uv.Values) { require.Equal(t, tests[i].exp, uv.Values)
t.Fatalf("#%d: expected %+v, got %+v", i, tests[i].exp, uv.Values) require.Equal(t, tests[i].rs, uv.String())
}
if uv.String() != tests[i].rs {
t.Fatalf("#%d: expected %q, got %q", i, tests[i].rs, uv.String())
} }
} }
func TestUniqueURLsFromFlag(t *testing.T) {
const name = "test"
urls := []string{
"https://1.2.3.4:1",
"https://1.2.3.4:2",
"https://1.2.3.4:3",
"https://1.2.3.4:1",
}
fs := flag.NewFlagSet(name, flag.ExitOnError)
u := NewUniqueURLsWithExceptions(strings.Join(urls, ","))
fs.Var(u, name, "usage")
uss := UniqueURLsFromFlag(fs, name)
require.Equal(t, len(u.Values), len(uss))
um := make(map[string]struct{})
for _, x := range uss {
um[x.String()] = struct{}{}
}
require.Equal(t, u.Values, um)
} }