Merge pull request #211 from haydenhoang/fix-test

fix brittle api call abort request test

Author: kishorenc

.github/workflows/golangci-lint.yml

@@ -27,19 +27,7 @@ jobs:
         with:
           go-version: '1.22'
 
-          
-      - name: Install dependencies
-        run: |
-          go mod download
-          go install github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen@latest
-          
-      - name: Generate API code
-        run: go generate ./...
-          
-      - name: Clean module cache
-        run: go clean -modcache
-        
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v6
+        uses: golangci/golangci-lint-action@v8
         with:
-          version: v1.60
+          version: v2.1

.golangci.yml

@@ -1,47 +1,56 @@
+version: "2"
 linters:
   enable:
-    - dogsled
     - copyloopvar
+    - dogsled
     - funlen
     - gocognit
     - goconst
     - gocritic
     - gocyclo
-    - gofmt
-    - goimports
     - gosec
     - misspell
     - nestif
     - prealloc
-    # - unconvert
-    - unparam
     - revive
-
-linters-settings:
-  # govet:
-  #   enable:
-  #     - fieldalignment
-  revive:
+    - unparam
+  settings:
+    revive:
+      rules:
+        - name: var-naming
+          arguments:
+            - - ID
+          severity: warning
+          exclude:
+            - ""
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
     rules:
-        # https://github.com/mgechev/revive/blob/master/RULES_DESCRIPTIONS.md#var-naming
-      - name: var-naming
-        severity: warning
-        exclude: [""]
-        arguments:
-          - ["ID"] # AllowList
-
-run:
-  timeout: 3m
-
-issues:
-  exclude-rules:
-    - linters:
-        - gosec
-      text: "G404"
-    - linters:
-        - funlen
-      path: _test\.go
-    - linters:
-        - errcheck
-      path: _test\.go
-
+      - linters:
+          - gosec
+        text: G404
+      - linters:
+          - funlen
+        path: _test\.go
+      - linters:
+          - errcheck
+        path: _test\.go
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
+formatters:
+  enable:
+    - gofmt
+    - goimports
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$

typesense/api_call_test.go

@@ -374,6 +374,8 @@ func TestApiCallCanAbortRequest(t *testing.T) {
 		func(_ http.ResponseWriter, r *http.Request) {
 			appendHistory(&requestURLHistory, r)
 			cancel()
+			// block until the client closes the connection
+			<-r.Context().Done()
 		},
 		func(_ http.ResponseWriter, r *http.Request) {
 			appendHistory(&requestURLHistory, r)

typesense/document.go

@@ -29,7 +29,7 @@ func (d *document[T]) Retrieve(ctx context.Context) (resp T, err error) {
 	if err != nil {
 		return resp, err
 	}
-	if !(strings.Contains(response.Header.Get("Content-Type"), "json") && response.StatusCode == 200) {
+	if !strings.Contains(response.Header.Get("Content-Type"), "json") || response.StatusCode != 200 {
 		body, _ := io.ReadAll(response.Body)
 		response.Body.Close()
 		return resp, &HTTPError{Status: response.StatusCode, Body: body}
@@ -47,7 +47,7 @@ func (d *document[T]) Update(ctx context.Context, document any, params *api.Docu
 	if err != nil {
 		return resp, err
 	}
-	if !(strings.Contains(response.Header.Get("Content-Type"), "json") && response.StatusCode == 200) {
+	if !strings.Contains(response.Header.Get("Content-Type"), "json") || response.StatusCode != 200 {
 		body, _ := io.ReadAll(response.Body)
 		response.Body.Close()
 		return resp, &HTTPError{Status: response.StatusCode, Body: body}
@@ -65,7 +65,7 @@ func (d *document[T]) Delete(ctx context.Context) (resp T, err error) {
 	if err != nil {
 		return resp, err
 	}
-	if !(strings.Contains(response.Header.Get("Content-Type"), "json") && response.StatusCode == 200) {
+	if !strings.Contains(response.Header.Get("Content-Type"), "json") || response.StatusCode != 200 {
 		body, _ := io.ReadAll(response.Body)
 		response.Body.Close()
 		return resp, &HTTPError{Status: response.StatusCode, Body: body}