Browse Source

Fixed some masked error and avoided panics

Sebastián Gómez 4 years ago
parent
commit
3b6c6ca09a

+ 3 - 3
pkg/controllers/externalsecret/externalsecret_controller.go

@@ -400,12 +400,12 @@ func (r *Reconciler) getProviderSecretData(ctx context.Context, providerClient e
 		if remoteRef.Find != nil {
 			secretMap, err = providerClient.GetAllSecrets(ctx, *remoteRef.Find)
 			if err != nil {
-				return nil, fmt.Errorf(errGetSecretKey, remoteRef.Extract.Key, externalSecret.Name, err)
+				return nil, err
 			}
 		} else if remoteRef.Extract != nil {
 			secretMap, err = providerClient.GetSecretMap(ctx, *remoteRef.Extract)
 			if err != nil {
-				return nil, fmt.Errorf(errGetSecretKey, remoteRef.Extract.Key, externalSecret.Name, err)
+				return nil, err
 			}
 		}
 
@@ -415,7 +415,7 @@ func (r *Reconciler) getProviderSecretData(ctx context.Context, providerClient e
 	for _, secretRef := range externalSecret.Spec.Data {
 		secretData, err := providerClient.GetSecret(ctx, secretRef.RemoteRef)
 		if err != nil {
-			return nil, fmt.Errorf(errGetSecretKey, secretRef.RemoteRef.Key, externalSecret.Name, err)
+			return nil, err
 		}
 
 		providerData[secretRef.SecretKey] = secretData

+ 4 - 3
pkg/provider/azure/keyvault/keyvault.go

@@ -162,10 +162,10 @@ func (a *Azure) GetAllSecrets(ctx context.Context, ref esv1beta1.ExternalSecretF
 	checkName := ref.Name != nil && len(ref.Name.RegExp) > 0
 
 	secretListIter, err := basicClient.GetSecretsComplete(context.Background(), *a.provider.VaultURL, nil)
-
 	if err != nil {
 		return nil, err
 	}
+
 	for secretListIter.NotDone() {
 		secretList := secretListIter.Response().Value
 		for _, secret := range *secretList {
@@ -175,13 +175,14 @@ func (a *Azure) GetAllSecrets(ctx context.Context, ref esv1beta1.ExternalSecretF
 			}
 
 			secretResp, err := basicClient.GetSecret(context.Background(), *a.provider.VaultURL, secretName, "")
-			secretValue := *secretResp.Value
-
 			if err != nil {
 				return nil, err
 			}
+
+			secretValue := *secretResp.Value
 			secretsMap[secretName] = []byte(secretValue)
 		}
+
 		err = secretListIter.Next()
 		if err != nil {
 			return nil, err