From 34f9e6fec9bfa48920753e3ba6f869e2e6589dde Mon Sep 17 00:00:00 2001
From: Will Murphy <will.murphy@anchore.com>
Date: Thu, 2 May 2024 11:15:19 -0400
Subject: [PATCH] make new linter pass linting

Signed-off-by: Will Murphy <will.murphy@anchore.com>
---
 test/linters/ensuredefer/analyzer.go | 9 ++++-----
 test/linters/ensuredefer/main.go     | 9 ---------
 2 files changed, 4 insertions(+), 14 deletions(-)
 delete mode 100644 test/linters/ensuredefer/main.go

diff --git a/test/linters/ensuredefer/analyzer.go b/test/linters/ensuredefer/analyzer.go
index a3187dae6..ea79372f2 100644
--- a/test/linters/ensuredefer/analyzer.go
+++ b/test/linters/ensuredefer/analyzer.go
@@ -1,15 +1,16 @@
 package ensuredefer
 
 import (
-	"github.com/golangci/plugin-module-register/register"
 	"go/ast"
+
+	"github.com/golangci/plugin-module-register/register"
 	"golang.org/x/tools/go/analysis"
 	"golang.org/x/tools/go/analysis/passes/inspect"
 	"golang.org/x/tools/go/ast/inspector"
 )
 
 func init() {
-	register.Plugin("ensuredefer", func(conf any) (register.LinterPlugin, error) {
+	register.Plugin("ensuredefer", func(_ any) (register.LinterPlugin, error) {
 		return &analyzerPlugin{}, nil
 	})
 }
@@ -18,13 +19,11 @@ func run(pass *analysis.Pass) (any, error) {
 	insp := pass.ResultOf[inspect.Analyzer].(*inspector.Inspector)
 	nodeFilter := []ast.Node{
 		(*ast.ExprStmt)(nil),
-		(*ast.DeferStmt)(nil),
 	}
 	insp.Preorder(nodeFilter, func(node ast.Node) {
 		// if we have a *ast.ExprStmt that calls internal.CloseAndLogError, report a problem.
 		// (if the function is correctly called in a defer statement, the block will have
-		switch t := node.(type) {
-		case *ast.ExprStmt:
+		if t, ok := node.(*ast.ExprStmt); ok {
 			if !isExprStmtAllowed(t, pass) {
 				pass.Reportf(t.Pos(), "internal.CloseAndLogError must be called in defer")
 			}
diff --git a/test/linters/ensuredefer/main.go b/test/linters/ensuredefer/main.go
deleted file mode 100644
index 86f2b114f..000000000
--- a/test/linters/ensuredefer/main.go
+++ /dev/null
@@ -1,9 +0,0 @@
-package ensuredefer
-
-import (
-	"golang.org/x/tools/go/analysis/singlechecker"
-)
-
-func main() {
-	singlechecker.Main(NewAnalyzer())
-}