Merge pull request #8673 from mmorel-35/revive/unnecessary-stmt

chore: enable unnecessary-stmt from revive
vmware-tanzu · Feb 10, 2025 · 5d9a4e8 · 5d9a4e8
2 parents 0bf2252 + 9010d9b
commit 5d9a4e8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 11 deletions.
diff --git 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
@@ -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
@@ -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,