kubernetes
/
kubectl
mirror of https://github.com/kubernetes/kubectl.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove redundant validateFlag checks 

Kubernetes-commit: 5b274249400157028f1d9107b6bbd0686be2c076
This commit is contained in:
Arda Güçlü 2022-06-13 10:06:51 +03:00 committed by Kubernetes Publisher
parent aa46caeecd
commit ec010ddaa3
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/cmd/util/helpers.go
View File

@ -586,10 +586,6 @@ func GetValidationDirective(cmd *cobra.Command) (string, error) {
b, err := strconv.ParseBool(validateFlag) b, err := strconv.ParseBool(validateFlag)
if err != nil { if err != nil {
switch validateFlag { switch validateFlag {
case "":
return metav1.FieldValidationStrict, nil
case cmd.Flag("validate").NoOptDefVal:
return metav1.FieldValidationStrict, nil
case "strict": case "strict":
return metav1.FieldValidationStrict, nil return metav1.FieldValidationStrict, nil
case "warn": case "warn":

4
pkg/cmd/util/helpers_test.go
View File

@ -517,7 +517,9 @@ func TestGetValidationDirective(t *testing.T) {
for _, tc := range tests { for _, tc := range tests {
cmd := &cobra.Command{} cmd := &cobra.Command{}
AddValidateFlags(cmd) AddValidateFlags(cmd)
cmd.Flags().Set("validate", tc.validateFlag) if tc.validateFlag != "" {
cmd.Flags().Set("validate", tc.validateFlag)
}
directive, err := GetValidationDirective(cmd) directive, err := GetValidationDirective(cmd)
if directive != tc.expectedDirective { if directive != tc.expectedDirective {
t.Errorf("validation directive, expected: %v, but got: %v", tc.expectedDirective, directive) t.Errorf("validation directive, expected: %v, but got: %v", tc.expectedDirective, directive)