go: upgrade to Go 1.26.4 and run go fix ./...

Author: ggilmore

.drone.yml

@@ -6,21 +6,21 @@ name: checkup
 
 steps:
 - name: test-mysql
-  image: golang:1.14
+  image: golang:1.26.4
   pull: always
   commands:
     - make test-mysql
     - make build-mysql
 
 - name: test-postgres
-  image: golang:1.14
+  image: golang:1.26.4
   pull: always
   commands:
     - make test-postgres
     - make build-postgres
 
 - name: test-sqlite3
-  image: golang:1.14
+  image: golang:1.26.4
   pull: always
   commands:
     - make test-sqlite3

.travis.yml

@@ -1,4 +1,4 @@
 language: go
 
 go:
-- 1.14
+- 1.26.4

Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.14-alpine as builder
+FROM golang:1.26.4-alpine as builder
 
 ENV CGO_ENABLED=0
 

check/exec/exec_test.go

@@ -5,7 +5,7 @@ import (
 )
 
 func TestChecker(t *testing.T) {
-	assert := func(ok bool, format string, args ...interface{}) {
+	assert := func(ok bool, format string, args ...any) {
 		if !ok {
 			t.Errorf(format, args...)
 		}

check/http/http.go

@@ -3,7 +3,8 @@ package http
 import (
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
+	"io"
+
 	"net"
 	"net/http"
 	"strings"
@@ -199,7 +200,7 @@ func (c Checker) checkDown(resp *http.Response) error {
 	if c.MustContain == "" && c.MustNotContain == "" {
 		return nil
 	}
-	bodyBytes, err := ioutil.ReadAll(resp.Body)
+	bodyBytes, err := io.ReadAll(resp.Body)
 	if err != nil {
 		return fmt.Errorf("reading response body: %w", err)
 	}

check/tcp/tcp.go

@@ -6,7 +6,8 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"io/ioutil"
+	"os"
+
 	"net"
 	"time"
 
@@ -109,7 +110,7 @@ func (c Checker) doChecks() types.Attempts {
 			var tlsConfig tls.Config
 			tlsConfig.InsecureSkipVerify = c.TLSSkipVerify
 			if c.TLSCAFile != "" {
-				rootPEM, err := ioutil.ReadFile(c.TLSCAFile)
+				rootPEM, err := os.ReadFile(c.TLSCAFile)
 				if err != nil || rootPEM == nil {
 					return nil, errReadingRootCert
 				}

check/tls/tls.go

@@ -5,7 +5,8 @@ import (
 	"crypto/x509"
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
+	"os"
+
 	"net"
 	"time"
 
@@ -18,11 +19,11 @@ const Type = "tls"
 // Checker implements a Checker for TLS endpoints.
 //
 // TODO: Implement more checks on the certificate and TLS configuration.
-//  - Cipher suites
-//  - Protocol versions
-//  - OCSP stapling
-//  - Multiple SNIs
-//  - Other things that you might see at SSL Labs or other TLS health checks
+//   - Cipher suites
+//   - Protocol versions
+//   - OCSP stapling
+//   - Multiple SNIs
+//   - Other things that you might see at SSL Labs or other TLS health checks
 type Checker struct {
 	// Name is the name of the endpoint.
 	Name string `json:"endpoint_name"`
@@ -92,7 +93,7 @@ func (c Checker) Check() (types.Result, error) {
 			c.tlsConfig.RootCAs = x509.NewCertPool()
 		}
 		for _, fname := range c.TrustedRoots {
-			pemData, err := ioutil.ReadFile(fname)
+			pemData, err := os.ReadFile(fname)
 			if err != nil {
 				return types.Result{}, fmt.Errorf("error loading file: %w", err)
 			}

check/tls/tls_test.go

@@ -130,7 +130,7 @@ func TestChecker(t *testing.T) {
 
 func makeSelfSignedCert(hostname, keyType string, validity time.Duration) (tls.Certificate, error) {
 	// start by generating private key
-	var privKey interface{}
+	var privKey any
 	var err error
 	switch keyType {
 	case "", "ec256":
@@ -168,7 +168,7 @@ func makeSelfSignedCert(hostname, keyType string, validity time.Duration) (tls.C
 	}
 	cert.DNSNames = append(cert.DNSNames, hostname)
 
-	publicKey := func(privKey interface{}) interface{} {
+	publicKey := func(privKey any) any {
 		switch k := privKey.(type) {
 		case *rsa.PrivateKey:
 			return &k.PublicKey

checkup.go

@@ -30,7 +30,7 @@ type Checkup struct {
 	// Useful if wanting to perform distributed check
 	// "at the same time" even if they might actually
 	// be a few milliseconds or seconds apart.
-	Timestamp time.Time `json:"timestamp,omitempty"`
+	Timestamp time.Time `json:"timestamp"`
 
 	// Storage is the storage mechanism for saving the
 	// results of checks. Required if calling Store().
@@ -148,7 +148,7 @@ func (c Checkup) MarshalJSON() ([]byte, error) {
 	// handling; unfortunately this has to mimic c's definition.
 	easy := struct {
 		ConcurrentChecks int       `json:"concurrent_checks,omitempty"`
-		Timestamp        time.Time `json:"timestamp,omitempty"`
+		Timestamp        time.Time `json:"timestamp"`
 	}{
 		ConcurrentChecks: c.ConcurrentChecks,
 		Timestamp:        c.Timestamp,
@@ -175,7 +175,7 @@ func (c Checkup) MarshalJSON() ([]byte, error) {
 			if err != nil {
 				return result, err
 			}
-			chb = []byte(fmt.Sprintf(`{"type":"%s",%s`, ch.Type(), string(chb[1:])))
+			chb = fmt.Appendf(nil, `{"type":"%s",%s`, ch.Type(), string(chb[1:]))
 			checkers = append(checkers, chb)
 		}
 
@@ -192,7 +192,7 @@ func (c Checkup) MarshalJSON() ([]byte, error) {
 		if err != nil {
 			return result, err
 		}
-		sb = []byte(fmt.Sprintf(`{"type":"%s",%s`, c.Storage.Type(), string(sb[1:])))
+		sb = fmt.Appendf(nil, `{"type":"%s",%s`, c.Storage.Type(), string(sb[1:]))
 		wrap("storage", sb)
 	}
 
@@ -205,7 +205,7 @@ func (c Checkup) MarshalJSON() ([]byte, error) {
 				return result, err
 			}
 
-			chb = []byte(fmt.Sprintf(`{"type":"%s",%s`, ch.Type(), string(chb[1:])))
+			chb = fmt.Appendf(nil, `{"type":"%s",%s`, ch.Type(), string(chb[1:]))
 			checkers = append(checkers, chb)
 		}
 

checkup_test.go

@@ -3,7 +3,8 @@ package checkup
 import (
 	"bytes"
 	"errors"
-	"io/ioutil"
+	"os"
+
 	"sync"
 	"testing"
 	"time"
@@ -182,7 +183,7 @@ func TestJSON(t *testing.T) {
 		testConfig = "testdata/config.json"
 	)
 
-	jsonBytes, err := ioutil.ReadFile(testConfig)
+	jsonBytes, err := os.ReadFile(testConfig)
 	if err != nil {
 		t.Fatalf("Error reading config file: %s", testConfig)
 	}