Update test var name and tidy

This commit is contained in:
Jeff Mitchell
2020-01-16 20:18:59 -05:00
parent ca626bbd39
commit 9fb12a733e
43 changed files with 227 additions and 8955 deletions

View File

@@ -30,13 +30,13 @@ func TestSealMigration(t *testing.T) {
if err != nil {
t.Fatal(err)
}
shamirwrapper := vault.NewDefaultSeal(&seal.Access{
wrapper := vault.NewDefaultSeal(&seal.Access{
Wrapper: aeadwrapper.NewWrapper(&wrapping.WrapperOptions{
Logger: logger.Named("shamir"),
}),
})
coreConfig := &vault.CoreConfig{
Seal: shamirwrapper,
Seal: wrapper,
Physical: phys,
HAPhysical: haPhys.(physical.HABackend),
DisableSealWrap: true,
@@ -257,7 +257,7 @@ func TestSealMigration(t *testing.T) {
core := cluster.Cores[0].Core
if err := adjustCoreForSealMigration(logger, core, shamirwrapper, altSeal); err != nil {
if err := adjustCoreForSealMigration(logger, core, wrapper, altSeal); err != nil {
t.Fatal(err)
}
@@ -293,7 +293,7 @@ func TestSealMigration(t *testing.T) {
{
logger.SetLevel(hclog.Trace)
logger.Info("integ: verify autoseal is off and the expected key shares work")
coreConfig.Seal = shamirwrapper
coreConfig.Seal = wrapper
cluster := vault.NewTestCluster(t, coreConfig, clusterConfig)
cluster.Start()
defer cluster.Cleanup()