Add golangci and update go version in workflows

.github/workflows/coverage.yml

@@ -19,7 +19,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.17
+          go-version: 1.19
 
       - name: Run unit tests and coverage test
         id: test-coverage
@@ -62,4 +62,3 @@ jobs:
               repo: context.repo.repo,
               body: output
             })
-

.github/workflows/gochecks.yml

@@ -17,22 +17,16 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v2
         with:
-          go-version: '1.17'
+          go-version: '1.19'
 
       - name: Install dependencies
         run: |
           go version
-          go get -u golang.org/x/lint/golint
+          go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.49.0
 
-      - name: Run Lint
+      - name: Run golangci-lint
         run: |
-          golint_files=$(golint .)
-          if [[ -n ${golint_files} ]]; then
-              echo 'fix the following linting errors:'
-              echo "${golint_files}"
-              exit 1
-          fi
-          exit 0
+          golangci-lint run ./...
 
   Go-Fmt:
     runs-on: ubuntu-latest
@@ -42,7 +36,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v2
         with:
-          go-version: '1.17'
+          go-version: '1.19'
 
       - name: Run fmt
         run: |
@@ -53,4 +47,3 @@ jobs:
               exit 1
           fi
           exit 0
-

.github/workflows/releaser.yml

@@ -53,7 +53,7 @@ jobs:
         name: Set up Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.17
+          go-version: 1.19
       -
         name: Run GoReleaser
         uses: goreleaser/goreleaser-action@v2

govultr.go

@@ -6,7 +6,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"net/url"
 	"strings"
@@ -23,12 +23,6 @@ const (
 	retryLimit  = 3
 )
 
-// APIKey contains a users API Key for interacting with the API
-type APIKey struct {
-	// API Key
-	key string
-}
-
 // RequestBody is used to create JSON bodies for one off calls
 type RequestBody map[string]interface{}
 
@@ -177,7 +171,7 @@ func (c *Client) DoWithContext(ctx context.Context, r *http.Request, data interf
 
 	defer res.Body.Close()
 
-	body, err := ioutil.ReadAll(res.Body)
+	body, err := io.ReadAll(res.Body)
 	if err != nil {
 		return err
 	}
@@ -236,7 +230,7 @@ func (c *Client) vultrErrorHandler(resp *http.Response, err error, numTries int)
 		return nil, fmt.Errorf("gave up after %d attempts, last error unavailable (resp == nil)", numTries)
 	}
 
-	buf, err := ioutil.ReadAll(resp.Body)
+	buf, err := io.ReadAll(resp.Body)
 	if err != nil {
 		return nil, fmt.Errorf("gave up after %d attempts, last error unavailable (error reading response body: %v)", numTries, err)
 	}

govultr_test.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"net/http/httptest"
 	"net/http/httputil"
@@ -141,7 +141,9 @@ func TestClient_DoWithContextError(t *testing.T) {
 				panicked = fmt.Sprint(err)
 			}
 		}()
