refactor: fix all linter errors

Signed-off-by: Christian Stewart <christian@aperture.us>

Author: paralin

client/client.go

@@ -15,7 +15,7 @@ func New(addr string) *Client {
 }
 
 // Client is a struct used for communicating with a Cayley server through HTTP
-// Deprecated: Client exists for backwards compatability. New code should use
+// Deprecated: Client exists for backwards compatibility. New code should use
 // the updated client github.com/cayleygraph/go-client
 type Client struct {
 	addr string
@@ -68,7 +68,7 @@ type funcCloser struct {
 	closed bool
 }
 
-func (c funcCloser) Close() error {
+func (c *funcCloser) Close() error {
 	if c.closed {
 		return nil
 	}
@@ -102,7 +102,7 @@ func (c *Client) QuadWriter() (quad.WriteCloser, error) {
 		Full:   false,
 		Strict: false,
 	})
-	qw.SetCloser(funcCloser{f: func() error {
+	qw.SetCloser(&funcCloser{f: func() error {
 		pw.Close()
 		return <-errc
 	}})

clog/clog.go

@@ -34,8 +34,6 @@ var logger Logger = &stdlog{
 // SetLogger set the clog logging implementation.
 func SetLogger(l Logger) { logger = l }
 
-var verbosity int
-
 // V returns whether the current clog verbosity is above the specified level.
 func V(level int) bool {
 	if logger == nil {

cmd/cayley/command/health.go

@@ -17,7 +17,7 @@ func NewHealthCmd() *cobra.Command {
 		Short:   "Health check HTTP server",
 		RunE: func(cmd *cobra.Command, args []string) error {
 			if len(args) > 1 {
-				return fmt.Errorf("Too many arguments provided, expected 0 or 1")
+				return fmt.Errorf("too many arguments provided, expected 0 or 1")
 			}
 			address := defaultAddress
 			if len(args) == 1 {

cmd/cayley/command/repl.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"os"
 	"os/signal"
 	"strings"
@@ -81,9 +81,9 @@ func NewQueryCmd() *cobra.Command {
 		RunE: func(cmd *cobra.Command, args []string) error {
 			var querystr string
 			if len(args) == 0 {
-				bytes, err := ioutil.ReadAll(os.Stdin)
+				bytes, err := io.ReadAll(os.Stdin)
 				if err != nil {
-					return fmt.Errorf("error occured while reading from stdin : %s", err)
+					return fmt.Errorf("error occurred while reading from stdin : %s", err)
 				}
 				querystr = string(bytes)
 			} else if len(args) == 1 {

cmd/cayleyimport/cayleyimport.go

@@ -5,7 +5,6 @@ import (
 	"errors"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"net/http"
 	"os"
 	"path/filepath"
@@ -43,7 +42,7 @@ func NewCmd() *cobra.Command {
 			if len(args) == 0 {
 				in := cmd.InOrStdin()
 				if !hasIn(in) {
-					return errors.New("Either provide file to read from or pipe data")
+					return errors.New("either provide file to read from or pipe data")
 				}
 				reader = in
 			} else {
@@ -69,11 +68,12 @@ func NewCmd() *cobra.Command {
 				return err
 			}
 			defer r.Body.Close()
-			body, err := ioutil.ReadAll(r.Body)
+			body, err := io.ReadAll(r.Body)
 			if err != nil {
 				return err
 			}
-			if r.StatusCode == http.StatusOK {
+			switch r.StatusCode {
+			case http.StatusOK:
 				var response struct {
 					Result string `json:"result"`
 					Count  string `json:"count"`
@@ -86,8 +86,8 @@ func NewCmd() *cobra.Command {
 				if !quiet {
 					fmt.Println(response.Result)
 				}
-			} else if r.StatusCode == http.StatusNotFound {
-				return errors.New("Database instance does not support write")
+			case http.StatusNotFound:
+				return errors.New("database instance does not support write")
 			}
 			return nil
 		},

cmd/download_ui/download_ui.go

@@ -49,7 +49,7 @@ func DownloadFile(filepath string, url string) error {
 	defer resp.Body.Close()
 
 	if resp.StatusCode != 200 {
-		return fmt.Errorf("Received %v status code instead of 200 for %v", resp.Status, url)
+		return fmt.Errorf("received %v status code instead of 200 for %v", resp.Status, url)
 	}
 
 	// Create the file

deps.go

@@ -1,5 +1,4 @@
 //go:build deps_only
-// +build deps_only
 
 package cayley
 

examples/hello_bolt/main.go

@@ -3,7 +3,6 @@ package main
 import (
 	"context"
 	"fmt"
-	"io/ioutil"
 	"log"
 	"os"
 
@@ -15,7 +14,7 @@ import (
 
 func main() {
 	// File for your new BoltDB. Use path to regular file and not temporary in the real world
-	tmpdir, err := ioutil.TempDir("", "example")
+	tmpdir, err := os.MkdirTemp("", "example")
 	if err != nil {
 		log.Fatal(err)
 	}

examples/hello_schema/main.go

@@ -3,7 +3,6 @@ package main
 import (
 	"context"
 	"fmt"
-	"io/ioutil"
 	"log"
 	"math/rand"
 	"os"
@@ -22,10 +21,10 @@ import (
 type Person struct {
 	// dummy field to enforce all object to have a <id> <rdf:type> <ex:Person> relation
 	// means nothing for Go itself
-	rdfType struct{} `quad:"@type > ex:Person"`
-	ID      quad.IRI `json:"@id"`     // tag @id is a special one - graph node value will be stored in this field
-	Name    string   `json:"ex:name"` // field name (predicate) may be written as json field name
-	Age     int      `quad:"ex:age"`  // or in a quad tag
+	_    struct{} `quad:"@type > ex:Person"`
+	ID   quad.IRI `json:"@id"`     // tag @id is a special one - graph node value will be stored in this field
+	Name string   `json:"ex:name"` // field name (predicate) may be written as json field name
+	Age  int      `quad:"ex:age"`  // or in a quad tag
 }
 
 type Coords struct {
@@ -57,7 +56,7 @@ func main() {
 	}
 
 	// File for your new BoltDB. Use path to regular file and not temporary in the real world
-	tmpdir, err := ioutil.TempDir("", "example")
+	tmpdir, err := os.MkdirTemp("", "example")
 	checkErr(err)
 
 	defer os.RemoveAll(tmpdir) // clean up

graph/all/all_cgo.go

@@ -1,5 +1,4 @@
 //go:build cgo
-// +build cgo
 
 package all