fix conflicts

dell · Dec 21, 2023 · e435981 · e435981
1 parent b24c04b
commit e435981
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/api/api.go b/api/api.go
@@ -137,7 +137,7 @@ func New(apiURL string, username string,
 ) (*ClientIMPL, error) {
 	debug, _ = strconv.ParseBool(os.Getenv("GOPOWERSTORE_DEBUG"))
 	if apiURL == "" || username == "" || password == "" {
-		return nil, errors.New("API ApiClient can't be initialized: " +
+		return nil, errors.New("API APIClient can't be initialized: " +
 			"Missing endpoint, username, or password param")
 	}
 

diff --git a/client.go b/client.go
@@ -38,7 +38,7 @@ const (
 	paginationDefaultPageSize = 1000
 )
 
-// ApiClient defines gopowerstore client interface
+// APIClient defines gopowerstore client interface
 type Client interface {
 	APIClient() api.Client
 	SetTraceID(ctx context.Context, value string) context.Context

diff --git a/limit_test.go b/limit_test.go
@@ -39,7 +39,7 @@ func TestClientIMPL_GetMaxVolumeSize(t *testing.T) {
 	}
 	tests := []struct {
 		name         string
-		API          api.ApiClient
+		API          api.APIClient
 		args         args
 		mockResponse string
 		want         int64

diff --git a/mocks/APIClient.go b/mocks/APIClient.go
diff --git a/mocks/Client.go b/mocks/Client.go