-		client.DoWithContext(context.Background(), req, nil)
+		if err := client.DoWithContext(context.Background(), req, nil); err != nil {
+			t.Errorf("dowithcontext error: %s", err)
+		}
 	}()
 	if panicked != "" {
 		t.Errorf("unexpected panic: %s", panicked)
@@ -162,7 +164,7 @@ func TestClient_NewRequest(t *testing.T) {
 		t.Errorf("NewRequest(%v) URL = %v, expected %v", in, req.URL, out)
 	}
 
-	body, _ := ioutil.ReadAll(req.Body)
+	body, _ := io.ReadAll(req.Body)
 
 	if string(body) != outRequest {
 		t.Errorf("NewRequest(%v)Body = %v, expected %v", inRequest, string(body), outRequest)

instance.go

@@ -294,9 +294,7 @@ type ReinstallReq struct {
 
 // Create will create the server with the given parameters
 func (i *InstanceServiceHandler) Create(ctx context.Context, instanceReq *InstanceCreateReq) (*Instance, error) {
-	uri := fmt.Sprintf("%s", instancePath)
-
-	req, err := i.client.NewRequest(ctx, http.MethodPost, uri, instanceReq)
+	req, err := i.client.NewRequest(ctx, http.MethodPost, instancePath, instanceReq)
 	if err != nil {
 		return nil, err
 	}

instance_test.go

@@ -2,7 +2,7 @@ package govultr
 
 import (
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"reflect"
 	"testing"
@@ -79,7 +79,7 @@ func TestServerServiceHandler_RestoreSnapshot(t *testing.T) {
 	defer teardown()
 
 	mux.HandleFunc("/v2/instances/14b3e7d6-ffb5-4994-8502-57fcd9db3b33/restore", func(writer http.ResponseWriter, request *http.Request) {
-		body, err := ioutil.ReadAll(request.Body)
+		body, err := io.ReadAll(request.Body)
 		if err != nil || len(body) == 0 {
 			http.Error(writer, "can't read body", http.StatusBadRequest)
 			return
@@ -363,7 +363,7 @@ func TestServerServiceHandler_GetBandwidth(t *testing.T) {
 					"outgoing_bytes": 3084731
 				}
 			}
-		}		
+		}
 		`
 		fmt.Fprint(writer, response)
 	})
@@ -758,7 +758,7 @@ func TestServerServiceHandler_List(t *testing.T) {
 					"next":"thisismycusror",
 					"prev":""
 				}
-			}			
+			}
 		}`
 		fmt.Fprint(writer, response)
 	})

kubernetes_test.go

@@ -49,7 +49,7 @@ func TestKubernetesHandler_CreateCluster(t *testing.T) {
         ]
     }
 }`
-		fmt.Fprintf(writer, response)
+		fmt.Fprint(writer, response)
 	})
 
 	createReq := &ClusterReq{
@@ -149,7 +149,7 @@ func TestKubernetesHandler_GetCluster(t *testing.T) {
         ]
     }
 }`
-		fmt.Fprintf(writer, response)
+		fmt.Fprint(writer, response)
 	})
 
 	vke, err := client.Kubernetes.GetCluster(ctx, "014da059-21e3-47eb-acb5-91bf697c31aa")
@@ -207,7 +207,7 @@ func TestKubernetesHandler_ListClusters(t *testing.T) {
 	setup()
 	defer teardown()
 
-	mux.HandleFunc(fmt.Sprintf("%s", vkePath), func(writer http.ResponseWriter, request *http.Request) {
+	mux.HandleFunc(vkePath, func(writer http.ResponseWriter, request *http.Request) {
 		response := `{
     "vke_clusters": [{
         "id": "014da059-21e3-47eb-acb5-91bf697c31aa",
@@ -252,7 +252,7 @@ func TestKubernetesHandler_ListClusters(t *testing.T) {
         }
     }
 }`
-		fmt.Fprintf(writer, response)
+		fmt.Fprint(writer, response)
 	})
 
 	vke, meta, err := client.Kubernetes.ListClusters(ctx, nil)
@@ -389,7 +389,7 @@ func TestKubernetesHandler_CreateNodePool(t *testing.T) {
         ]
     }
 }`
-		fmt.Fprintf(writer, response)
+		fmt.Fprint(writer, response)
 	})
 
 	createReq := &NodePoolReq{
@@ -463,7 +463,7 @@ func TestKubernetesHandler_GetNodePool(t *testing.T) {
         ]
     }
 }`
-		fmt.Fprintf(writer, response)
+		fmt.Fprint(writer, response)
 	})
 
 	np, err := client.Kubernetes.GetNodePool(ctx, "1", "2")
@@ -538,7 +538,7 @@ func TestKubernetesHandler_ListNodePools(t *testing.T) {
         }
     }
 }`
-		fmt.Fprintf(writer, response)
+		fmt.Fprint(writer, response)
 	})
 
 	np, meta, err := client.Kubernetes.ListNodePools(ctx, "1", nil)
@@ -621,7 +621,7 @@ func TestKubernetesHandler_UpdateNodePool(t *testing.T) {
     ]
   }
 }`
-		fmt.Fprintf(writer, response)
+		fmt.Fprint(writer, response)
 	})
 	update := NodePoolReqUpdate{NodeQuantity: 1}
 	response, err := client.Kubernetes.UpdateNodePool(ctx, "1", "2", &update)
