Increase code coverage

Makefile

@@ -1,26 +1,25 @@
 .PHONY: all
-all: go-build
+all: build
 
 ifneq (on,$(GO111MODULE))
 export GO111MODULE := on
 endif
 
-#.PHONY: go-dep
-go-dep:
+#.PHONY: dep
+dep:
 	go mod download && go mod verify
 
-.PHONY: go-build
-go-build:
+.PHONY: build
+build:
 	git config core.hooksPath hooks
 	go build .
 #
 # Tests-related tasks
 #
-.PHONY: go-unittest
-go-unittest: go-build
+.PHONY: unit-test
+unit-test: build
 	go test -json ./... -run ^Test
 
-.PHONY: go-coverage
-go-coverage: go-build
+.PHONY: coverage
+coverage: build
 	go test -json -covermode=atomic -coverpkg=./... -coverprofile goisilon_coverprofile.out ./... -run ^Test
-

acls_test.go

@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2022 Dell Inc, or its subsidiaries.
+Copyright (c) 2022-2025 Dell Inc, or its subsidiaries.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -16,105 +16,38 @@ limitations under the License.
 package goisilon
 
 import (
-	"fmt"
 	"testing"
 
+	"github.com/dell/goisilon/mocks"
 	"github.com/stretchr/testify/assert"
-
-	api "github.com/dell/goisilon/api/v2"
 )
 
 func TestGetVolumeACL(t *testing.T) {
-	volumeName := "test_get_volume_acl"
-
-	// make sure the volume exists
-	client.CreateVolume(defaultCtx, volumeName)
-	volume, err := client.GetVolume(defaultCtx, volumeName, volumeName)
-	assertNoError(t, err)
-	assertNotNil(t, volume)
-
-	defer client.DeleteVolume(defaultCtx, volume.Name)
-
-	username := client.API.User()
-	user, err := client.GetUserByNameOrUID(defaultCtx, &username, nil)
-	assertNoError(t, err)
-	assertNotNil(t, user)
-
-	acl, err := client.GetVolumeACL(defaultCtx, volume.Name)
-	assertNoError(t, err)
-	assertNotNil(t, acl)
-
-	assertNotNil(t, acl.Owner)
-	assertNotNil(t, acl.Owner.Name)
-	assert.Equal(t, user.Name, *acl.Owner.Name)
-	assertNotNil(t, acl.Owner.Type)
-	assert.Equal(t, api.PersonaTypeUser, *acl.Owner.Type)
-	assertNotNil(t, acl.Owner.ID)
-	assert.Equal(t, user.OnDiskUserIdentity.ID, fmt.Sprintf("UID:%s", acl.Owner.ID.ID))
-	assert.Equal(t, api.PersonaIDTypeUID, acl.Owner.ID.Type)
+	client.API.(*mocks.Client).On("VolumesPath", anyArgs[0:6]...).Return("").Once()
+	client.API.(*mocks.Client).On("Get", anyArgs[0:6]...).Return(nil).Once()
+	_, err := client.GetVolumeACL(defaultCtx, "test_get_volume_acl")
+	assert.Nil(t, err)
 }
 
 func TestSetVolumeOwnerToCurrentUser(t *testing.T) {
-	volumeName := "test_set_volume_owner"
-
-	// make sure the volume exists
-	client.CreateVolume(defaultCtx, volumeName)
-	volume, err := client.GetVolume(defaultCtx, volumeName, volumeName)
-	assertNoError(t, err)
-	assertNotNil(t, volume)
-
-	defer client.DeleteVolume(defaultCtx, volume.Name)
-
-	username := client.API.User()
-	user, err := client.GetUserByNameOrUID(defaultCtx, &username, nil)
-	assertNoError(t, err)
-	assertNotNil(t, user)
-
-	acl, err := client.GetVolumeACL(defaultCtx, volume.Name)
-	assertNoError(t, err)
-	assertNotNil(t, acl)
-
-	assertNotNil(t, acl.Owner)
-	assertNotNil(t, acl.Owner.Name)
-	assert.Equal(t, user.Name, *acl.Owner.Name)
-	assertNotNil(t, acl.Owner.Type)
-	assert.Equal(t, api.PersonaTypeUser, *acl.Owner.Type)
-	assertNotNil(t, acl.Owner.ID)
-	assert.Equal(t, user.OnDiskUserIdentity.ID, fmt.Sprintf("UID:%s", acl.Owner.ID.ID))
-	assert.Equal(t, api.PersonaIDTypeUID, acl.Owner.ID.Type)
-
-	err = client.SetVolumeOwner(defaultCtx, volume.Name, "rexray")
-	if err != nil {
-		t.Skipf("Unable to change volume owner: %s - is efs.bam.chown_unrestricted set?", err)
-	}
-	assertNoError(t, err)
-
-	acl, err = client.GetVolumeACL(defaultCtx, volume.Name)
-	assertNoError(t, err)
-	assertNotNil(t, acl)
-
-	assertNotNil(t, acl.Owner)
-	assertNotNil(t, acl.Owner.Name)
-	assert.Equal(t, "rexray", *acl.Owner.Name)
-	assertNotNil(t, acl.Owner.Type)
-	assert.Equal(t, api.PersonaTypeUser, *acl.Owner.Type)
-	assertNotNil(t, acl.Owner.ID)
-	assert.Equal(t, "2000", acl.Owner.ID.ID)
-	assert.Equal(t, api.PersonaIDTypeUID, acl.Owner.ID.Type)
-
-	err = client.SetVolumeOwnerToCurrentUser(defaultCtx, volume.Name)
-	assertNoError(t, err)
+	client.API.(*mocks.Client).On("VolumesPath", anyArgs[0:6]...).Return("").Once()
+	client.API.(*mocks.Client).On("Get", anyArgs[0:6]...).Return(nil).Once()
+	client.API.(*mocks.Client).On("User", anyArgs[0:6]...).Return("").Once()
+	client.API.(*mocks.Client).On("Put", anyArgs...).Return(nil).Once()
+	err := client.SetVolumeOwnerToCurrentUser(defaultCtx, "test_set_volume_owner")
+	assert.Nil(t, err)
+}
 
