refactor(spdk): rename SpdkClientAdapter to ClientAdapter

type name will be used as spdk.SpdkClientAdapter by other packages, and that stutters; consider calling this ClientAdapter Signed-off-by: Artsiom Koltun <[email protected]>
opiproject · Jan 30, 2024 · d39270f · d39270f
1 parent 41d0d6a
commit d39270f
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 11 deletions.
diff --git a/pkg/backend/backend.go b/pkg/backend/backend.go
@@ -34,7 +34,7 @@ type Server struct {
 	pb.UnimplementedNullVolumeServiceServer
 	pb.UnimplementedAioVolumeServiceServer
 
-	rpc                *spdk.SpdkClientAdapter
+	rpc                *spdk.ClientAdapter
 	store              gokv.Store
 	Volumes            VolumeParameters
 	Pagination         map[string]int

diff --git a/pkg/frontend/frontend.go b/pkg/frontend/frontend.go
@@ -38,7 +38,7 @@ type Server struct {
 	pb.UnimplementedFrontendVirtioBlkServiceServer
 	pb.UnimplementedFrontendVirtioScsiServiceServer
 
-	rpc        *spdk.SpdkClientAdapter
+	rpc        *spdk.ClientAdapter
 	store      gokv.Store
 	Nvme       NvmeParameters
 	Virt       VirtioParameters

diff --git a/pkg/frontend/transport.go b/pkg/frontend/transport.go
@@ -35,7 +35,7 @@ type VirtioBlkTransport interface {
 }
 
 type nvmeTCPTransport struct {
-	rpc *spdk.SpdkClientAdapter
+	rpc *spdk.ClientAdapter
 }
 
 // build time check that struct implements interface

diff --git a/pkg/kvm/transport.go b/pkg/kvm/transport.go
@@ -21,7 +21,7 @@ import (
 
 type nvmeVfiouserTransport struct {
 	ctrlrDir string
-	rpc      *spdk.SpdkClientAdapter
+	rpc      *spdk.ClientAdapter
 }
 
 // build time check that struct implements interface

diff --git a/pkg/middleend/middleend.go b/pkg/middleend/middleend.go
@@ -26,7 +26,7 @@ type Server struct {
 	pb.UnimplementedMiddleendEncryptionServiceServer
 	pb.UnimplementedMiddleendQosVolumeServiceServer
 
-	rpc        *spdk.SpdkClientAdapter
+	rpc        *spdk.ClientAdapter
 	store      gokv.Store
 	volumes    VolumeParameters
 	tweakMode  string

diff --git a/pkg/spdk/adapter.go b/pkg/spdk/adapter.go
@@ -14,24 +14,24 @@ import (
 	"github.com/spdk/spdk/go/rpc/client"
 )
 
-// SpdkClientAdapter provides an adapter between old gospdk api and new spdk client
+// ClientAdapter provides an adapter between old gospdk api and new spdk client
 // This is needed due to:
 // * awkward response unmarshaling in the new client. A Result in Response is
 // provided in the form described in json.Unmarshal
 // * New error codes affecting a lot of tests. The adapter converts the new
 // format to the old one. It enables gradual transition. The tests will be
 // reworked to new errors eliminating transformations in the adapter.
-type SpdkClientAdapter struct {
+type ClientAdapter struct {
 	client client.IClient
 }
 
 // NewSpdkClientAdapter creates a new instance if SpdkClientAdapter
-func NewSpdkClientAdapter(client client.IClient) *SpdkClientAdapter {
-	return &SpdkClientAdapter{client}
+func NewSpdkClientAdapter(client client.IClient) *ClientAdapter {
+	return &ClientAdapter{client}
 }
 
 // Call performs a call to spdk client and unmarshalls the result into requested structure
-func (c *SpdkClientAdapter) Call(ctx context.Context, method string, params any, result any) error {
+func (c *ClientAdapter) Call(ctx context.Context, method string, params any, result any) error {
 	ch := make(chan error)
 
 	go func() {
@@ -58,7 +58,7 @@ func (c *SpdkClientAdapter) Call(ctx context.Context, method string, params any,
 	}
 }
 
-func (c *SpdkClientAdapter) convertToLegacyErrorFormat(err error, method string) error {
+func (c *ClientAdapter) convertToLegacyErrorFormat(err error, method string) error {
 	e := errors.Unwrap(err)
 	spdkErr, _ := e.(*client.Error)