From 5b274249400157028f1d9107b6bbd0686be2c076 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arda=20G=C3=BC=C3=A7l=C3=BC?= Date: Mon, 13 Jun 2022 10:06:51 +0300 Subject: [PATCH] Remove redundant validateFlag checks --- staging/src/k8s.io/kubectl/pkg/cmd/util/helpers.go | 4 ---- staging/src/k8s.io/kubectl/pkg/cmd/util/helpers_test.go | 4 +++- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/util/helpers.go b/staging/src/k8s.io/kubectl/pkg/cmd/util/helpers.go index 2e009894f8d..16a679e3a2a 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/util/helpers.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/util/helpers.go @@ -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": diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/util/helpers_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/util/helpers_test.go index 790b3669978..6a695fd266f 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/util/helpers_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/util/helpers_test.go @@ -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)