scottk/vault
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/vault.git synced 2025-11-02 03:27:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

AgentCache: Properly compute auto-auth token (#6264)

Browse Source 
* Properly compute auto-auth token

* Use inmem sink to track auto-auth token

* update debug statement

* Only add inmem sink if using auto-auth token is allowed
This commit is contained in:
Vishal Nayak
2019-02-20 02:11:05 -05:00
committed by GitHub
parent e2929789f0
commit 1e0b6a0d88
7 changed files with 115 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
command/agent/cache_end_to_end_test.go
View File

@@ -19,6 +19,7 @@ import (
"github.com/hashicorp/vault/command/agent/cache"
"github.com/hashicorp/vault/command/agent/sink"
"github.com/hashicorp/vault/command/agent/sink/file"
"github.com/hashicorp/vault/command/agent/sink/inmem"
"github.com/hashicorp/vault/helper/logging"
vaulthttp "github.com/hashicorp/vault/http"
"github.com/hashicorp/vault/logical"
@@ -159,7 +160,18 @@ func TestCache_UsingAutoAuthToken(t *testing.T) {
Logger: logger.Named("sink.server"),
Client: client,
})
go ss.Run(ctx, ah.OutputCh, []*sink.SinkConfig{config})
inmemSinkConfig := &sink.SinkConfig{
Logger: logger.Named("sink.inmem"),
}
inmemSink, err := inmem.New(inmemSinkConfig)
if err != nil {
t.Fatal(err)
}
inmemSinkConfig.Sink = inmemSink
go ss.Run(ctx, ah.OutputCh, []*sink.SinkConfig{config, inmemSinkConfig})
defer func() {
<-ss.DoneCh
}()
@@ -253,7 +265,7 @@ func TestCache_UsingAutoAuthToken(t *testing.T) {
mux := http.NewServeMux()
mux.Handle("/v1/agent/cache-clear", leaseCache.HandleCacheClear(ctx))
mux.Handle("/", cache.Handler(ctx, cacheLogger, leaseCache, true, client))
mux.Handle("/", cache.Handler(ctx, cacheLogger, leaseCache, inmemSink))
server := &http.Server{
Handler: mux,
ReadHeaderTimeout: 10 * time.Second,