fix: cyclic import issue

.gitignore

@@ -1,2 +1,3 @@
 .idea
-.DS_Store
+.DS_Store
+vendor

internal/grpcmanagers/control_manager.go

@@ -4,7 +4,7 @@ import (
 	"crypto/tls"
 
 	"github.com/momentohq/client-sdk-go/internal/interceptor"
-	internalRequests "github.com/momentohq/client-sdk-go/internal/requests"
+	"github.com/momentohq/client-sdk-go/internal/models"
 	"github.com/momentohq/client-sdk-go/internal/scserrors"
 
 	"google.golang.org/grpc"
@@ -15,7 +15,7 @@ type ControlGrpcManager struct {
 	Conn *grpc.ClientConn
 }
 
-func NewControlGrpcManager(request *internalRequests.ControlGrpcManagerRequest) (*ControlGrpcManager, error) {
+func NewControlGrpcManager(request *models.ControlGrpcManagerRequest) (*ControlGrpcManager, error) {
 	config := &tls.Config{
 		InsecureSkipVerify: false,
 	}

internal/grpcmanagers/data_manager.go

@@ -2,9 +2,9 @@ package grpcmanagers
 
 import (
 	"crypto/tls"
+	"github.com/momentohq/client-sdk-go/internal/models"
 
 	"github.com/momentohq/client-sdk-go/internal/interceptor"
-	internalRequests "github.com/momentohq/client-sdk-go/internal/requests"
 	"github.com/momentohq/client-sdk-go/internal/scserrors"
 
 	"google.golang.org/grpc"
@@ -15,7 +15,7 @@ type DataGrpcManager struct {
 	Conn *grpc.ClientConn
 }
 
-func NewDataGrpcManager(request *internalRequests.DataGrpcManagerRequest) (*DataGrpcManager, error) {
+func NewDataGrpcManager(request *models.DataGrpcManagerRequest) (*DataGrpcManager, error) {
 	config := &tls.Config{
 		InsecureSkipVerify: false,
 	}

internal/models/internal_operation_requests.go → internal/models/requests.go

@@ -1,6 +1,9 @@
 package models
 
-import pb "github.com/momentohq/client-sdk-go/internal/protos"
+import (
+	"fmt"
+	pb "github.com/momentohq/client-sdk-go/internal/protos"
+)
 
 type ResolveRequest struct {
 	AuthToken        string
@@ -33,3 +36,7 @@ type ConvertEcacheResultRequest struct {
 	Message      string
 	OpName       string
 }
+
+func ConvertEcacheResult(request ConvertEcacheResultRequest) error {
+	return fmt.Errorf("CacheService returned an unexpected result: %v for operation: %s with message: %s", request.ECacheResult, request.OpName, request.Message)
+}

internal/models/responses.go

@@ -0,0 +1,84 @@
+package models
+
+import (
+	pb "github.com/momentohq/client-sdk-go/internal/protos"
+)
+
+type CreateCacheRequest struct {
+	CacheName string
+}
+
+type DeleteCacheRequest struct {
+	CacheName string
+}
+
+type ListCachesRequest struct {
+	NextToken string
+}
+
+type ListCachesResponse struct {
+	NextToken string
+	Caches    []CacheInfo
+}
+
+func NewListCacheResponse(resp *pb.ListCachesResponse) *ListCachesResponse {
+	var caches = []CacheInfo{}
+	for _, cache := range resp.Cache {
+		caches = append(caches, NewCacheInfo(cache))
+	}
+	return &ListCachesResponse{NextToken: resp.NextToken, Caches: caches}
+}
+
+type CacheInfo struct {
+	Name string
+}
+
+func NewCacheInfo(cache *pb.Cache) CacheInfo {
+	return CacheInfo{Name: cache.CacheName}
+}
+
+const (
+	HIT  string = "HIT"
+	MISS string = "MISS"
+)
+
+type CacheGetRequest struct {
+	CacheName string
+	Key       interface{}
+}
+
+type GetCacheResponse struct {
+	Value  []byte
+	Result string
+}
+
+func NewGetCacheResponse(resp *pb.GetResponse) (*GetCacheResponse, error) {
+	var result string
+	if resp.Result == pb.ECacheResult_Hit {
+		result = HIT
+	} else if resp.Result == pb.ECacheResult_Miss {
+		result = MISS
+	} else {
+		return nil, ConvertEcacheResult(ConvertEcacheResultRequest{
+			ECacheResult: resp.Result,
+			Message:      resp.Message,
+			OpName:       "GET",
+		})
+	}
+	return &GetCacheResponse{Value: resp.CacheBody, Result: result}, nil
+}
+
+type CacheSetRequest struct {
+	CacheName  string
+	Key        interface{}
+	Value      interface{}
+	TtlSeconds uint32
+}
+
+type SetCacheResponse struct {
+	Value []byte
+}
+
+func NewSetCacheResponse(resp *pb.SetResponse, value []byte) *SetCacheResponse {
+	return &SetCacheResponse{Value: value}
+}

internal/resolver/end_point_resolver.go

@@ -3,7 +3,7 @@ package resolver
 import (
 	"reflect"
 
-	"github.com/momentohq/client-sdk-go/internal/requests"
+	"github.com/momentohq/client-sdk-go/internal/models"
 
 	"github.com/golang-jwt/jwt/v4"
 )
@@ -20,7 +20,7 @@ type Endpoints struct {
 	CacheEndpoint   string
 }
 
-func Resolve(request *requests.ResolveRequest) (*Endpoints, error) {
+func Resolve(request *models.ResolveRequest) (*Endpoints, error) {
 	if request.EndpointOverride != "" {
 		return &Endpoints{ControlEndpoint: MOMENTO_CONTROL_ENDPOINT_PREFIX + request.EndpointOverride, CacheEndpoint: MOMENTO_CACHE_ENDPOINT_PREFIX + request.EndpointOverride}, nil
 	}

internal/scsmanagers/scs_control_client.go

@@ -35,7 +35,7 @@ func (client *ScsControlClient) Close() error {
 	return client.grpcManager.Close()
 }
 
-func (client *ScsControlClient) CreateCache(request *requests.CreateCacheRequest) error {
+func (client *ScsControlClient) CreateCache(request *models.CreateCacheRequest) error {
 	if !utility.IsCacheNameValid(request.CacheName) {
 		return fmt.Errorf("cache name cannot be empty")
 	}
@@ -48,7 +48,7 @@ func (client *ScsControlClient) CreateCache(request *requests.CreateCacheRequest
 	return nil
 }
 
-func (client *ScsControlClient) DeleteCache(request *requests.DeleteCacheRequest) error {
+func (client *ScsControlClient) DeleteCache(request *models.DeleteCacheRequest) error {
 	if !utility.IsCacheNameValid(request.CacheName) {
 		return fmt.Errorf("cache name cannot be empty")
 	}
@@ -61,12 +61,12 @@ func (client *ScsControlClient) DeleteCache(request *requests.DeleteCacheRequest
 	return nil
 }
 
-func (client *ScsControlClient) ListCaches(request *requests.ListCachesRequest) (*responses.ListCachesResponse, error) {
+func (client *ScsControlClient) ListCaches(request *models.ListCachesRequest) (*models.ListCachesResponse, error) {
 	ctx, cancel := context.WithTimeout(context.Background(), ControlCtxTimeout)
 	defer cancel()
 	resp, err := client.controlClient.ListCaches(ctx, &pb.ListCachesRequest{NextToken: request.NextToken})
 	if err != nil {
 		return nil, scserrors.GrpcErrorConverter(err)
 	}
-	return responses.NewListCacheResponse(resp), nil
+	return models.NewListCacheResponse(resp), nil
 }

internal/scsmanagers/scs_data_client.go

@@ -32,14 +32,18 @@ func NewScsDataClient(request *models.DataClientRequest) (*ScsDataClient, error)
 	if err != nil {
 		return nil, err
 	}
-	return &ScsDataClient{grpcManager: dataManager, dataClient: pb.NewScsClient(dataManager.Conn), defaultTtlSeconds: request.DefaultTtlSeconds}, nil
+	return &ScsDataClient{
+		grpcManager:       dataManager,
+		dataClient:        pb.NewScsClient(dataManager.Conn),
+		defaultTtlSeconds: request.DefaultTtlSeconds,
+	}, nil
 }
 
 func (client *ScsDataClient) Close() error {
 	return client.grpcManager.Close()
 }
 
-func (client *ScsDataClient) Set(request *requests.CacheSetRequest) (*responses.SetCacheResponse, error) {
+func (client *ScsDataClient) Set(request *models.CacheSetRequest) (*models.SetCacheResponse, error) {
 	if !utility.IsCacheNameValid(request.CacheName) {
 		return nil, scserrors.InvalidInputError("cache name cannot be empty")
 	}
@@ -57,14 +61,21 @@ func (client *ScsDataClient) Set(request *requests.CacheSetRequest) (*responses.
 	}
 	ctx, cancel := context.WithTimeout(context.Background(), CacheCtxTimeout)
 	defer cancel()
-	resp, err := client.dataClient.Set(metadata.NewOutgoingContext(ctx, createNewMetadata(request.CacheName)), &pb.SetRequest{CacheKey: byteKey, CacheBody: byteValue, TtlMilliseconds: itemTtlMils})
+	resp, err := client.dataClient.Set(
+		metadata.NewOutgoingContext(ctx, createNewMetadata(request.CacheName)),
+		&pb.SetRequest{
+			CacheKey:        byteKey,
+			CacheBody:       byteValue,
+			TtlMilliseconds: itemTtlMils,
+		},
+	)
 	if err != nil {
 		return nil, scserrors.GrpcErrorConverter(err)
 	}
-	return responses.NewSetCacheResponse(resp, byteValue), nil
+	return models.NewSetCacheResponse(resp, byteValue), nil
 }
 
-func (client *ScsDataClient) Get(request *requests.CacheGetRequest) (*responses.GetCacheResponse, error) {
+func (client *ScsDataClient) Get(request *models.CacheGetRequest) (*models.GetCacheResponse, error) {
 	if !utility.IsCacheNameValid(request.CacheName) {
 		return nil, scserrors.InvalidInputError("cache name cannot be empty")
 	}
@@ -74,11 +85,14 @@ func (client *ScsDataClient) Get(request *requests.CacheGetRequest) (*responses.
 	}
 	ctx, cancel := context.WithTimeout(context.Background(), CacheCtxTimeout)
 	defer cancel()
-	resp, err := client.dataClient.Get(metadata.NewOutgoingContext(ctx, createNewMetadata(request.CacheName)), &pb.GetRequest{CacheKey: byteKey})
+	resp, err := client.dataClient.Get(
+		metadata.NewOutgoingContext(ctx, createNewMetadata(request.CacheName)),
+		&pb.GetRequest{CacheKey: byteKey},
+	)
 	if err != nil {
 		return nil, scserrors.GrpcErrorConverter(err)
 	}
-	newResp, err := responses.NewGetCacheResponse(resp)
+	newResp, err := models.NewGetCacheResponse(resp)
 	if err != nil {
 		return nil, err
 	}

internal/utility/utility.go

@@ -1,16 +1,9 @@
 package utility
 
 import (
-	"fmt"
 	"strings"
-
-	internalRequests "github.com/momentohq/client-sdk-go/internal/requests"
 )
 
 func IsCacheNameValid(cacheName string) bool {
 	return len(strings.TrimSpace(cacheName)) != 0
 }
-
-func ConvertEcacheResult(request internalRequests.ConvertEcacheResultRequest) error {
-	return fmt.Errorf("CacheService returned an unexpected result: %v for operation: %s with message: %s", request.ECacheResult, request.OpName, request.Message)
-}

momento/cache_operation_responses.go

@@ -3,7 +3,6 @@ package momento
 import (
 	"github.com/momentohq/client-sdk-go/internal/models"
 	pb "github.com/momentohq/client-sdk-go/internal/protos"
-	"github.com/momentohq/client-sdk-go/internal/utility"
 )
 
 type ListCachesResponse struct {
@@ -56,7 +55,7 @@ func NewGetCacheResponse(resp *pb.GetResponse) (*GetCacheResponse, error) {
 	} else if resp.Result == pb.ECacheResult_Miss {
 		result = MISS
 	} else {
-		return nil, utility.ConvertEcacheResult(models.ConvertEcacheResultRequest{
+		return nil, models.ConvertEcacheResult(models.ConvertEcacheResultRequest{
 			ECacheResult: resp.Result,
 			Message:      resp.Message,
 			OpName:       "GET",