Merge 2a918ad into 4c7e982

Author: millotp

.github/actions/setup/action.yml

@@ -78,9 +78,8 @@ runs:
       if: ${{ inputs.language == 'go' }}
       shell: bash
       run: |
-        curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.60.3
+        curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/HEAD/install.sh | sh -s -- -b $(go env GOPATH)/bin v2.1.5
         echo "$(go env GOPATH)/bin" >> $GITHUB_PATH
-        go install golang.org/x/tools/cmd/[email protected]
 
     - name: Cache golangci-lint analysis
       if: ${{ inputs.language == 'go' }}

clients/algoliasearch-client-go/.golangci.yml

@@ -1,71 +1,61 @@
-linters-settings:
-  govet:
-    enable-all: true
-    disable:
-      - fieldalignment
-
-  revive:
-    rules:
-      - name: var-naming
-        disabled: true
-
+version: "2"
+run:
+  concurrency: 2
 linters:
-  enable-all: true
-
+  default: all
   disable:
-    - godox
-    - bodyclose
-    - contextcheck
-    - interfacebloat
-    - gci
-    - gosmopolitan
-    - wsl
-    - varnamelen
-    - nlreturn
+    - canonicalheader
+    - containedctx
+    - copyloopvar
+    - cyclop
+    - depguard
+    - dupl
+    - dupword
     - err113
-    - gochecknoglobals
-    - exhaustruct
     - exhaustive
-    - depguard
-    - lll
+    - exhaustruct
     - forbidigo
-    - gochecknoinits
-    - cyclop
-    - errorlint
-    - gomnd
-    - tagliatelle
-    - nilnil
-    - stylecheck
-    - musttag
-    - errchkjson
-    - nonamedreturns
-    - inamedparam
-    - ineffassign
-    - dupword
-    - nestif
-    - goconst
     - funlen
-    - dupl
-    - unparam
+    - gochecknoglobals
     - gocognit
-    - forcetypeassert
-    - wastedassign
+    - goconst
     - gocyclo
-    - maintidx
-    - copyloopvar
+    - inamedparam
     - intrange
-    - canonicalheader
+    - lll
+    - maintidx
     - mnd
+    - nestif
+    - nilnil
+    - nonamedreturns
     - perfsprint
-    - containedctx
-
-    # Deprecated
-    - execinquery
-    - exportloopref
-
-issues:
-  exclude-generated: disable
-
-run:
-  concurrency: 2
-  timeout: 10m
+    - recvcheck
+    - tagliatelle
+    - varnamelen
+  settings:
+    govet:
+      enable-all: true
+      disable:
+        - fieldalignment
+    revive:
+      rules:
+        - name: var-naming
+          disabled: true
+    staticcheck:
+      checks: ["all", "-ST1005"]
+  exclusions:
+    generated: disable
+    presets:
+      - comments
+      - std-error-handling
+formatters:
+  enable:
+    - gofmt
+    - gofumpt
+    - goimports
+    - golines
+  settings:
+    golines:
+      max-len: 150
+  exclusions:
+    generated: disable

clients/algoliasearch-client-go/algolia/debug/debug.go