@@ -681,7 +681,7 @@ func TestKubernetesHandler_DeleteNodePoolInstance(t *testing.T) {
 	setup()
 	defer teardown()
 	path := fmt.Sprintf("%s/%s/node-pools/%s/nodes/%s", vkePath, "1", "2", "3")
-	mux.HandleFunc(fmt.Sprintf(path), func(writer http.ResponseWriter, request *http.Request) {
+	mux.HandleFunc(path, func(writer http.ResponseWriter, request *http.Request) {
 		fmt.Fprint(writer)
 	})
 
@@ -695,7 +695,7 @@ func TestKubernetesHandler_RecycleNodePoolInstance(t *testing.T) {
 	setup()
 	defer teardown()
 	path := fmt.Sprintf("%s/%s/node-pools/%s/nodes/%s/recycle", vkePath, "1", "2", "3")
-	mux.HandleFunc(fmt.Sprintf(path), func(writer http.ResponseWriter, request *http.Request) {
+	mux.HandleFunc(path, func(writer http.ResponseWriter, request *http.Request) {
 		fmt.Fprint(writer)
 	})
 
@@ -709,7 +709,7 @@ func TestKubernetesHandler_GetKubeConfig(t *testing.T) {
 	setup()
 	defer teardown()
 	path := fmt.Sprintf("%s/%s/config", vkePath, "1")
-	mux.HandleFunc(fmt.Sprintf(path), func(writer http.ResponseWriter, request *http.Request) {
+	mux.HandleFunc(path, func(writer http.ResponseWriter, request *http.Request) {
 		response := `{"kube_config": "config="}`
 		fmt.Fprint(writer, response)
 	})
@@ -736,7 +736,7 @@ func TestKubernetesHandler_GetVersions(t *testing.T) {
 	setup()
 	defer teardown()
 	path := "/v2/kubernetes/versions"
-	mux.HandleFunc(fmt.Sprintf(path), func(writer http.ResponseWriter, request *http.Request) {
+	mux.HandleFunc(path, func(writer http.ResponseWriter, request *http.Request) {
 		response := `{"versions": ["v1.20.0+1"]}`
 		fmt.Fprint(writer, response)
 	})
@@ -763,7 +763,7 @@ func TestKubernetesHandler_GetUpgrades(t *testing.T) {
 	setup()
 	defer teardown()
 	path := fmt.Sprintf("%s/%s/available-upgrades", vkePath, "1")
-	mux.HandleFunc(fmt.Sprintf(path), func(writer http.ResponseWriter, request *http.Request) {
+	mux.HandleFunc(path, func(writer http.ResponseWriter, request *http.Request) {
 		response := `{"available_upgrades": ["v1.20.0+1"]}`
 		fmt.Fprint(writer, response)
 	})

load_balancer_test.go

@@ -59,7 +59,7 @@ func TestLoadBalancerHandler_List(t *testing.T) {
 							"source": "0.0.0.0/0",
 							"ip_type": "v4"
 						}
-					],					
+					],
 					"instances": [
 						"12345"
 					]
@@ -74,7 +74,7 @@ func TestLoadBalancerHandler_List(t *testing.T) {
 			}
 		}
 		`
-		fmt.Fprintf(writer, response)
+		fmt.Fprint(writer, response)
 	})
 
 	list, meta, err := client.LoadBalancer.List(ctx, nil)
@@ -214,14 +214,14 @@ func TestLoadBalancerHandler_Get(t *testing.T) {
 						"source": "0.0.0.0/0",
 						"ip_type": "v4"
 					}
-				], 				
+				],
 				"instances": [
 					"12345"
 				]
 			}
 		}
 		`
-		fmt.Fprintf(writer, response)
+		fmt.Fprint(writer, response)
 	})
 
 	info, err := client.LoadBalancer.Get(ctx, "1317575")
@@ -307,7 +307,7 @@ func TestLoadBalancerHandler_ListForwardingRules(t *testing.T) {
 			}
 		}
 		`
-		fmt.Fprintf(writer, response)
+		fmt.Fprint(writer, response)
 	})
 
 	list, meta, err := client.LoadBalancer.ListForwardingRules(ctx, "12345", nil)
@@ -371,7 +371,7 @@ func TestLoadBalancerHandler_CreateForwardingRule(t *testing.T) {
 			}
 		}
 		`
-		fmt.Fprintf(writer, response)
+		fmt.Fprint(writer, response)
 	})
 
 	rule := &ForwardingRule{
@@ -452,14 +452,14 @@ func TestLoadBalancerHandler_Create(t *testing.T) {
 							"source": "0.0.0.0/0",
 							"ip_type": "v4"
 						}
-					], 						
+					],
 					"instances": [
 						"1234"
 					]
 				}
 		}
 		`
-		fmt.Fprintf(writer, response)
+		fmt.Fprint(writer, response)
 	})
 
 	lbCreate := &LoadBalancerReq{

network_test.go

@@ -85,7 +85,7 @@ func TestNetworkServiceHandler_List(t *testing.T) {
 			}]
 		}
 		`
-		fmt.Fprintf(writer, response)
+		fmt.Fprint(writer, response)
 	})
 
 	networks, _, err := client.Network.List(ctx, nil)