kemko/nomad
1
0
Fork 0
mirror of https://github.com/kemko/nomad.git synced 2026-01-06 18:35:44 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix other usages of initKeyring func to use logger as third argument

Browse Source
This commit is contained in:
Kent 'picat' Gruber
2020-10-01 11:13:06 -04:00
parent 2ae72441b5
commit 614729bd4c
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
command/agent/keyring_test.go
View File

@@ -6,6 +6,8 @@ import (
"os"
"path/filepath"
"testing"
"github.com/hashicorp/go-hclog"
)
func TestAgent_LoadKeyrings(t *testing.T) {
@@ -56,8 +58,10 @@ func TestAgent_InitKeyring(t *testing.T) {
file := filepath.Join(dir, "keyring")
logger := hclog.NewNullLogger()
// First initialize the keyring
if err := initKeyring(file, key1); err != nil {
if err := initKeyring(file, key1, logger); err != nil {
t.Fatalf("err: %s", err)
}
@@ -70,7 +74,7 @@ func TestAgent_InitKeyring(t *testing.T) {
}
// Try initializing again with a different key
if err := initKeyring(file, key2); err != nil {
if err := initKeyring(file, key2, logger); err != nil {
t.Fatalf("err: %s", err)
}

2
command/agent/testagent.go
View File

@@ -147,7 +147,7 @@ RETRY:
if a.Key != "" {
writeKey := func(key, filename string) {
path := filepath.Join(a.Config.DataDir, filename)
if err := initKeyring(path, key); err != nil {
if err := initKeyring(path, key, a.logger); err != nil {
a.T.Fatalf("Error creating keyring %s: %s", path, err)
}
}