From af12d056ba68307a863fbd80db2c17b09e4ab8e6 Mon Sep 17 00:00:00 2001 From: vishalnayak Date: Fri, 30 Jun 2017 20:54:05 -0400 Subject: [PATCH] fix expiration tests --- vault/expiration_test.go | 77 ++++++++++++++++++++++++++++------------ vault/rollback_test.go | 2 +- vault/testing.go | 5 ++- 3 files changed, 59 insertions(+), 25 deletions(-) diff --git a/vault/expiration_test.go b/vault/expiration_test.go index f5f4ff3f86..6bdf878d0e 100644 --- a/vault/expiration_test.go +++ b/vault/expiration_test.go @@ -285,7 +285,10 @@ func benchmarkExpirationBackend(b *testing.B, physicalBackend physical.Backend, if err != nil { b.Fatal(err) } - exp.router.Mount(noop, "prod/aws/", &MountEntry{UUID: meUUID}, view) + err = exp.router.Mount(noop, "prod/aws/", &MountEntry{Path: "prod/aws/", Type: "noop", UUID: meUUID, Accessor: "noop-accessor"}, view) + if err != nil { + b.Fatal(err) + } // Register fake leases for i := 0; i < numLeases; i++ { @@ -341,7 +344,10 @@ func TestExpiration_Restore(t *testing.T) { if err != nil { t.Fatal(err) } - exp.router.Mount(noop, "prod/aws/", &MountEntry{UUID: meUUID}, view) + err = exp.router.Mount(noop, "prod/aws/", &MountEntry{Path: "prod/aws/", Type: "noop", UUID: meUUID, Accessor: "noop-accessor"}, view) + if err != nil { + t.Fatal(err) + } paths := []string{ "prod/aws/foo", @@ -508,7 +514,10 @@ func TestExpiration_Revoke(t *testing.T) { if err != nil { t.Fatal(err) } - exp.router.Mount(noop, "prod/aws/", &MountEntry{UUID: meUUID}, view) + err = exp.router.Mount(noop, "prod/aws/", &MountEntry{Path: "prod/aws/", Type: "noop", UUID: meUUID, Accessor: "noop-accessor"}, view) + if err != nil { + t.Fatal(err) + } req := &logical.Request{ Operation: logical.ReadOperation, @@ -551,7 +560,10 @@ func TestExpiration_RevokeOnExpire(t *testing.T) { if err != nil { t.Fatal(err) } - exp.router.Mount(noop, "prod/aws/", &MountEntry{UUID: meUUID}, view) + err = exp.router.Mount(noop, "prod/aws/", &MountEntry{Path: "prod/aws/", Type: "noop", UUID: meUUID, Accessor: "noop-accessor"}, view) + if err != nil { + t.Fatal(err) + } req := &logical.Request{ Operation: logical.ReadOperation, @@ -605,7 +617,10 @@ func TestExpiration_RevokePrefix(t *testing.T) { if err != nil { t.Fatal(err) } - exp.router.Mount(noop, "prod/aws/", &MountEntry{UUID: meUUID}, view) + err = exp.router.Mount(noop, "prod/aws/", &MountEntry{Path: "prod/aws/", Type: "noop", UUID: meUUID, Accessor: "noop-accessor"}, view) + if err != nil { + t.Fatal(err) + } paths := []string{ "prod/aws/foo", @@ -670,7 +685,10 @@ func TestExpiration_RevokeByToken(t *testing.T) { if err != nil { t.Fatal(err) } - exp.router.Mount(noop, "prod/aws/", &MountEntry{UUID: meUUID}, view) + err = exp.router.Mount(noop, "prod/aws/", &MountEntry{Path: "prod/aws/", Type: "noop", UUID: meUUID, Accessor: "noop-accessor"}, view) + if err != nil { + t.Fatal(err) + } paths := []string{ "prod/aws/foo", @@ -800,7 +818,10 @@ func TestExpiration_Renew(t *testing.T) { if err != nil { t.Fatal(err) } - exp.router.Mount(noop, "prod/aws/", &MountEntry{UUID: meUUID}, view) + err = exp.router.Mount(noop, "prod/aws/", &MountEntry{Path: "prod/aws/", Type: "noop", UUID: meUUID, Accessor: "noop-accessor"}, view) + if err != nil { + t.Fatal(err) + } req := &logical.Request{ Operation: logical.ReadOperation, @@ -867,7 +888,10 @@ func TestExpiration_Renew_NotRenewable(t *testing.T) { if err != nil { t.Fatal(err) } - exp.router.Mount(noop, "prod/aws/", &MountEntry{UUID: meUUID}, view) + err = exp.router.Mount(noop, "prod/aws/", &MountEntry{Path: "prod/aws/", Type: "noop", UUID: meUUID, Accessor: "noop-accessor"}, view) + if err != nil { + t.Fatal(err) + } req := &logical.Request{ Operation: logical.ReadOperation, @@ -914,7 +938,10 @@ func TestExpiration_Renew_RevokeOnExpire(t *testing.T) { if err != nil { t.Fatal(err) } - exp.router.Mount(noop, "prod/aws/", &MountEntry{UUID: meUUID}, view) + err = exp.router.Mount(noop, "prod/aws/", &MountEntry{Path: "prod/aws/", Type: "noop", UUID: meUUID, Accessor: "noop-accessor"}, view) + if err != nil { + t.Fatal(err) + } req := &logical.Request{ Operation: logical.ReadOperation, @@ -987,7 +1014,10 @@ func TestExpiration_revokeEntry(t *testing.T) { if err != nil { t.Fatal(err) } - exp.router.Mount(noop, "", &MountEntry{UUID: meUUID}, view) + err = exp.router.Mount(noop, "foo/bar/", &MountEntry{Path: "foo/bar/", Type: "noop", UUID: meUUID, Accessor: "noop-accessor"}, view) + if err != nil { + t.Fatal(err) + } le := &leaseEntry{ LeaseID: "foo/bar/1234", @@ -1014,13 +1044,10 @@ func TestExpiration_revokeEntry(t *testing.T) { req := noop.Requests[0] if req.Operation != logical.RevokeOperation { - t.Fatalf("Bad: %v", req) - } - if req.Path != le.Path { - t.Fatalf("Bad: %v", req) + t.Fatalf("bad: operation; req: %#v", req) } if !reflect.DeepEqual(req.Data, le.Data) { - t.Fatalf("Bad: %v", req) + t.Fatalf("bad: data; req: %#v\n le: %#v\n", req, le) } } @@ -1118,7 +1145,10 @@ func TestExpiration_renewEntry(t *testing.T) { if err != nil { t.Fatal(err) } - exp.router.Mount(noop, "", &MountEntry{UUID: meUUID}, view) + err = exp.router.Mount(noop, "foo/bar/", &MountEntry{Path: "foo/bar/", Type: "noop", UUID: meUUID, Accessor: "noop-accessor"}, view) + if err != nil { + t.Fatal(err) + } le := &leaseEntry{ LeaseID: "foo/bar/1234", @@ -1151,9 +1181,6 @@ func TestExpiration_renewEntry(t *testing.T) { if req.Operation != logical.RenewOperation { t.Fatalf("Bad: %v", req) } - if req.Path != le.Path { - t.Fatalf("Bad: %v", req) - } if !reflect.DeepEqual(req.Data, le.Data) { t.Fatalf("Bad: %v", req) } @@ -1184,7 +1211,10 @@ func TestExpiration_renewAuthEntry(t *testing.T) { if err != nil { t.Fatal(err) } - exp.router.Mount(noop, "auth/foo/", &MountEntry{UUID: meUUID}, view) + err = exp.router.Mount(noop, "auth/foo/", &MountEntry{Path: "auth/foo/", Type: "noop", UUID: meUUID, Accessor: "noop-accessor"}, view) + if err != nil { + t.Fatal(err) + } le := &leaseEntry{ LeaseID: "auth/foo/1234", @@ -1352,9 +1382,10 @@ func TestExpiration_RevokeForce(t *testing.T) { core.logicalBackends["badrenew"] = badRenewFactory me := &MountEntry{ - Table: mountTableType, - Path: "badrenew/", - Type: "badrenew", + Table: mountTableType, + Path: "badrenew/", + Type: "badrenew", + Accessor: "badrenewaccessor", } err := core.mount(me) diff --git a/vault/rollback_test.go b/vault/rollback_test.go index 797993a9dd..f050df7e08 100644 --- a/vault/rollback_test.go +++ b/vault/rollback_test.go @@ -29,7 +29,7 @@ func mockRollback(t *testing.T) (*RollbackManager, *NoopBackend) { if err != nil { t.Fatal(err) } - if err := router.Mount(backend, "foo", &MountEntry{UUID: meUUID}, view); err != nil { + if err := router.Mount(backend, "foo", &MountEntry{UUID: meUUID, Accessor: "noopaccessor"}, view); err != nil { t.Fatalf("err: %s", err) } diff --git a/vault/testing.go b/vault/testing.go index f53bbdaf37..051238b502 100644 --- a/vault/testing.go +++ b/vault/testing.go @@ -255,7 +255,10 @@ func testTokenStore(t testing.TB, c *Core) *TokenStore { ts := tokenstore.(*TokenStore) router := NewRouter() - router.Mount(ts, "auth/token/", &MountEntry{Table: credentialTableType, UUID: ""}, ts.view) + err = router.Mount(ts, "auth/token/", &MountEntry{Table: credentialTableType, UUID: "authtokenuuid", Path: "auth/token", Accessor: "authtokenaccessor"}, ts.view) + if err != nil { + t.Fatal(err) + } subview := c.systemBarrierView.SubView(expirationSubPath) logger := logformat.NewVaultLogger(log.LevelTrace)