forked from kubernetes/kubernetes
-
Notifications
You must be signed in to change notification settings - Fork 112
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
UPSTREAM: 98787: Allow zones to be passed to e2e cloud provider
Instead of allowing the cloud provider to guess at the zones that should be applied for a cluster under test, allow the explicit list of zones to consider to be passed as a new test context flag -gce-zones. Only the GCE test cloud provider recognizes this value because only the GCE test cloud provider makes assumptions about zones for verifying values, and the default assumptions for GKE do not always match non-GKE providers.
- Loading branch information
1 parent
8f4bc08
commit a05e773
Showing
5 changed files
with
176 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
55 changes: 55 additions & 0 deletions
55
staging/src/k8s.io/component-base/cli/flag/string_slice_flag.go
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,55 @@ | ||
| /* | ||
| Copyright 2021 The Kubernetes Authors. | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package flag | ||
|
|
||
| import ( | ||
| goflag "flag" | ||
| "strings" | ||
|
|
||
| "github.com/spf13/pflag" | ||
| ) | ||
|
|
||
| // StringSlice implements goflag.Value and plfag.Value, | ||
| // and allows set to be invoked repeatedly to accumulate values. | ||
| type StringSlice struct { | ||
| value *[]string | ||
| changed bool | ||
| } | ||
|
|
||
| func NewStringSlice(s *[]string) *StringSlice { | ||
| return &StringSlice{value: s} | ||
| } | ||
|
|
||
| var _ goflag.Value = &StringSlice{} | ||
| var _ pflag.Value = &StringSlice{} | ||
|
|
||
| func (s *StringSlice) String() string { | ||
| return strings.Join(*s.value, " ") | ||
| } | ||
|
|
||
| func (s *StringSlice) Set(val string) error { | ||
| if s.value == nil || !s.changed { | ||
| *s.value = make([]string, 0) | ||
| } | ||
| *s.value = append(*s.value, val) | ||
| s.changed = true | ||
| return nil | ||
| } | ||
|
|
||
| func (StringSlice) Type() string { | ||
| return "sliceString" | ||
| } |
93 changes: 93 additions & 0 deletions
93
staging/src/k8s.io/component-base/cli/flag/string_slice_flag_test.go
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,93 @@ | ||
| /* | ||
| Copyright 2021 The Kubernetes Authors. | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package flag | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "reflect" | ||
| "strings" | ||
| "testing" | ||
|
|
||
| "github.com/spf13/pflag" | ||
| ) | ||
|
|
||
| func TestStringSlice(t *testing.T) { | ||
| tests := []struct { | ||
| args []string | ||
| def []string | ||
| expected []string | ||
| parseError string | ||
| changed bool | ||
| }{ | ||
| { | ||
| args: []string{}, | ||
| expected: nil, | ||
| }, | ||
| { | ||
| args: []string{"a"}, | ||
| expected: []string{"a"}, | ||
| changed: true, | ||
| }, | ||
| { | ||
| args: []string{"a", "b"}, | ||
| expected: []string{"a", "b"}, | ||
| changed: true, | ||
| }, | ||
| { | ||
| def: []string{"a"}, | ||
| args: []string{"a", "b"}, | ||
| expected: []string{"a", "b"}, | ||
| changed: true, | ||
| }, | ||
| { | ||
| def: []string{"a", "b"}, | ||
| args: []string{"a", "b"}, | ||
| expected: []string{"a", "b"}, | ||
| changed: true, | ||
| }, | ||
| } | ||
| for i, test := range tests { | ||
| fs := pflag.NewFlagSet("testStringSlice", pflag.ContinueOnError) | ||
| var s []string | ||
| s = append(s, test.def...) | ||
|
|
||
| v := NewStringSlice(&s) | ||
| fs.Var(v, "slice", "usage") | ||
|
|
||
| args := []string{} | ||
| for _, a := range test.args { | ||
| args = append(args, fmt.Sprintf("--slice=%s", a)) | ||
| } | ||
|
|
||
| err := fs.Parse(args) | ||
| if test.parseError != "" { | ||
| if err == nil { | ||
| t.Errorf("%d: expected error %q, got nil", i, test.parseError) | ||
| } else if !strings.Contains(err.Error(), test.parseError) { | ||
| t.Errorf("%d: expected error %q, got %q", i, test.parseError, err) | ||
| } | ||
| } else if err != nil { | ||
| t.Errorf("%d: expected nil error, got %v", i, err) | ||
| } | ||
| if !reflect.DeepEqual(s, test.expected) { | ||
| 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) | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters