diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml index e516cdccd32..d0b514d6aae 100644 --- a/.github/workflows/golangci-lint.yml +++ b/.github/workflows/golangci-lint.yml @@ -41,7 +41,7 @@ jobs: - name: golangci-lint uses: golangci/golangci-lint-action@971e284b6050e8a5849b72094c50ab08da042db8 # v6.1.1 with: - version: v1.61 + version: v1.62 args: --timeout=5m golangci-test-e2e: @@ -62,5 +62,5 @@ jobs: - name: golangci-lint uses: golangci/golangci-lint-action@971e284b6050e8a5849b72094c50ab08da042db8 # v6.1.1 with: - version: v1.61 + version: v1.62 args: --timeout=5m --build-tags e2e ./test diff --git a/pkg/cosign/rego/rego.go b/pkg/cosign/rego/rego.go index 3d99115fb66..354d01f8373 100644 --- a/pkg/cosign/rego/rego.go +++ b/pkg/cosign/rego/rego.go @@ -130,8 +130,8 @@ func ValidateJSONWithModuleInput(jsonBody []byte, moduleInput string) (warnings return nil, fmt.Errorf("policy is not compliant for query '%s'", query) } -func evaluateRegoEvalMapResult(query string, response []interface{}) (warning error, error error) { - error = fmt.Errorf("policy is not compliant for query %q", query) //nolint: revive +func evaluateRegoEvalMapResult(query string, response []interface{}) (warning error, retErr error) { + retErr = fmt.Errorf("policy is not compliant for query %q", query) //nolint: revive for _, r := range response { rMap := r.(map[string]interface{}) mapBytes, err := json.Marshal(rMap) @@ -152,7 +152,7 @@ func evaluateRegoEvalMapResult(query string, response []interface{}) (warning er return fmt.Errorf("warning: %s", resultObject.Warning), nil } warning = errors.New(resultObject.Warning) - error = fmt.Errorf("policy is not compliant for query '%s' with errors: %s", query, resultObject.Error) //nolint: revive + retErr = fmt.Errorf("policy is not compliant for query '%s' with errors: %s", query, resultObject.Error) //nolint: revive } - return warning, error + return warning, retErr }