@@ -30,7 +30,9 @@ func Display(input any) {
 	if !debug {
 		return
 	}
+
 	start := time.Now()
+
 	var msg string
 	switch v := input.(type) {
 	case *http.Request:
@@ -40,6 +42,7 @@ func Display(input any) {
 	default:
 		msg = fmt.Sprintf("do not know how to display %#v", v)
 	}
+
 	Println(msg)
 	fmt.Printf("took %s\n", time.Since(start))
 }
@@ -52,6 +55,7 @@ func Printf(format string, a ...any) {
 	if !debug {
 		return
 	}
+
 	msg := fmt.Sprintf(format, a...)
 	fmt.Printf("> ALGOLIA DEBUG: %s", msg)
 }

clients/algoliasearch-client-go/algolia/debug/utils.go

@@ -16,11 +16,14 @@ func copyReadCloser(r io.ReadCloser) (io.ReadCloser, string) {
 	if r == nil {
 		return nil, ""
 	}
+
 	data, err := io.ReadAll(r)
 	_ = r.Close()
+
 	if err != nil {
 		return nil, ""
 	}
+
 	return io.NopCloser(bytes.NewReader(data)), string(data)
 }
 
@@ -29,10 +32,12 @@ func decodeGzipContent(in string) (string, error) {
 	if err != nil {
 		return in, fmt.Errorf("cannot open content with gzip.Reader: %w", err)
 	}
+
 	out, err := io.ReadAll(gr)
 	if err != nil {
 		return in, fmt.Errorf("cannot read content from gzip.Reader: %w", err)
 	}
+
 	return string(out), nil
 }
 
@@ -43,25 +48,24 @@ func extractBody(body io.ReadCloser, c compression.Compression) (io.ReadCloser,
 
 	reader, content := copyReadCloser(body)
 
-	switch c {
-	case compression.GZIP:
+	if c == compression.GZIP {
 		decodedContent, err := decodeGzipContent(content)
 		if err == nil {
 			content = decodedContent
 		}
-	default:
-		// Do nothing
 	}
 
 	return reader, content
 }
 
 func prettyPrintJSON(input string) string {
 	var b bytes.Buffer
+
 	err := json.Indent(&b, []byte(input), "\t", "  ")
 	if err != nil {
 		return input
 	}
+
 	return strings.TrimSuffix(b.String(), "\n")
 }
 
@@ -88,8 +92,10 @@ func debugRequest(req *http.Request) string {
 		if strings.Contains(strings.ToLower(k), "algolia") {
 			str = strings.Repeat("*", len(str))
 		}
+
 		msg += fmt.Sprintf("\theader=%s:%q\n", k, str)
 	}
+
 	msg += fmt.Sprintf("\tbody=\n\t%s\n", prettyPrintJSON(body))
 
 	return msg

clients/algoliasearch-client-go/algolia/errs/no_more_host_to_try_err.go

@@ -17,14 +17,16 @@ func NewNoMoreHostToTryError(errs ...error) *NoMoreHostToTryError {
 	}
 }
 
-func (e *NoMoreHostToTryError) IntermediateNetworkErrors() []error {
-	return e.intermediateNetworkErrors
+func (n *NoMoreHostToTryError) IntermediateNetworkErrors() []error {
+	return n.intermediateNetworkErrors
 }
 
-func (e *NoMoreHostToTryError) Error() string {
-	if len(e.intermediateNetworkErrors) > 0 {
-		return fmt.Errorf("all hosts have been contacted unsuccessfully, it can either be a server or a network error or wrong appID/key credentials were used. %w", errors.Join(e.intermediateNetworkErrors...)).Error()
+func (n *NoMoreHostToTryError) Error() string {
+	if len(n.intermediateNetworkErrors) > 0 {
+		return fmt.Errorf("all hosts have been contacted unsuccessfully, it can either be a server or a network error or wrong appID/key credentials were used. %w", errors.Join(n.intermediateNetworkErrors...)).
+			Error()
 	}
+
 	return "all hosts have been contacted unsuccessfully, it can either be a server or a network error or wrong appID/key credentials were used. You can use 'ExposeIntermediateNetworkErrors: true' in the config to investigate."
 }
 

clients/algoliasearch-client-go/algolia/transport/configuration.go

@@ -7,13 +7,12 @@ import (
 )
 
 type Configuration struct {
-	AppID  string
-	ApiKey string
-
-	Hosts                           []StatefulHost
+	Requester                       Requester
 	DefaultHeader                   map[string]string
+	AppID                           string
+	APIKey                          string
 	UserAgent                       string
-	Requester                       Requester
+	Hosts                           []StatefulHost
 	ReadTimeout                     time.Duration
 	WriteTimeout                    time.Duration
 	ConnectTimeout                  time.Duration

clients/algoliasearch-client-go/algolia/transport/requester.go

@@ -43,7 +43,11 @@ func DefaultHTTPClient(connectTimeout *time.Duration) *http.Client {
 }
 
 type Requester interface {
-	Request(req *http.Request, timeout time.Duration, connectTimeout time.Duration) (*http.Response, error)
+	Request(
+		req *http.Request,
+		timeout time.Duration,
+		connectTimeout time.Duration,
+	) (*http.Response, error)
 }
 
 type defaultRequester struct {

clients/algoliasearch-client-go/algolia/transport/retry_strategy.go

@@ -28,13 +28,16 @@ type Host struct {
 }
 
 type RetryStrategy struct {
-	sync.RWMutex
 	hosts        []StatefulHost
 	writeTimeout time.Duration
 	readTimeout  time.Duration
+	sync.RWMutex
 }
 
-func newRetryStrategy(hosts []StatefulHost, readTimeout, writeTimeout time.Duration) *RetryStrategy {
+func newRetryStrategy(
+	hosts []StatefulHost,
+	readTimeout, writeTimeout time.Duration,
+) *RetryStrategy {
 	if readTimeout == 0 {
 		readTimeout = DefaultReadTimeout
 	}
@@ -75,7 +78,10 @@ func (s *RetryStrategy) GetTryableHosts(k call.Kind) []Host {
 
 	for _, h := range s.hosts {
 		if !h.isDown && h.accept(k) {
-			hosts = append(hosts, Host{h.scheme, h.host, time.Duration(h.retryCount+1) * baseTimeout})
+			hosts = append(
+				hosts,
+				Host{h.scheme, h.host, time.Duration(h.retryCount+1) * baseTimeout},
+			)
 		}
 	}
 
@@ -86,7 +92,10 @@ func (s *RetryStrategy) GetTryableHosts(k call.Kind) []Host {
 	for _, h := range s.hosts {
 		if h.accept(k) {
 			h.reset()
-			hosts = append(hosts, Host{h.scheme, h.host, time.Duration(h.retryCount+1) * baseTimeout})
+			hosts = append(
+				hosts,
+				Host{h.scheme, h.host, time.Duration(h.retryCount+1) * baseTimeout},
+			)
 		}
 	}
 
@@ -99,16 +108,19 @@ func (s *RetryStrategy) Decide(h Host, code int, err error) Outcome {
 
 	if err == nil && is2xx(code) {
 		s.markUp(h)
+
 		return Success
 	}
 
 	if isTimeoutError(err) {
 		s.markTimeout(h)
+
 		return Retry
 	}
 
-	if !(isZero(code) || is4xx(code) || is2xx(code)) || isNetworkError(err) {
+	if (!isZero(code) && !is4xx(code) && !is2xx(code)) || isNetworkError(err) {
 		s.markDown(h)
+
 		return Retry
 	}
 
@@ -119,6 +131,7 @@ func (s *RetryStrategy) markUp(host Host) {
 	for _, h := range s.hosts {
 		if h.host == host.host {
 			h.markUp()
+
 			return
 		}
 	}
@@ -128,6 +141,7 @@ func (s *RetryStrategy) markTimeout(host Host) {
 	for _, h := range s.hosts {
 		if h.host == host.host {
 			h.markTimeout()
+
 			return
 		}
 	}
@@ -137,6 +151,7 @@ func (s *RetryStrategy) markDown(host Host) {
 	for _, h := range s.hosts {
 		if h.host == host.host {
 			h.markDown()
+
 			return
 		}
 	}
@@ -146,7 +161,8 @@ func isNetworkError(err error) bool {
 	if err == nil {
 		return false
 	}
-	_, ok := err.(net.Error)
+
+	_, ok := err.(net.Error) //nolint:errorlint
 	// We need to ensure that the error is a net.Error but not a
 	// context.DeadlineExceeded error (which is actually a net.Error), because
 	// we do not want to consider context.DeadlineExceeded as an error.
@@ -157,6 +173,7 @@ func isTimeoutError(err error) bool {
 	if err == nil {
 		return false
 	}
+
 	return strings.Contains(err.Error(), context.DeadlineExceeded.Error())
 }