Browse Source

Merge pull request #954 from goto-opensource/fix/vault-error-message-store-validation-k8s-sa

fix: error message for Vault store validation of `Auth.Jwt.KubernetesServiceAccountToken`
paul-the-alien[bot] 4 years ago
parent
commit
d2d9cd7c41
1 changed files with 2 additions and 1 deletions
  1. 2 1
      pkg/provider/vault/vault.go

+ 2 - 1
pkg/provider/vault/vault.go

@@ -96,6 +96,7 @@ const (
 	errInvalidClientCert = "invalid Auth.Cert.ClientCert: %w"
 	errInvalidClientCert = "invalid Auth.Cert.ClientCert: %w"
 	errInvalidCertSec    = "invalid Auth.Cert.SecretRef: %w"
 	errInvalidCertSec    = "invalid Auth.Cert.SecretRef: %w"
 	errInvalidJwtSec     = "invalid Auth.Jwt.SecretRef: %w"
 	errInvalidJwtSec     = "invalid Auth.Jwt.SecretRef: %w"
+	errInvalidJwtK8sSA   = "invalid Auth.Jwt.KubernetesServiceAccountToken.ServiceAccountRef: %w"
 	errInvalidKubeSA     = "invalid Auth.Kubernetes.ServiceAccountRef: %w"
 	errInvalidKubeSA     = "invalid Auth.Kubernetes.ServiceAccountRef: %w"
 	errInvalidKubeSec    = "invalid Auth.Kubernetes.SecretRef: %w"
 	errInvalidKubeSec    = "invalid Auth.Kubernetes.SecretRef: %w"
 	errInvalidLdapSec    = "invalid Auth.Ldap.SecretRef: %w"
 	errInvalidLdapSec    = "invalid Auth.Ldap.SecretRef: %w"
@@ -231,7 +232,7 @@ func (c *connector) ValidateStore(store esv1beta1.GenericStore) error {
 			}
 			}
 		} else if p.Auth.Jwt.KubernetesServiceAccountToken != nil {
 		} else if p.Auth.Jwt.KubernetesServiceAccountToken != nil {
 			if err := utils.ValidateServiceAccountSelector(store, p.Auth.Jwt.KubernetesServiceAccountToken.ServiceAccountRef); err != nil {
 			if err := utils.ValidateServiceAccountSelector(store, p.Auth.Jwt.KubernetesServiceAccountToken.ServiceAccountRef); err != nil {
-				return fmt.Errorf(errInvalidJwtSec, err)
+				return fmt.Errorf(errInvalidJwtK8sSA, err)
 			}
 			}
 		} else {
 		} else {
 			return fmt.Errorf(errJwtNoTokenSource)
 			return fmt.Errorf(errJwtNoTokenSource)