Merge a3afed9 into 54f9383

.github/workflows/golangci-lint.yml

@@ -6,7 +6,11 @@ on:
     branches:
       - master
       - main
+      - v*
   pull_request:
+permissions:
+  contents: read
+  pull-requests: read
 jobs:
   golangci:
     name: lint
@@ -17,7 +21,7 @@ jobs:
         uses: golangci/golangci-lint-action@v2
         with:
           # Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version
-          version: v1.29
+          version: v1.43.0
 
           # Optional: working directory, useful for monorepos
           # working-directory: somedir
@@ -26,7 +30,7 @@ jobs:
           # args: --issues-exit-code=0 --timeout=5m
 
           # Optional: show only new issues if it's a pull request. The default value is `false`.
-          only-new-issues: true
+          # only-new-issues: true
 
           # Optional: if set to true then the action will use pre-installed Go.
           # skip-go-installation: true

arborist/response.go

@@ -5,10 +5,6 @@ import (
 	"net/http"
 )
 
-type responseJSON interface {
-	write(w http.ResponseWriter, r *http.Request) error
-}
-
 type jsonResponse struct {
 	content interface{}
 	code    int

arborist/server_test.go

@@ -319,10 +319,13 @@ func TestServer(t *testing.T) {
 
 	getTagForResource := func(path string) string {
 		var tags []string
-		db.Select(&tags, "SELECT tag FROM resource WHERE path = $1", arborist.FormatPathForDb(path))
+		err := db.Select(&tags, "SELECT tag FROM resource WHERE path = $1", arborist.FormatPathForDb(path))
 		if len(tags) == 0 {
 			return ""
 		}
+		if err != nil {
+			return err
+		}
 		return tags[0]
 	}
 

arborist/sql.go

@@ -66,7 +66,7 @@ func transactify(db *sqlx.DB, call func(tx *sqlx.Tx) *ErrorResponse) *ErrorRespo
 	errResponse := call(tx)
 	if errResponse != nil {
 		errResponse.log.Info("rolling back transaction")
-		tx.Rollback()
+		_ = tx.Rollback()
 		return errResponse
 	}
 	err = tx.Commit()