From 9010d9b13e99489fd426e1f2e7ba6e67d055c364 Mon Sep 17 00:00:00 2001 From: Matthieu MOREL Date: Sat, 8 Feb 2025 10:41:59 +0100 Subject: [PATCH] chore: enable unnecessary-stmt from revive Signed-off-by: Matthieu MOREL --- .golangci.yaml | 1 - internal/resourcemodifiers/strategic_merge_patch.go | 11 +++-------- pkg/plugin/framework/common/client_errors.go | 3 +-- 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/.golangci.yaml b/.golangci.yaml index cbe373c0a0..a3a7f45245 100644 --- a/.golangci.yaml +++ b/.golangci.yaml @@ -272,7 +272,6 @@ linters-settings: - name: unexported-return disabled: true - name: unnecessary-stmt - disabled: true - name: unreachable-code - name: unused-parameter disabled: true diff --git a/internal/resourcemodifiers/strategic_merge_patch.go b/internal/resourcemodifiers/strategic_merge_patch.go index 1edebf27ec..380ff3ad46 100644 --- a/internal/resourcemodifiers/strategic_merge_patch.go +++ b/internal/resourcemodifiers/strategic_merge_patch.go @@ -117,14 +117,9 @@ func applyPatchToObject( }) } } else if len(strictErrs) > 0 { - switch { - //case validationDirective == metav1.FieldValidationWarn: - // addStrictDecodingWarnings(requestContext, strictErrs) - default: - return apierrors.NewInvalid(schema.GroupKind{}, "", field.ErrorList{ - field.Invalid(field.NewPath("patch"), fmt.Sprintf("%+v", patchMap), runtime.NewStrictDecodingError(strictErrs).Error()), - }) - } + return apierrors.NewInvalid(schema.GroupKind{}, "", field.ErrorList{ + field.Invalid(field.NewPath("patch"), fmt.Sprintf("%+v", patchMap), runtime.NewStrictDecodingError(strictErrs).Error()), + }) } return nil diff --git a/pkg/plugin/framework/common/client_errors.go b/pkg/plugin/framework/common/client_errors.go index 377851aa8f..1d9e6c22f9 100644 --- a/pkg/plugin/framework/common/client_errors.go +++ b/pkg/plugin/framework/common/client_errors.go @@ -37,8 +37,7 @@ func FromGRPCError(err error) error { } for _, detail := range statusErr.Details() { - switch t := detail.(type) { - case *proto.Stack: + if t, ok := detail.(*proto.Stack); ok { return &ProtoStackError{ error: err, stack: t,