Cleanup

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
 

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,15 +54,16 @@ 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)
 		}
 		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)