From 7c144a1dac1a863d64cc64cb660a30e8646ec3bc Mon Sep 17 00:00:00 2001
From: Joe Klein <jklein@covermymeds.com>
Date: Wed, 22 Jan 2025 09:30:30 -0500
Subject: [PATCH] Cleanup

---
 README.md                |  2 +-
 client/cyberarkclient.go | 17 +++++++++++------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index f72b68e..704ac42 100644
--- a/README.md
+++ b/README.md
@@ -58,7 +58,7 @@ credential has either:
 1. a `login`, `apiKey`, `account`, `applianceUrl`, and `safe`
 
 The ENV vars (or .env file) will be injected
-as a credential with the name `default` (or `default_cyberark`) if you don't override `default` (or `default_cyberark` within your config file.
+as a credential with the name `default` (or `default_cyberark`) if you don't override `default` (or `default_cyberark`) within your config file.
 
 ## Resources
 
diff --git a/client/cyberarkclient.go b/client/cyberarkclient.go
index 8ff3547..9f10eb5 100644
--- a/client/cyberarkclient.go
+++ b/client/cyberarkclient.go
@@ -2,13 +2,14 @@ package client
 
 import (
 	"fmt"
-	"strings"
 	"strconv"
+	"strings"
 
 	"github.com/covermymeds/azure-key-vault-agent/certs"
 	"github.com/covermymeds/azure-key-vault-agent/config"
 	"github.com/covermymeds/azure-key-vault-agent/keys"
 	"github.com/covermymeds/azure-key-vault-agent/secrets"
+	log "github.com/sirupsen/logrus"
 
 	"github.com/cyberark/conjur-api-go/conjurapi"
 	"github.com/cyberark/conjur-api-go/conjurapi/authn"
@@ -32,7 +33,7 @@ func NewCyberarkClient(cred config.CyberarkCredentialConfig) CyberarkClient {
 		},
 	)
 	if err != nil {
-		panic(err)
+		panic(fmt.Sprintf("Error creating Cyberark client: %v", err.Error()))
 	}
 	return CyberarkClient{Client: cyberarkClient, Safe: cred.Safe}
 }
@@ -53,7 +54,7 @@ func (c CyberarkClient) GetSecret(vaultBaseURL string, secretName string, secret
 
 	if secretVersion == "" {
 		secretValue, err = c.Client.RetrieveSecret(secretPath)
-	}	else {
+	} else {
 		secretVersionInt, convErr := strconv.Atoi(secretVersion)
 		if convErr != nil {
 			return secrets.Secret{}, fmt.Errorf("failed to convert secret version to integer: %s", secretVersion)
@@ -61,7 +62,8 @@ func (c CyberarkClient) GetSecret(vaultBaseURL string, secretName string, secret
 		secretValue, err = c.Client.RetrieveSecretWithVersion(secretPath, secretVersionInt)
 	}
 	if err != nil {
-		panic(err)
+		log.Printf("Error getting secret: %v", err.Error())
+		return secrets.Secret{}, err
 	}
 
 	secretValueString := string(secretValue)
@@ -76,11 +78,14 @@ func (c CyberarkClient) GetSecret(vaultBaseURL string, secretName string, secret
 func (c CyberarkClient) GetSecrets(vaultBaseURL string) (results map[string]secrets.Secret, err error) {
 	resources, err := c.Client.ResourceIDs(&conjurapi.ResourceFilter{Kind: "variable"})
 	if err != nil {
-		panic(err)
+		log.Printf("Error getting secrets: %v", err.Error())
+		return map[string]secrets.Secret{}, err
 	}
+
 	secretValues, err := c.Client.RetrieveBatchSecrets(resources)
 	if err != nil {
-		panic(err)
+		log.Printf("Error getting secrets: %v", err.Error())
+		return map[string]secrets.Secret{}, err
 	}
 
 	results = make(map[string]secrets.Secret)