From 4634ce10b07e5a2b0413dda2fb3374bab5efe773 Mon Sep 17 00:00:00 2001
From: Matthieu MOREL <mmorel-35@users.noreply.github.com>
Date: Mon, 20 Dec 2021 23:05:05 +0100
Subject: [PATCH] enable nolintlint linter

---
 .golangci.yml                     | 1 +
 pkg/yqlib/expression_tokeniser.go | 8 ++++----
 pkg/yqlib/lib.go                  | 4 ++--
 pkg/yqlib/operator_has.go         | 2 +-
 pkg/yqlib/operators_test.go       | 2 +-
 5 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/.golangci.yml b/.golangci.yml
index 1794f276..385839ab 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -13,6 +13,7 @@ linters:
     - megacheck
     - misspell
     - nakedret
+    - nolintlint
     - revive
     - unconvert
     - unparam
diff --git a/pkg/yqlib/expression_tokeniser.go b/pkg/yqlib/expression_tokeniser.go
index 8c7d1634..0fb05642 100644
--- a/pkg/yqlib/expression_tokeniser.go
+++ b/pkg/yqlib/expression_tokeniser.go
@@ -135,7 +135,7 @@ func opTokenWithPrefs(op *operationType, assignOpType *operationType, preference
 func extractNumberParamter(value string) (int, error) {
 	parameterParser := regexp.MustCompile(`.*\(([0-9]+)\)`)
 	matches := parameterParser.FindStringSubmatch(value)
-	var indent, errParsingInt = strconv.ParseInt(matches[1], 10, 32) // nolint
+	var indent, errParsingInt = strconv.ParseInt(matches[1], 10, 32)
 	if errParsingInt != nil {
 		return 0, errParsingInt
 	}
@@ -198,7 +198,7 @@ func unwrap(value string) string {
 func numberValue() lex.Action {
 	return func(s *lex.Scanner, m *machines.Match) (interface{}, error) {
 		var numberString = string(m.Bytes)
-		var number, errParsingInt = strconv.ParseInt(numberString, 10, 64) // nolint
+		var number, errParsingInt = strconv.ParseInt(numberString, 10, 64)
 		if errParsingInt != nil {
 			return nil, errParsingInt
 		}
@@ -212,7 +212,7 @@ func hexValue() lex.Action {
 		var originalString = string(m.Bytes)
 		var numberString = originalString[2:]
 		log.Debugf("numberString: %v", numberString)
-		var number, errParsingInt = strconv.ParseInt(numberString, 16, 64) // nolint
+		var number, errParsingInt = strconv.ParseInt(numberString, 16, 64)
 		if errParsingInt != nil {
 			return nil, errParsingInt
 		}
@@ -224,7 +224,7 @@ func hexValue() lex.Action {
 func floatValue() lex.Action {
 	return func(s *lex.Scanner, m *machines.Match) (interface{}, error) {
 		var numberString = string(m.Bytes)
-		var number, errParsingInt = strconv.ParseFloat(numberString, 64) // nolint
+		var number, errParsingInt = strconv.ParseFloat(numberString, 64)
 		if errParsingInt != nil {
 			return nil, errParsingInt
 		}
diff --git a/pkg/yqlib/lib.go b/pkg/yqlib/lib.go
index 2cb2f968..42cf2a9c 100644
--- a/pkg/yqlib/lib.go
+++ b/pkg/yqlib/lib.go
@@ -203,10 +203,10 @@ func recursiveNodeEqual(lhs *yaml.Node, rhs *yaml.Node) bool {
 func parseInt(numberString string) (string, int64, error) {
 	if strings.HasPrefix(numberString, "0x") ||
 		strings.HasPrefix(numberString, "0X") {
-		num, err := strconv.ParseInt(numberString[2:], 16, 64) // nolint
+		num, err := strconv.ParseInt(numberString[2:], 16, 64)
 		return "0x%X", num, err
 	}
-	num, err := strconv.ParseInt(numberString, 10, 64) // nolint
+	num, err := strconv.ParseInt(numberString, 10, 64)
 	return "%v", num, err
 }
 
diff --git a/pkg/yqlib/operator_has.go b/pkg/yqlib/operator_has.go
index bce557a0..a8a68d55 100644
--- a/pkg/yqlib/operator_has.go
+++ b/pkg/yqlib/operator_has.go
@@ -44,7 +44,7 @@ func hasOperator(d *dataTreeNavigator, context Context, expressionNode *Expressi
 		case yaml.SequenceNode:
 			candidateHasKey := false
 			if wanted.Tag == "!!int" {
-				var number, errParsingInt = strconv.ParseInt(wantedKey, 10, 64) // nolint
+				var number, errParsingInt = strconv.ParseInt(wantedKey, 10, 64)
 				if errParsingInt != nil {
 					return Context{}, errParsingInt
 				}
diff --git a/pkg/yqlib/operators_test.go b/pkg/yqlib/operators_test.go
index 7bd66589..b99d3865 100644
--- a/pkg/yqlib/operators_test.go
+++ b/pkg/yqlib/operators_test.go
@@ -129,7 +129,7 @@ func copyFromHeader(title string, out *os.File) error {
 	if os.IsNotExist(err) {
 		return nil
 	}
-	in, err := os.Open(source) // nolint gosec
+	in, err := os.Open(source)
 	if err != nil {
 		return err
 	}