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

View File

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

View File

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