Linter fixes

Author: joshuaspence

.golangci.yaml

@@ -8,6 +8,7 @@ linters:
     # Temporary
     - 'cyclop'
     - 'dupl'
+    - 'err113'
     - 'exhaustruct'
     - 'forbidigo'
     - 'funlen'
@@ -17,28 +18,19 @@ linters:
     - 'gocritic'
     - 'gocyclo'
     - 'godox'
-    - 'goerr113'
-    - 'gomnd'
     - 'gosec'
     - 'lll'
     - 'maintidx'
+    - 'mnd'
     - 'nestif'
     - 'nlreturn'
     - 'paralleltest'
+    - 'perfsprint'
     - 'revive'
     - 'stylecheck'
     - 'varnamelen'
     - 'wrapcheck'
     - 'wsl'
 
     # Deprecated
-    - 'deadcode'
-    - 'exhaustivestruct'
-    - 'golint'
-    - 'ifshort'
-    - 'interfacer'
-    - 'maligned'
-    - 'nosnakecase'
-    - 'scopelint'
-    - 'structcheck'
-    - 'varcheck'
+    - 'exportloopref'

fields/fwupdate.go

@@ -38,7 +38,7 @@ type firmwareUpdateApiResponseEmbeddedFirmwareDataLink struct {
 	Href *url.URL `json:"href"`
 }
 
-func (l firmwareUpdateApiResponseEmbeddedFirmwareDataLink) MarshalJSON() ([]byte, error) {
+func (l *firmwareUpdateApiResponseEmbeddedFirmwareDataLink) MarshalJSON() ([]byte, error) {
 	var href string
 	if l.Href != nil {
 		href = l.Href.String()

fields/main_test.go

@@ -151,7 +151,7 @@ func TestResourceTypes(t *testing.T) {
 
 		err := resource.processJSON(([]byte)(testData))
 
-		assert.Empty(t, err, "No error processing JSON")
+		assert.NoError(t, err, "No error processing JSON")
 		assert.Equal(t, expectation.StructName, resource.StructName)
 		assert.Equal(t, expectation.ResourcePath, resource.ResourcePath)
 		assert.Equal(t, expectation.Types, resource.Types)

fields/version_test.go

@@ -74,10 +74,10 @@ func TestLatestUnifiVersion(t *testing.T) {
 		assert.Contains(query["filter"], firmwareUpdateApiFilter("product", unifiControllerProduct))
 
 		resp, err := json.Marshal(respData)
-		require.NoError(err)
+		assert.NoError(err)
 
 		_, err = rw.Write(resp)
-		require.NoError(err)
+		assert.NoError(err)
 	}))
 	defer server.Close()
 

go.mod

@@ -1,6 +1,7 @@
 module github.com/paultyng/go-unifi
 
-go 1.22
+go 1.22.1
+
 toolchain go1.23.1
 
 require (

unifi/unifi.go

@@ -6,7 +6,6 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"net/http"
 	"net/http/cookiejar"
 	"net/url"
@@ -114,7 +113,7 @@ func (c *Client) setAPIUrlStyle(ctx context.Context) error {
 		return err
 	}
 	defer resp.Body.Close()
-	_, _ = io.Copy(ioutil.Discard, resp.Body)
+	_, _ = io.Copy(io.Discard, resp.Body)
 
 	if resp.StatusCode == http.StatusOK {
 		// the new API returns a 200 for a / request
@@ -226,7 +225,7 @@ func (c *Client) do(ctx context.Context, method, relativeURL string, reqBody int
 	req.Header.Add("Content-Type", "application/json; charset=utf-8")
 
 	if c.csrf != "" {
-		req.Header.Set("X-CSRF-Token", c.csrf)
+		req.Header.Set("X-Csrf-Token", c.csrf)
 	}
 
 	resp, err := c.c.Do(req)
@@ -239,8 +238,8 @@ func (c *Client) do(ctx context.Context, method, relativeURL string, reqBody int
 		return &NotFoundError{}
 	}
 
-	if csrf := resp.Header.Get("x-csrf-token"); csrf != "" {
-		c.csrf = resp.Header.Get("x-csrf-token")
+	if csrf := resp.Header.Get("X-Csrf-Token"); csrf != "" {
+		c.csrf = resp.Header.Get("X-Csrf-Token")
 	}
 
 	if resp.StatusCode != http.StatusOK {