fix: lint

Author: Antoine Gelloz

Taskfile.yaml

@@ -12,4 +12,4 @@ tasks:
 
   lint:
     cmds:
-      - golangci-lint -v run
+      - golangci-lint -v run --fix

cmd/server.go

@@ -4,24 +4,24 @@ import (
 	"context"
 	"crypto/tls"
 	"fmt"
-	"github.com/gorilla/handlers"
-	"github.com/numary/search/pkg/searchengine"
-	"github.com/numary/search/pkg/searchhttp"
-	"github.com/opensearch-project/opensearch-go"
-	"go.opentelemetry.io/otel/trace"
 	"net/http"
 	"os"
 	"strings"
 
+	"github.com/gorilla/handlers"
 	"github.com/gorilla/mux"
 	"github.com/numary/go-libs/oauth2/oauth2introspect"
 	"github.com/numary/go-libs/sharedauth"
 	"github.com/numary/go-libs/sharedlogging"
 	"github.com/numary/go-libs/sharedotlp/sharedotlptraces"
+	"github.com/numary/search/pkg/searchengine"
+	"github.com/numary/search/pkg/searchhttp"
+	"github.com/opensearch-project/opensearch-go"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 	"go.opentelemetry.io/contrib/instrumentation/github.com/gorilla/mux/otelmux"
+	"go.opentelemetry.io/otel/trace"
 	"go.uber.org/fx"
 )
 

pkg/searchengine/main_test.go

@@ -112,15 +112,6 @@ func insertAccount(t *testing.T, ledgerName, id string, when time.Time, payload
 	})
 }
 
-func insertPayment(t *testing.T, id string, when time.Time, payload interface{}) {
-	insertESDocument(t, id, "PAYMENT",
-		map[string]interface{}{
-			"kind": "PAYMENT",
-			"when": when,
-			"data": payload,
-		})
-}
-
 func TestSearchEngine(t *testing.T) {
 
 	if testing.Verbose() {

pkg/searchhttp/cursor.go

@@ -28,7 +28,7 @@ type cursorTokenInfo struct {
 	SearchAfter []interface{}       `json:"searchAfter"`
 	Ledgers     []string            `json:"ledgers"`
 	Size        uint64              `json:"size"`
-	TermPolicy  string              `json:"termPolicy""`
+	TermPolicy  string              `json:"termPolicy"`
 	Reverse     bool                `json:"reverse"`
 	Terms       []string            `json:"terms"`
 }

pkg/searchhttp/http.go

@@ -18,19 +18,13 @@ import (
 	"github.com/tidwall/gjson"
 )
 
-func HealthHandler() http.HandlerFunc {
-	return func(w http.ResponseWriter, r *http.Request) {
-		w.WriteHeader(http.StatusOK)
-	}
-}
-
 func resolveQuery(r *http.Request) (*cursorTokenInfo, interface{}, error) {
-
 	var (
 		target      string
 		cursorToken string
 		info        *cursorTokenInfo
 	)
+
 	if r.ContentLength > 0 {
 		type resolveQuery struct {
 			Target      string `json:"target"`
@@ -127,6 +121,7 @@ func resolveQuery(r *http.Request) (*cursorTokenInfo, interface{}, error) {
 			}
 		}
 	}
+
 	return info, searchQuery, nil
 }
 
@@ -138,7 +133,10 @@ func Handler(engine searchengine.Engine) http.HandlerFunc {
 			return
 		}
 
-		r.ParseForm()
+		if err := r.ParseForm(); err != nil {
+			http.Error(w, err.Error(), http.StatusBadRequest)
+			return
+		}
 
 		cursor, searchQuery, err := resolveQuery(r)
 		if err != nil {
@@ -206,15 +204,15 @@ func Handler(engine searchengine.Engine) http.HandlerFunc {
 					TermPolicy: qq.TermPolicy,
 					Terms:      qq.Terms,
 				}
-				for _, sort := range qq.Sort {
-					value := gjson.Get(string(item), sort.Key)
+				for _, s := range qq.Sort {
+					value := gjson.Get(string(item), s.Key)
 					nextNti.SearchAfter = append(nextNti.SearchAfter, value.Value())
 				}
 				next = EncodePaginationToken(*nextNti)
 			}
 			previous := ""
 			if cursor != nil && (!reverse || (reverse && hasMore)) {
-				sort := make([]searchengine.Sort, 0)
+				var sort []searchengine.Sort
 				if cursor.Reverse {
 					sort = cursor.Sort
 				} else {
@@ -230,8 +228,8 @@ func Handler(engine searchengine.Engine) http.HandlerFunc {
 					Terms:      qq.Terms,
 				}
 				firstItem := items[0]
-				for _, sort := range qq.Sort {
-					value := gjson.Get(string(firstItem), sort.Key)
+				for _, s := range qq.Sort {
+					value := gjson.Get(string(firstItem), s.Key)
 					previousNti.SearchAfter = append(previousNti.SearchAfter, value.Value())
 				}
 				previous = EncodePaginationToken(*previousNti)