Organize golangci-lint linters (open-policy-agent#564)

* Update documentation for file extensions Signed-off-by: John Reese <[email protected]> * Organize golangci-lint linters Signed-off-by: John Reese <[email protected]>
scm-spain · May 11, 2021 · 0f795bf · 0f795bf
1 parent a901976
commit 0f795bf
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 14 deletions.
diff --git a/.golangci.yaml b/.golangci.yaml
@@ -5,19 +5,25 @@ linter-settings:
 linters:
   disable-all: true
   enable:
+    - deadcode
     - errcheck
-    - govet
-    - ineffassign
-    - golint
     - goconst
     - gofmt
     - goimports
-    - unused
-    - varcheck
-    - deadcode
+    - golint
+    - gosec
+    - gosimple
+    - govet
+    - ineffassign
+    - makezero
     - misspell
-    - typecheck
-    - structcheck
+    - nilerr
+    - predeclared
     - staticcheck
-    - gosimple
-    - gosec
+    - structcheck
+    - typecheck
+    - unconvert
+    - unparam
+    - unused
+    - varcheck
+    - wastedassign
diff --git a/plugin/plugin.go b/plugin/plugin.go
@@ -88,7 +88,7 @@ func (p *Plugin) Exec(ctx context.Context, args []string) error {
 	// Plugin configurations reference the CONFTEST_PLUGIN_DIR
 	// environment to be able to call the plugin.
 	os.Setenv("CONFTEST_PLUGIN_DIR", p.Directory())
-	expandedCommand := os.ExpandEnv(string(p.Command))
+	expandedCommand := os.ExpandEnv(p.Command)
 
 	var command string
 	var arguments []string

diff --git a/policy/engine.go b/policy/engine.go
@@ -273,7 +273,7 @@ func (e *Engine) check(ctx context.Context, path string, config interface{}, nam
 		// is queried, so the severity prefix must be removed.
 		exceptionQuery := fmt.Sprintf("data.%s.exception[_][_] == %q", namespace, removeRulePrefix(rule))
 
-		exceptionQueryResult, err := e.query(ctx, config, exceptionQuery, namespace)
+		exceptionQueryResult, err := e.query(ctx, config, exceptionQuery)
 		if err != nil {
 			return output.CheckResult{}, fmt.Errorf("query exception: %w", err)
 		}
@@ -291,7 +291,7 @@ func (e *Engine) check(ctx context.Context, path string, config interface{}, nam
 		}
 
 		ruleQuery := fmt.Sprintf("data.%s.%s", namespace, rule)
-		ruleQueryResult, err := e.query(ctx, config, ruleQuery, namespace)
+		ruleQueryResult, err := e.query(ctx, config, ruleQuery)
 		if err != nil {
 			return output.CheckResult{}, fmt.Errorf("query rule: %w", err)
 		}
@@ -345,7 +345,7 @@ func (e *Engine) check(ctx context.Context, path string, config interface{}, nam
 // Example queries could include:
 // data.main.deny to query the deny rule in the main namespace
 // data.main.warn to query the warn rule in the main namespace
-func (e *Engine) query(ctx context.Context, input interface{}, query string, namespace string) (output.QueryResult, error) {
+func (e *Engine) query(ctx context.Context, input interface{}, query string) (output.QueryResult, error) {
 	options := []func(r *rego.Rego){
 		rego.Input(input),
 		rego.Query(query),