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

Merge pull request #16272 from gocurr/fix_unique_urls

Browse Source 
pkg/flags: fix UniqueURLs'Set to remove duplicates in UniqueURLs'uss
This commit is contained in:
Benjamin Wang 2023-07-26 16:26:42 +01:00 committed by GitHub
commit af07f18dce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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.uss = make([]url.URL, 0)
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)
}
return nil

35
pkg/flags/unique_urls_test.go
View File

@ -15,8 +15,11 @@
package flags
import (
"reflect"
"flag"
"strings"
"testing"
"github.com/stretchr/testify/require"
)
func TestNewUniqueURLsWithExceptions(t *testing.T) {
@ -83,11 +86,29 @@ func TestNewUniqueURLsWithExceptions(t *testing.T) {
}
for i := range tests {
uv := NewUniqueURLsWithExceptions(tests[i].s, tests[i].exception)
if !reflect.DeepEqual(tests[i].exp, uv.Values) {
t.Fatalf("#%d: expected %+v, got %+v", i, tests[i].exp, uv.Values)
}
if uv.String() != tests[i].rs {
t.Fatalf("#%d: expected %q, got %q", i, tests[i].rs, uv.String())
}
require.Equal(t, tests[i].exp, uv.Values)
require.Equal(t, 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)
}