Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(vault): Added more error handling to vault #2361

Merged
merged 1 commit into from Nov 29, 2018
Merged

feat(vault): Added more error handling to vault #2361

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 13 additions & 0 deletions pkg/vault/vaultfactory.go
View file
Open in desktop
Expand Up @@ -5,6 +5,7 @@ import (
"github.com/hashicorp/vault/api"
"github.com/jenkins-x/jx/pkg/jx/cmd/common"
"github.com/jenkins-x/jx/pkg/kube/serviceaccount"
"github.com/pkg/errors"
"k8s.io/api/core/v1"
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/client-go/kubernetes"
Expand Down Expand Up @@ -58,6 +59,9 @@ func (v VaultClientFactory) NewVaultClient(name string, namespace string) (*api.
}
vaultClient, err := api.NewClient(config)
token, err := getTokenFromVault(role, jwt, vaultClient)
if err != nil {
return nil, errors.Wrapf(err, "Error getting Vault signin token")
}
vaultClient.SetToken(token)
return vaultClient, nil
}
Expand All @@ -84,10 +88,19 @@ func (v *VaultClientFactory) getServiceAccountFromVault(vault *Vault) (*v1.Servi
}

func getTokenFromVault(role string, jwt string, vaultClient *api.Client) (string, error) {
if role == "" {
return "", errors.New("Role cannot be empty")
}
if jwt == "" {
return "", errors.New("JWT cannot be empty empty")
}
m := map[string]interface{}{
"jwt": jwt,
"role": role,
}
sec, err := vaultClient.Logical().Write("/auth/kubernetes/login", m)
if err != nil {
return "", err
}
return sec.Auth.ClientToken, err
}