Fix new version linter issues

.golangci.yml

@@ -42,6 +42,10 @@ linters:
     - gosec
     - gochecknoinits
     - gochecknoglobals
+    - funlen
+    - gocognit
+    - godox
+    - wsl
 
 issues:
   exclude:

GNUmakefile

@@ -29,7 +29,7 @@ errcheck:
 
 lint: fmtcheck
 	@echo "==> Checking source code against linters..."
-	@GOGC=30 golangci-lint run
+	@GOGC=30 golangci-lint run --timeout=30m
 
 tools:
 	GO111MODULE=off go get -u github.com/client9/misspell/cmd/misspell

client/client.go

@@ -57,7 +57,6 @@ type Credentials struct {
 
 // NewClient returns a new Nutanix API client.
 func NewClient(credentials *Credentials) (*Client, error) {
-
 	transCfg := &http.Transport{
 		// nolint:gas
 		TLSClientConfig: &tls.Config{InsecureSkipVerify: credentials.Insecure}, // ignore expired SSL certificates
@@ -156,9 +155,11 @@ func (c *Client) OnRequestCompleted(rc RequestCompletionCallback) {
 func (c *Client) Do(ctx context.Context, req *http.Request, v interface{}) error {
 	req = req.WithContext(ctx)
 	resp, err := c.client.Do(req)
+
 	if err != nil {
 		return err
 	}
+
 	defer func() {
 		if rerr := resp.Body.Close(); err == nil {
 			err = rerr

client/client_test.go

@@ -118,6 +118,7 @@ func TestCheckResponse(t *testing.T) {
 func TestDo(t *testing.T) {
 	ctx := context.TODO()
 	mux, client, server := setup()
+
 	defer server.Close()
 
 	type foo struct {
@@ -150,6 +151,7 @@ func TestDo(t *testing.T) {
 func TestDo_httpError(t *testing.T) {
 	ctx := context.TODO()
 	mux, client, server := setup()
+
 	defer server.Close()
 
 	mux.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
@@ -247,6 +249,7 @@ func TestClient_NewRequest(t *testing.T) {
 		urlStr string
 		body   interface{}
 	}
+
 	tests := []struct {
 		name    string
 		fields  fields
@@ -256,6 +259,7 @@ func TestClient_NewRequest(t *testing.T) {
 	}{
 		// TODO: Add test cases.
 	}
+
 	for _, tt := range tests {
 		tt := tt
 		t.Run(tt.name, func(t *testing.T) {
@@ -292,6 +296,7 @@ func TestClient_NewUploadRequest(t *testing.T) {
 		urlStr string
 		body   []byte
 	}
+
 	tests := []struct {
 		name    string
 		fields  fields
@@ -301,6 +306,7 @@ func TestClient_NewUploadRequest(t *testing.T) {
 	}{
 		// TODO: Add test cases.
 	}
+
 	for _, tt := range tests {
 		tt := tt
 		t.Run(tt.name, func(t *testing.T) {
@@ -341,6 +347,7 @@ func TestClient_OnRequestCompleted(t *testing.T) {
 	}{
 		// TODO: Add test cases.
 	}
+
 	for _, tt := range tests {
 		tt := tt
 		t.Run(tt.name, func(t *testing.T) {
@@ -369,6 +376,7 @@ func TestClient_Do(t *testing.T) {
 		req *http.Request
 		v   interface{}
 	}
+
 	tests := []struct {
 		name    string
 		fields  fields
@@ -377,6 +385,7 @@ func TestClient_Do(t *testing.T) {
 	}{
 		// TODO: Add test cases.
 	}
+
 	for _, tt := range tests {
 		tt := tt
 		t.Run(tt.name, func(t *testing.T) {
@@ -399,13 +408,15 @@ func Test_fillStruct(t *testing.T) {
 		data   map[string]interface{}
 		result interface{}
 	}
+
 	tests := []struct {
 		name    string
 		args    args
 		wantErr bool
 	}{
 		// TODO: Add test cases.
 	}
+
 	for _, tt := range tests {
 		tt := tt
 		t.Run(tt.name, func(t *testing.T) {

client/v3/v3_service.go

@@ -96,6 +96,7 @@ func (op Operations) DeleteVM(uuid string) (*DeleteResponse, error) {
 
 	req, err := op.client.NewRequest(ctx, http.MethodDelete, path, nil)
 	deleteResponse := new(DeleteResponse)
+
 	if err != nil {
 		return nil, err
 	}
@@ -196,6 +197,7 @@ func (op Operations) DeleteSubnet(uuid string) (*DeleteResponse, error) {
 
 	req, err := op.client.NewRequest(ctx, http.MethodDelete, path, nil)
 	deleteResponse := new(DeleteResponse)
+
 	if err != nil {
 		return nil, err
 	}
@@ -312,13 +314,14 @@ func (op Operations) UploadImage(uuid, filepath string) error {
 	}
 
 	req, err := op.client.NewUploadRequest(ctx, http.MethodPut, path, fileContents)
+
 	if err != nil {
 		return fmt.Errorf("error: Creating request %s", err)
 	}
+
 	err = op.client.Do(ctx, req, nil)
 
 	return err
-
 }
 
 /*DeleteImage deletes a IMAGE
@@ -334,6 +337,7 @@ func (op Operations) DeleteImage(uuid string) (*DeleteResponse, error) {
 
 	req, err := op.client.NewRequest(ctx, http.MethodDelete, path, nil)
 	deleteResponse := new(DeleteResponse)
+
 	if err != nil {
 		return nil, err
 	}
@@ -358,6 +362,7 @@ func (op Operations) GetImage(uuid string) (*ImageIntentResponse, error) {
 	if err != nil {
 		return nil, err
 	}
+
 	return imageIntentResponse, op.client.Do(ctx, req, imageIntentResponse)
 }
 
@@ -669,6 +674,7 @@ func (op Operations) DeleteNetworkSecurityRule(uuid string) (*DeleteResponse, er
 
 	req, err := op.client.NewRequest(ctx, http.MethodDelete, path, nil)
 	deleteResponse := new(DeleteResponse)
+
 	if err != nil {
 		return nil, err
 	}
@@ -836,7 +842,7 @@ func (op Operations) UpdateVolumeGroup(uuid string, body *VolumeGroupInput) (*Vo
 	return networkSecurityRuleResponse, op.client.Do(ctx, req, networkSecurityRuleResponse)
 }
 
-const itemsPerPage = int64(100)
+const itemsPerPage int64 = 100
 
 func hasNext(ri *int64) bool {
 	*ri -= itemsPerPage
@@ -876,6 +882,7 @@ func (op Operations) ListAllVM() (*VMListIntentResponse, error) {
 
 			offset += itemsPerPage
 		}
+
 		resp.Entities = entities
 	}
 
@@ -916,6 +923,7 @@ func (op Operations) ListAllSubnet() (*SubnetListIntentResponse, error) {
 			offset += itemsPerPage
 			log.Printf("[Debug] total=%d, remaining=%d, offset=%d len(entities)=%d\n", totalEntities, remaining, offset, len(entities))
 		}
+
 		resp.Entities = entities
 	}
 
@@ -956,6 +964,7 @@ func (op Operations) ListAllNetworkSecurityRule() (*NetworkSecurityRuleListInten
 			offset += itemsPerPage
 			log.Printf("[Debug] total=%d, remaining=%d, offset=%d len(entities)=%d\n", totalEntities, remaining, offset, len(entities))
 		}
+
 		resp.Entities = entities
 	}
 
@@ -996,6 +1005,7 @@ func (op Operations) ListAllImage() (*ImageListIntentResponse, error) {
 			offset += itemsPerPage
 			log.Printf("[Debug] total=%d, remaining=%d, offset=%d len(entities)=%d\n", totalEntities, remaining, offset, len(entities))
 		}
+
 		resp.Entities = entities
 	}
 
@@ -1036,6 +1046,7 @@ func (op Operations) ListAllCluster() (*ClusterListIntentResponse, error) {
 			offset += itemsPerPage
 			log.Printf("[Debug] total=%d, remaining=%d, offset=%d len(entities)=%d\n", totalEntities, remaining, offset, len(entities))
 		}
+
 		resp.Entities = entities
 	}