Fixing all errors, linting

HexmosTech · Jul 20, 2023 · 312d5bd · 312d5bd
1 parent 2b505fc
commit 312d5bd
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/parser/jsonparser.go b/parser/jsonparser.go
@@ -25,7 +25,8 @@ func (p *Lama2Parser) PrimitiveType() (*gabs.Container, error) {
 
 // CustomPairMerge uses a gabs feature to deal with merge conflicts.
 // More here: https://github.com/HexmosTech/gabs/blob/master/gabs.go#L511
-func CustomPairMerge(_, source interface{}) interface{} {
+//nolint:all
+func CustomPairMerge(destination, source interface{}) interface{} { 
 	return source
 }
 

diff --git a/preprocess/expandvar.go b/preprocess/expandvar.go
@@ -27,6 +27,7 @@ func Expand(s string, vm *goja.Runtime, mapping map[string]string) string {
 			}
 			buf = append(buf, s[i:j]...)
 			name, w := getShellName(s[j+1:])
+			//nolint:all
 			if name == "" && w > 0 {
 				// Encountered invalid syntax; eat the
 				// characters.

diff --git a/preprocess/preprocess.go b/preprocess/preprocess.go
@@ -73,7 +73,7 @@ func debugOp(str string) {
 func escapeString(input string) string {
 	output, err := json.Marshal(input)
 	if err != nil {
-		// handle error
+		log.Error().Str("Error marshaling JSON:","escapeString()")
 	}
 	return string(output)
 }

diff --git a/tests/lama2_test.go b/tests/lama2_test.go
@@ -63,9 +63,6 @@ func PerformParserMatch(text string) (*gabs.Container, error) {
 	got, e := p.Parse(text)
 	if e == nil {
 		log.Debug().Str("Got", got.String()).Msg("")
-	} else {
-		// t.Errorf("Error not expected")
-		// fmt.Println(e)
 	}
 	return got, e
 }