Update make test to run the latest golangci-lint version through go run

Author: Aaron Godin

.golangci.toml

@@ -1,9 +1,6 @@
 [run]
 timeout = "10m"
 
-[linters-settings.golint]
-min-confidence = 3
-
 [linters-settings.goconst]
 min-len = 5
 min-occurrences = 5
@@ -13,14 +10,13 @@ disable-all = true
 enable = [
   "bodyclose",
   "deadcode",
-  "depguard",
   "dogsled",
   "errcheck",
   "gochecknoinits",
   "goconst",
   "gocritic",
   "goimports",
-  "golint",
+  "revive",
   "goprintffuncname",
   "gosec",
   "gosimple",
@@ -81,3 +77,4 @@ text = "404"
 [[issues.exclude-rules]]
 linters = ["misspell"]
 text = "Unknwon` is a misspelling of `Unknown"
+

Makefile

@@ -7,7 +7,6 @@ drone:
 
 test:
 	go version
-	golangci-lint --version
-	golangci-lint run ./...
+	go run github.com/golangci/golangci-lint/cmd/golangci-lint@latest run ./...
 	go test -cover -race -vet all -mod readonly ./...
 

api_key_test.go

@@ -22,7 +22,7 @@ const (
 			"role": "Admin",
 			"expiration": "2021-10-30T10:52:03+03:00"
 		}
-	]`  //#nosec
+	]` //#nosec
 )
 
 func TestCreateAPIKey(t *testing.T) {

client.go

@@ -5,7 +5,6 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"log"
 	"net/http"
 	"net/url"
@@ -112,7 +111,7 @@ func (c *Client) request(method, requestPath string, query url.Values, body []by
 		}
 
 		// read the body (even on non-successful HTTP status codes), as that's what the unit tests expect
-		bodyContents, err = ioutil.ReadAll(resp.Body)
+		bodyContents, err = io.ReadAll(resp.Body)
 		resp.Body.Close() //nolint:errcheck
 
 		// if there was an error reading the body, try again

client_test.go

@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"encoding/json"
 	"errors"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"net/http/httptest"
 	"net/url"
@@ -195,7 +195,7 @@ func TestClient_requestWithRetries(t *testing.T) {
 
 		try++
 
-		got, err := ioutil.ReadAll(r.Body)
+		got, err := io.ReadAll(r.Body)
 		if err != nil {
 			t.Errorf("retry %d: unexpected error reading body: %v", try, err)
 		}

cloud_plugin.go

@@ -3,7 +3,7 @@ package gapi
 import (
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 )
 
@@ -74,7 +74,7 @@ func (c *Client) IsCloudPluginInstalled(stackSlug string, pluginSlug string) (bo
 		if resp.StatusCode == http.StatusNotFound {
 			return false, nil
 		}
-		bodyContents, err := ioutil.ReadAll(resp.Body)
+		bodyContents, err := io.ReadAll(resp.Body)
 		if err != nil {
 			return false, err
 		}

datasource.go

@@ -173,7 +173,7 @@ func JSONDataWithHeaders(jsonData, secureJSONData map[string]interface{}, header
 	for name, value := range headers {
 		jsonData[fmt.Sprintf("httpHeaderName%d", idx)] = name
 		secureJSONData[fmt.Sprintf("httpHeaderValue%d", idx)] = value
-		idx += 1
+		idx++
 	}
 
 	return jsonData, secureJSONData

resource_permissions.go

@@ -13,10 +13,8 @@ type ResourcePermission struct {
 	IsServiceAccount bool     `json:"isServiceAccount"`
 	UserID           int64    `json:"userId,omitempty"`
 	UserLogin        string   `json:"userLogin,omitempty"`
-	UserAvatarURL    string   `json:"userAvatarUrl,omitempty"`
 	Team             string   `json:"team,omitempty"`
 	TeamID           int64    `json:"teamId,omitempty"`
-	TeamAvatarUrl    string   `json:"teamAvatarUrl,omitempty"`
 	BuiltInRole      string   `json:"builtInRole,omitempty"`
 	Actions          []string `json:"actions"`
 	Permission       string   `json:"permission"`

service_account_test.go

@@ -74,7 +74,7 @@ const (
 			"secondsUntilExpiration": 0,
 			"hasExpired": false
 		}
-	]`  //#nosec
+	]` //#nosec
 )
 
 func TestCreateServiceAccountToken(t *testing.T) {

slo.go

@@ -6,7 +6,7 @@ import (
 	"fmt"
 )
 
-var sloPath string = "/api/plugins/grafana-slo-app/resources/v1/slo"
+var sloPath = "/api/plugins/grafana-slo-app/resources/v1/slo"
 
 type Slos struct {
 	Slos []Slo `json:"slos"`
@@ -205,9 +205,5 @@ func (c *Client) UpdateSlo(uuid string, slo Slo) error {
 		return err
 	}
 
-	if err := c.request("PUT", path, nil, data, nil); err != nil {
-		return err
-	}
-
-	return nil
+	return c.request("PUT", path, nil, data, nil)
 }