kemko/nomad
1
0
Fork 0
mirror of https://github.com/kemko/nomad.git synced 2026-01-07 02:45:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix tests

Browse Source
This commit is contained in:
vishalnayak
2016-08-29 21:30:06 -04:00
parent 72d2e9d2dd
commit dd26f9b4bf
2 changed files with 9 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
client/client.go
View File

@@ -1311,7 +1311,8 @@ func (c *Client) setupVaultClient() error {
}
var err error
if c.vaultClient, err = vaultclient.NewVaultClient(c.config.VaultConfig, c.logger, c.tokenDeriver); err != nil {
if c.vaultClient, err =
vaultclient.NewVaultClient(c.config.VaultConfig, c.logger, c.deriveToken); err != nil {
return err
}
@@ -1323,7 +1324,10 @@ func (c *Client) setupVaultClient() error {
return nil
}
func (c *Client) tokenDeriver(alloc *structs.Allocation, taskNames []string, vclient *vaultapi.Client) (map[string]string, error) {
// deriveToken takes in an allocation and a set of tasks and derives vault
// tokens for each of the tasks, unwraps all of them using the supplied vault
// client and returns a map of unwrapped tokens, indexed by the task name.
func (c *Client) deriveToken(alloc *structs.Allocation, taskNames []string, vclient *vaultapi.Client) (map[string]string, error) {
if alloc == nil {
return nil, fmt.Errorf("nil allocation")
}

24
client/vaultclient/vaultclient_test.go
View File

@@ -7,9 +7,6 @@ import (
"time"
"github.com/hashicorp/nomad/client/config"
"github.com/hashicorp/nomad/client/rpcproxy"
"github.com/hashicorp/nomad/nomad"
"github.com/hashicorp/nomad/nomad/structs"
"github.com/hashicorp/nomad/testutil"
vaultapi "github.com/hashicorp/vault/api"
)
@@ -20,12 +17,7 @@ func TestVaultClient_EstablishConnection(t *testing.T) {
logger := log.New(os.Stderr, "TEST: ", log.Lshortfile|log.LstdFlags)
v.Config.ConnectionRetryIntv = 100 * time.Millisecond
v.Config.TaskTokenTTL = "10s"
node := &structs.Node{}
connPool := &nomad.ConnPool{}
rpcProxy := &rpcproxy.RPCProxy{}
var rpcHandler config.RPCHandler
c, err := NewVaultClient(node, "global", v.Config, logger, rpcHandler,
connPool, rpcProxy)
c, err := NewVaultClient(v.Config, logger, nil)
if err != nil {
t.Fatalf("failed to build vault client: %v", err)
}
@@ -58,12 +50,7 @@ func TestVaultClient_TokenRenewals(t *testing.T) {
logger := log.New(os.Stderr, "TEST: ", log.Lshortfile|log.LstdFlags)
v.Config.ConnectionRetryIntv = 100 * time.Millisecond
v.Config.TaskTokenTTL = "10s"
node := &structs.Node{}
connPool := &nomad.ConnPool{}
rpcProxy := &rpcproxy.RPCProxy{}
var rpcHandler config.RPCHandler
c, err := NewVaultClient(node, "global", v.Config, logger, rpcHandler,
connPool, rpcProxy)
c, err := NewVaultClient(v.Config, logger, nil)
if err != nil {
t.Fatalf("failed to build vault client: %v", err)
}
@@ -138,12 +125,7 @@ func TestVaultClient_Heap(t *testing.T) {
conf.VaultConfig.TaskTokenTTL = "10s"
logger := log.New(os.Stderr, "TEST: ", log.Lshortfile|log.LstdFlags)
node := &structs.Node{}
connPool := &nomad.ConnPool{}
rpcProxy := &rpcproxy.RPCProxy{}
var rpcHandler config.RPCHandler
c, err := NewVaultClient(node, "global", conf.VaultConfig, logger, rpcHandler,
connPool, rpcProxy)
c, err := NewVaultClient(conf.VaultConfig, logger, nil)
if err != nil {
t.Fatal(err)
}