Merge pull request #29 from Infisical/feat/add-caching-to-retrieve-secret

feat: add caching to retrieve secret

Author: sheensantoscapadngan

packages/api/secrets/list_secrets.go

@@ -20,14 +20,15 @@ func CallListSecretsV3(cache *expirable.LRU[string, interface{}], httpClient *re
 		if err != nil {
 			return ListSecretsV3RawResponse{}, err
 		}
-		cacheKey = util.ComputeCacheKeyFromBytes(reqBytes)
+		cacheKey = util.ComputeCacheKeyFromBytes(reqBytes, callListSecretsV3RawOperation)
 		if cached, found := cache.Get(cacheKey); found {
 			if response, ok := cached.(ListSecretsV3RawResponse); ok {
 				return response, nil
 			}
 			cache.Remove(cacheKey)
 		}
 	}
+
 	secretsResponse := ListSecretsV3RawResponse{}
 
 	if request.SecretPath == "" {

packages/api/secrets/models.go

@@ -24,7 +24,7 @@ type ListSecretsV3RawResponse struct {
 // Retrieve secret
 
 type RetrieveSecretV3RawRequest struct {
-	SecretKey string `json:"-"`
+	SecretKey string `json:"secretKey"`
 
 	ProjectID      string `json:"workspaceId"`
 	Environment    string `json:"environment"`

packages/api/secrets/retrieve_secret.go

@@ -1,15 +1,33 @@
 package api
 
 import (
+	"encoding/json"
 	"fmt"
 
 	"github.com/go-resty/resty/v2"
+	"github.com/hashicorp/golang-lru/v2/expirable"
 	"github.com/infisical/go-sdk/packages/errors"
+	"github.com/infisical/go-sdk/packages/util"
 )
 
 const callRetrieveSecretV3RawOperation = "CallRetrieveSecretV3Raw"
 
-func CallRetrieveSecretV3(httpClient *resty.Client, request RetrieveSecretV3RawRequest) (RetrieveSecretV3RawResponse, error) {
+func CallRetrieveSecretV3(cache *expirable.LRU[string, interface{}], httpClient *resty.Client, request RetrieveSecretV3RawRequest) (RetrieveSecretV3RawResponse, error) {
+	var cacheKey string
+
+	if cache != nil {
+		reqBytes, err := json.Marshal(request)
+		if err != nil {
+			return RetrieveSecretV3RawResponse{}, err
+		}
+		cacheKey = util.ComputeCacheKeyFromBytes(reqBytes, callRetrieveSecretV3RawOperation)
+		if cached, found := cache.Get(cacheKey); found {
+			if response, ok := cached.(RetrieveSecretV3RawResponse); ok {
+				return response, nil
+			}
+			cache.Remove(cacheKey)
+		}
+	}
 
 	retrieveResponse := RetrieveSecretV3RawResponse{}
 
@@ -41,5 +59,9 @@ func CallRetrieveSecretV3(httpClient *resty.Client, request RetrieveSecretV3RawR
 		return RetrieveSecretV3RawResponse{}, errors.NewAPIErrorWithResponse(callRetrieveSecretV3RawOperation, res)
 	}
 
+	if cache != nil {
+		cache.Add(cacheKey, retrieveResponse)
+	}
+
 	return retrieveResponse, nil
 }

packages/util/helper.go

@@ -106,7 +106,7 @@ func SleepWithContext(ctx context.Context, duration time.Duration) error {
 	}
 }
 
-func ComputeCacheKeyFromBytes(bytes []byte) string {
+func ComputeCacheKeyFromBytes(bytes []byte, feature string) string {
 	key := sha256.Sum256(bytes)
-	return hex.EncodeToString(key[:])
+	return fmt.Sprintf("%s-%s", feature, hex.EncodeToString(key[:]))
 }

secrets.go

@@ -65,7 +65,7 @@ func (s *Secrets) List(options ListSecretsOptions) ([]models.Secret, error) {
 }
 
 func (s *Secrets) Retrieve(options RetrieveSecretOptions) (models.Secret, error) {
-	res, err := api.CallRetrieveSecretV3(s.client.httpClient, options)
+	res, err := api.CallRetrieveSecretV3(s.client.cache, s.client.httpClient, options)
 
 	if err != nil {
 		return models.Secret{}, err