From f6332320b09b2f1c4dee16fe81d5c06f8af3fefb Mon Sep 17 00:00:00 2001 From: AlexsJones Date: Thu, 28 Nov 2024 07:58:08 +0000 Subject: [PATCH] chore: refactored cache input to lower Signed-off-by: AlexsJones --- cmd/cache/add.go | 3 ++- pkg/cache/interplex_based.go | 35 ++++++----------------------------- 2 files changed, 8 insertions(+), 30 deletions(-) diff --git a/cmd/cache/add.go b/cmd/cache/add.go index 1fb0dc19d0..3c6eebc638 100644 --- a/cmd/cache/add.go +++ b/cmd/cache/add.go @@ -17,6 +17,7 @@ package cache import ( "fmt" "os" + "strings" "github.com/fatih/color" "github.com/k8sgpt-ai/k8sgpt/pkg/cache" @@ -51,7 +52,7 @@ var addCmd = &cobra.Command{ } fmt.Println(color.YellowString("Adding remote based cache")) cacheType := args[0] - remoteCache, err := cache.NewCacheProvider(cacheType, bucketName, region, endpoint, storageAccount, containerName, projectId, insecure) + remoteCache, err := cache.NewCacheProvider(strings.ToLower(cacheType), bucketName, region, endpoint, storageAccount, containerName, projectId, insecure) if err != nil { color.Red("Error: %v", err) os.Exit(1) diff --git a/pkg/cache/interplex_based.go b/pkg/cache/interplex_based.go index bf8a989b5a..8cfc99a2f5 100644 --- a/pkg/cache/interplex_based.go +++ b/pkg/cache/interplex_based.go @@ -5,9 +5,7 @@ import ( schemav1 "buf.build/gen/go/interplex-ai/schemas/protocolbuffers/go/protobuf/schema/v1" "context" "errors" - "fmt" "google.golang.org/grpc" - "google.golang.org/grpc/connectivity" ) var _ ICache = (*InterplexCache)(nil) @@ -24,27 +22,6 @@ type InterplexCacheConfiguration struct { } type InterplexClient struct { - conn *grpc.ClientConn -} - -func (c *InterplexClient) Close() error { - return c.conn.Close() -} - -func NewClient(address string) (*InterplexClient, error) { - // Connect to the K8sGPT server and create a new client - conn, err := grpc.Dial(address, grpc.WithInsecure(), grpc.WithBlock()) - if err != nil { - return nil, fmt.Errorf("failed to create context: %v", err) - } - // Wait until the connection is ready - state := conn.GetState() - if state != connectivity.Ready { - return nil, fmt.Errorf("failed to connect, current state: %v", state) - } - client := &InterplexClient{conn: conn} - - return client, nil } func (c *InterplexCache) Configure(cacheInfo CacheProvider) error { @@ -58,12 +35,12 @@ func (c *InterplexCache) Configure(cacheInfo CacheProvider) error { func (c *InterplexCache) Store(key string, data string) error { - client, err := NewClient(c.configuration.ConnectionString) + conn, err := grpc.NewClient(c.configuration.ConnectionString, grpc.WithInsecure(), grpc.WithBlock()) + defer conn.Close() if err != nil { return err } - c.client = *client - serviceClient := rpc.NewCacheServiceClient(c.client.conn) + serviceClient := rpc.NewCacheServiceClient(conn) c.cacheServiceClient = serviceClient req := schemav1.SetRequest{ Key: key, @@ -77,12 +54,12 @@ func (c *InterplexCache) Store(key string, data string) error { } func (c *InterplexCache) Load(key string) (string, error) { - client, err := NewClient(c.configuration.ConnectionString) + conn, err := grpc.NewClient(c.configuration.ConnectionString, grpc.WithInsecure(), grpc.WithBlock()) + defer conn.Close() if err != nil { return "", err } - c.client = *client - serviceClient := rpc.NewCacheServiceClient(c.client.conn) + serviceClient := rpc.NewCacheServiceClient(conn) c.cacheServiceClient = serviceClient req := schemav1.GetRequest{ Key: key,