-	acl, err = client.GetVolumeACL(defaultCtx, volume.Name)
-	assertNoError(t, err)
-	assertNotNil(t, acl)
+func TestSetVolumeOwner(t *testing.T) {
+	client.API.(*mocks.Client).On("VolumesPath", anyArgs[0:6]...).Return("").Once()
+	client.API.(*mocks.Client).On("Put", anyArgs...).Return(nil).Once()
+	err := client.SetVolumeOwner(defaultCtx, "test_set_volume_owner", "rexray")
+	assert.Nil(t, err)
+}
 
-	assertNotNil(t, acl.Owner)
-	assertNotNil(t, acl.Owner.Name)
-	assert.Equal(t, client.API.User(), *acl.Owner.Name)
-	assertNotNil(t, acl.Owner.Type)
-	assert.Equal(t, api.PersonaTypeUser, *acl.Owner.Type)
-	assertNotNil(t, acl.Owner.ID)
-	assert.Equal(t, "10", acl.Owner.ID.ID)
-	assert.Equal(t, api.PersonaIDTypeUID, acl.Owner.ID.Type)
+func TestSetVolumeMode(t *testing.T) {
+	client.API.(*mocks.Client).On("VolumesPath", anyArgs[0:6]...).Return("").Once()
+	client.API.(*mocks.Client).On("Put", anyArgs...).Return(nil).Once()
+	err := client.SetVolumeMode(defaultCtx, "test_set_volume_owner", 777)
+	assert.Nil(t, err)
 }

api/api.go

@@ -20,6 +20,7 @@ import (
 	"context"
 	"crypto/tls"
 	"crypto/x509"
+	"encoding/json"
 	"errors"
 	"fmt"
 	"io"
@@ -35,7 +36,6 @@ import (
 	"github.com/sirupsen/logrus"
 
 	"github.com/PuerkitoBio/goquery"
-	"github.com/dell/goisilon/api/json"
 )
 
 const (
@@ -389,6 +389,10 @@ func (c *client) DoWithHeaders(
 	params OrderedValues, headers map[string]string,
 	body, resp interface{},
 ) error {
+	return doWithHeadersFunc(c, ctx, method, uri, id, params, headers, body, resp)
+}
+
+var doWithHeadersFunc = func(c *client, ctx context.Context, method string, uri string, id string, params OrderedValues, headers map[string]string, body, resp interface{}) error {
 	res, _, err := c.DoAndGetResponseBody(
 		ctx, method, uri, id, params, headers, body)
 	if err != nil {
@@ -425,6 +429,16 @@ func (c *client) DoAndGetResponseBody(
 	method, uri, id string,
 	params OrderedValues, headers map[string]string,
 	body interface{},
+) (*http.Response, bool, error) {
+	return doAndGetResponseBodyFunc(c, ctx, method, uri, id, params, headers, body)
+}
+
+var doAndGetResponseBodyFunc = func(
+	c *client,
+	ctx context.Context,
+	method, uri, id string,
+	params OrderedValues, headers map[string]string,
+	body interface{},
 ) (*http.Response, bool, error) {
 	var (
 		err                   error
@@ -650,6 +664,10 @@ func parseJSONHTMLError(r *http.Response) error {
 // Authenticate make a REST API call [/session/1/session] to PowerScale to authenticate the given credentials.
 // The response contains the session Cookie, X-CSRF-Token and the client uses it for further communication.
 func (c *client) authenticate(ctx context.Context, username string, password string, endpoint string) error {
+	return authenticateFunc(c, ctx, username, password, endpoint)
+}
+
+var authenticateFunc = func(c *client, ctx context.Context, username string, password string, endpoint string) error {
 	headers := make(map[string]string, 1)
 	headers[headerKeyContentType] = headerValContentTypeJSON
 	data := &setupConnection{Services: []string{"platform", "namespace"}, Username: username, Password: password}
@@ -722,19 +740,18 @@ func (c *client) executeWithRetryAuthenticate(ctx context.Context, method, uri s
 				return fmt.Errorf("authentication failure due to: %v", err)
 			}
 			return c.DoWithHeaders(ctx, method, uri, id, params, headers, body, resp)
-		} else {
-			log.Error(ctx, "Error in response. Method:%s URI:%s Error: %v JSON Error: %+v", method, uri, err, e)
 		}
+		log.Error(ctx, "Error in response. Method:%s URI:%s Error: %v JSON Error: %+v", method, uri, err, e)
+
 	case *HTMLError:
 		if e.StatusCode == 401 {
 			log.Debug(ctx, "Authentication failed. Trying to re-authenticate")
 			if err := c.authenticate(ctx, c.username, c.password, c.hostname); err != nil {
 				return fmt.Errorf("authentication failure due to: %v", err)
 			}
 			return c.DoWithHeaders(ctx, method, uri, id, params, headers, body, resp)
-		} else {
-			log.Error(ctx, "Error in response. Method:%s URI:%s Error: %v HTML Error: %+v", method, uri, err, e)
 		}
+		log.Error(ctx, "Error in response. Method:%s URI:%s Error: %v HTML Error: %+v", method, uri, err, e)
 	default:
 		log.Error(ctx, "Error is not a type of \"*JSONError or *HTMLError\". Error:", err)
 	}