added reboot node ability and updated several outdated files

.gitlab-ci.yml

@@ -11,7 +11,7 @@ stages:
 
 analyze:lint:
   stage: analyze
-  image: golangci/golangci-lint:v1.45
+  image: golangci/golangci-lint:v1.57
   script:
     - golangci-lint run -v
   tags:
@@ -27,7 +27,7 @@ lint:golint:
 lint:vet:
   stage: lint
   script:
-    - ci/vet.sh
+    - go vet ./...
   tags:
     - k8s-tbk
 
@@ -41,7 +41,7 @@ lint:modtidy:
 test:go:
   stage: test
   script:
-    - ci/test.sh
+    - go test ./...
   tags:
     - k8s-tbk
 

.golangci.yml

@@ -19,19 +19,58 @@ linters-settings:
   goconst:
     min-len: 3
     min-occurrences: 2
-  depguard: {}
+  depguard:
+    rules:
+      Main:
+        files:
+          - "!**/internal/**/*.go"
+          - "$all"
+          - "!$test"
+        allow:
+          - "$gostd"
+          - github.com/transip/gotransip/v6
+          - github.com/transip/gotransip/v6/rest
+          - github.com/transip/gotransip/v6/repository
+          - github.com/transip/gotransip/v6/vps
+      Internal:
+        files:
+          - "**/internal/**/*.go"
+        allow:
+          - "$gostd"
+          - github.com/transip/gotransip/v6
+          - github.com/transip/gotransip/v6/rest
+          - github.com/transip/gotransip/v6/repository
+          - github.com/transip/gotransip/v6/vps
+          - github.com/stretchr/testify/assert
+          - github.com/stretchr/testify/require
+      Tests:
+        files:
+          - "$test"
+        allow:
+          - "$gostd"
+          - github.com/transip/gotransip/v6
+          - github.com/transip/gotransip/v6/rest
+          - github.com/transip/gotransip/v6/repository
+          - github.com/transip/gotransip/v6/ipaddress
+          - github.com/transip/gotransip/v6/vps
+          - github.com/transip/gotransip/v6/jwt
+          - github.com/transip/gotransip/v6/internal/testutil
+          - github.com/stretchr/testify/require
+          - github.com/stretchr/testify/assert
+
+
   lll:
     line-length: 160
   nakedret:
     max-func-lines: 10
+
 
 linters:
   enable:
     - asciicheck
     - bidichk
     - bodyclose
     - contextcheck
-    - deadcode
     - decorder
     - depguard
     - dogsled
@@ -58,7 +97,6 @@ linters:
     - gosimple
     - govet
     - grouper
-    - ifshort
     - importas
     - ineffassign
     - lll
@@ -76,14 +114,12 @@ linters:
     - rowserrcheck
     - sqlclosecheck
     - staticcheck
-    - structcheck
     - stylecheck
     - tenv
     - typecheck
     - unconvert
     - unparam
     - unused
-    - varcheck
     - wastedassign
   enable-all: false
   disable-all: false
