Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix bug where string slice flag is not assigned #102623

Merged
merged 3 commits into from
Jun 30, 2021
Merged

fix bug where string slice flag is not assigned #102623

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c9414c2
fix bug where string slice flag is not assigned
vazmin Jun 5, 2021
abf6584
update string_slice_flag add nil judgment
vazmin Jun 16, 2021
ab4918b
remove redundant clause in string_slice_flag
vazmin Jun 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions staging/src/k8s.io/component-base/cli/flag/string_slice_flag.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ package flag

import (
goflag "flag"
"fmt"
"strings"

"github.com/spf13/pflag"
Expand Down Expand Up @@ -45,9 +46,11 @@ func (s *StringSlice) String() string {
}

func (s *StringSlice) Set(val string) error {
if s.value == nil || !s.changed {
v := make([]string, 0)
s.value = &v
vazmin marked this conversation as resolved.
Show resolved Hide resolved
if s.value == nil {
return fmt.Errorf("no target (nil pointer to []string)")
vazmin marked this conversation as resolved.
Show resolved Hide resolved
}
if !s.changed {
*s.value = make([]string, 0)
vazmin marked this conversation as resolved.
Show resolved Hide resolved
}
*s.value = append(*s.value, val)
s.changed = true
Expand Down
4 changes: 2 additions & 2 deletions staging/src/k8s.io/component-base/cli/flag/string_slice_flag_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,8 @@ func TestStringSlice(t *testing.T) {
} else if err != nil {
t.Errorf("%d: expected nil error, got %v", i, err)
}
if !reflect.DeepEqual(*v.value, test.expected) {
t.Errorf("%d: expected %+v, got %+v", i, test.expected, *v.value)
if !reflect.DeepEqual(s, test.expected) {
Copy link
Contributor Author

@vazmin vazmin Jun 5, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

s is the flag, the expected should be compared with s. When compared with s, the previous test failed

t.Errorf("%d: expected %+v, got %+v", i, test.expected, s)
}
if v.changed != test.changed {
t.Errorf("%d: expected %t got %t", i, test.changed, v.changed)
Expand Down