Merge pull request uswitch#33 from uswitch/nil-secret

Add check for nil secret
gdisdevops · Dec 11, 2020 · 6a41f71 · 6a41f71
2 parents abf3365 + b27a6d0
commit 6a41f71
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/pkg/vault/manager.go b/pkg/vault/manager.go
@@ -154,7 +154,10 @@ func (m *DefaultManager) Save() error {
 
 func (m *DefaultManager) renewSecret(leaseID string) error {
 	secret, err := m.client.Sys().Renew(leaseID, int(m.lease.Seconds()))
-	if err != nil {
+	if err != nil || secret == nil {
+		if err == nil {
+			err = fmt.Errorf("secret is nil")
+		}
 		log.Errorf("error renewing lease: %s", err)
 		fatalError := checkFatalError(err)
 		if fatalError != nil {
@@ -189,7 +192,10 @@ func (m *DefaultManager) renewCertificate() error {
 
 func renewAuth(client *api.Client, renew int) error {
 	secret, err := client.Auth().Token().RenewSelf(renew)
-	if err != nil {
+	if err != nil || secret == nil {
+		if err == nil {
+			err = fmt.Errorf("secret is nil")
+		}
 		log.Errorf("error renewing token: %s", err)
 		fatalError := checkFatalError(err)
 		if fatalError != nil {

diff --git a/pkg/vault/providers.go b/pkg/vault/providers.go
@@ -49,7 +49,10 @@ func (c *VaultSecretsProvider) newCertificate() (*Certificate, error) {
 	}
 
 	secret, err := c.client.Logical().Write(c.path, params)
-	if err != nil {
+	if err != nil || secret == nil {
+		if err == nil {
+			return nil, fmt.Errorf("secret is nil")
+		}
 		return nil, err
 	}
 
@@ -73,7 +76,10 @@ func (c *VaultSecretsProvider) newCertificate() (*Certificate, error) {
 
 func (c *VaultSecretsProvider) newCredentials() (*Credentials, error) {
 	secret, err := c.client.Logical().Read(c.path)
-	if err != nil {
+	if err != nil || secret == nil {
+		if err == nil {
+			return nil, fmt.Errorf("secret is nil")
+		}
 		return nil, err
 	}