@@ -104,3 +140,4 @@ issues:
     - path: mocks/*
       linters:
         - typecheck
+

authenticator/authenticator.go

@@ -4,11 +4,12 @@ import (
 	"crypto/rand"
 	"errors"
 	"fmt"
-	"github.com/transip/gotransip/v6/jwt"
-	"github.com/transip/gotransip/v6/rest"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"time"
+
+	"github.com/transip/gotransip/v6/jwt"
+	"github.com/transip/gotransip/v6/rest"
 )
 
 const (
@@ -164,7 +165,7 @@ func (a *Authenticator) requestNewToken() (jwt.Token, error) {
 	defer httpResponse.Body.Close()
 
 	// read entire response body
-	b, err := ioutil.ReadAll(httpResponse.Body)
+	b, err := io.ReadAll(httpResponse.Body)
 	if err != nil {
 		return jwt.Token{}, fmt.Errorf("error requesting token: %w", err)
 	}

authenticator/authenticator_test.go

@@ -3,14 +3,15 @@ package authenticator
 import (
 	"errors"
 	"fmt"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-	"github.com/transip/gotransip/v6/jwt"
-	"io/ioutil"
 	"net/http"
 	"net/http/httptest"
+	"os"
 	"testing"
 	"time"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+	"github.com/transip/gotransip/v6/jwt"
 )
 
 const amountOfNoncesToGet = 10
@@ -63,7 +64,7 @@ func TestAuthenticatorGetToken(t *testing.T) {
 func TestRequestANewToken(t *testing.T) {
 	server := getMockServer(t)
 	defer server.Close()
-	key, err := ioutil.ReadFile("../testdata/signature.key")
+	key, err := os.ReadFile("../testdata/signature.key")
 	require.NoError(t, err)
 
 	authenticator := Authenticator{
@@ -84,7 +85,7 @@ func TestAuthenticationErrorIsReturned(t *testing.T) {
 	server := getFailedMockServer(t)
 	defer server.Close()
 
-	key, err := ioutil.ReadFile("../testdata/signature.key")
+	key, err := os.ReadFile("../testdata/signature.key")
 	require.NoError(t, err)
 
 	authenticator := Authenticator{

authenticator/filetokencache.go

@@ -3,10 +3,11 @@ package authenticator
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/transip/gotransip/v6/jwt"
-	"io/ioutil"
+	"io"
 	"os"
 	"sync"
+
+	"github.com/transip/gotransip/v6/jwt"
 )
 
 // cacheItem is one named item inside the filesystem cache
@@ -41,7 +42,7 @@ func NewFileTokenCache(path string) (*FileTokenCache, error) {
 	cache := FileTokenCache{File: file}
 
 	// try to read the File
-	fileContent, err := ioutil.ReadAll(file)
+	fileContent, err := io.ReadAll(file)
 	if err != nil {
 		return &FileTokenCache{}, fmt.Errorf("error reading cache File: %w", err)
 	}

authenticator/sign_test.go

@@ -2,7 +2,7 @@ package authenticator
 
 import (
 	"encoding/json"
-	"io/ioutil"
+	"os"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -11,7 +11,7 @@ import (
 
 // See: https://api.transip.nl/v6/auth
 func TestSignWithKey(t *testing.T) {
-	key, err := ioutil.ReadFile("../testdata/signature.key")
+	key, err := os.ReadFile("../testdata/signature.key")
 	require.NoError(t, err)
 
 	requestBody := &AuthRequest{

client.go

@@ -4,7 +4,6 @@ import (
 	"errors"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"net/http"
 	"os"
 
@@ -75,7 +74,7 @@ func newClient(config ClientConfiguration) (*client, error) {
 
 	if config.PrivateKeyReader != nil {
 		var err error
-		privateKeyBody, err = ioutil.ReadAll(config.PrivateKeyReader)
+		privateKeyBody, err = io.ReadAll(config.PrivateKeyReader)
 
 		if err != nil {
 			return &client{}, fmt.Errorf("error while reading private key: %w", err)
@@ -120,7 +119,7 @@ func newClient(config ClientConfiguration) (*client, error) {
 // This method is used by all rest client methods, thus: 'get','post','put','delete'
 // It uses the authenticator to get a token, either statically provided by the user or requested from the authentication server
 // Then decodes the json response to a supplied interface
-func (c *client) call(method rest.Method, request rest.Request, result interface{}) (rest.Response, error) {
+func (c *client) call(method rest.Method, request rest.Request, result any) (rest.Response, error) {
 	token, err := c.authenticator.GetToken()
 	if err != nil {
 		return rest.Response{}, fmt.Errorf("could not get token from authenticator: %w", err)
@@ -150,7 +149,7 @@ func (c *client) call(method rest.Method, request rest.Request, result interface
 	bodyReader := io.LimitReader(httpResponse.Body, httpBodyLimit)
 
 	// read entire httpResponse body
-	b, err := ioutil.ReadAll(bodyReader)
+	b, err := io.ReadAll(bodyReader)
 	if err != nil {
 		return rest.Response{}, fmt.Errorf("error reading http response body: %w", err)
 	}
@@ -164,7 +163,7 @@ func (c *client) call(method rest.Method, request rest.Request, result interface
 		ContentLocation: contentLocation,
 	}
 
-	err = restResponse.ParseResponse(&result)
+	err = restResponse.ParseResponse(result)
 
 	return restResponse, err
 }
@@ -195,45 +194,52 @@ func (c *client) Get(request rest.Request, responseObject interface{}) error {
 // This method will create and execute a http Post request
 // It expects no response, that is why it does not ask for a responseObject
 func (c *client) Post(request rest.Request) error {
-	_, err := c.call(rest.PostMethod, request, nil)
+	var response any
+	_, err := c.call(rest.PostMethod, request, &response)
 	return err
 }
 
 // This method will create and execute a http Post request
 // It expects a response
 func (c *client) PostWithResponse(request rest.Request) (rest.Response, error) {
-	return c.call(rest.PostMethod, request, nil)
+	var response any
+	return c.call(rest.PostMethod, request, &response)
 }
 
 // This method will create and execute a http Put request
 // It expects no response, that is why it does not ask for a responseObject
 func (c *client) Put(request rest.Request) error {
-	_, err := c.call(rest.PutMethod, request, nil)
+	var response any
+	_, err := c.call(rest.PutMethod, request, &response)
 	return err
 }
 
 // This method will create and execute a http Put request
 // It expects a response
 func (c *client) PutWithResponse(request rest.Request) (rest.Response, error) {
-	return c.call(rest.PutMethod, request, nil)
+	var response any
+	return c.call(rest.PutMethod, request, &response)
 }
 
 // This method will create and execute a http Delete request
 // It expects no response, that is why it does not ask for a responseObject
 func (c *client) Delete(request rest.Request) error {
-	_, err := c.call(rest.DeleteMethod, request, nil)
+	var response any
+	_, err := c.call(rest.DeleteMethod, request, &response)
 	return err
 }
 
 // This method will create and execute a http Patch request
 // It expects no response, that is why it does not ask for a responseObject
 func (c *client) Patch(request rest.Request) error {
-	_, err := c.call(rest.PatchMethod, request, nil)
+	var response any
+	_, err := c.call(rest.PatchMethod, request, &response)
 	return err
 }
 
 // This method will create and execute a http Patch request
 // It expects a response
 func (c *client) PatchWithResponse(request rest.Request) (rest.Response, error) {
-	return c.call(rest.PatchMethod, request, nil)
+	var response any
+	return c.call(rest.PatchMethod, request, &response)
 }

client_test.go

@@ -3,7 +3,7 @@ package gotransip
 import (
 	"bytes"
 	"errors"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"net/http/httptest"
 	"net/url"
@@ -74,7 +74,7 @@ func TestNewClient(t *testing.T) {
 	// Test if private key from path is read and passed to the authenticator
 	privateKeyFile, err := os.Open("testdata/signature.key")
 	require.NoError(t, err)
-	privateKeyBody, err := ioutil.ReadAll(privateKeyFile)
+	privateKeyBody, err := io.ReadAll(privateKeyFile)
 	require.NoError(t, err)
 
 	// Test that a tokencache is passed to the authenticator
@@ -218,7 +218,7 @@ func (m *mockServer) getHTTPServer() *httptest.Server {
 		if req.ContentLength != 0 {
 			// get the request body
 			// and check if the body matches the expected request body
-			body, err := ioutil.ReadAll(req.Body)
+			body, err := io.ReadAll(req.Body)
 			require.NoError(m.t, err)
 			assert.Equal(m.t, m.expectedRequest, string(body))
 		}

configuration.go

@@ -9,7 +9,7 @@ import (
 )
 
 const (
-	libraryVersion  = "6.23.0"
+	libraryVersion  = "6.24.0"
 	defaultBasePath = "https://api.transip.nl/v6"
 	userAgent       = "go-client-gotransip/" + libraryVersion
 )

examples/kubernetes.go → examples/kubernetes/main.go

@@ -31,7 +31,7 @@ func main() {
 		}
 		for _, n := range nodepools {
 			fmt.Printf(
-				"\tNodePool: [description=%s, zone=%s, spec=%s, nodeCount=%s]\n",
+				"\tNodePool: [description=%s, zone=%s, spec=%s, nodeCount=%d]\n",
 				n.Description, n.AvailabilityZone, n.NodeSpec, n.DesiredNodeCount,
 			)
 		}