Fix worker auth rotation test (#3243)
Most of the changes here are changes or enhancements that are useful for tests. The crux of the issue was that I had pulled up one var to the package level so it could be read from tests, but that var was not being reset between tests. It's not even used in tests anymore, so I put it back to function-local.
This commit is contained in:
1 parent
ace2def49d
commit
e8559d142a
8 files changed
+57
-27
No files matched your search
@@ -12,6 +12,7 @@ import (
|
||||
"strconv"
|
||||
"strings"
|
||||
"sync"
|
||||
"sync/atomic"
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
@@ -476,6 +477,9 @@ type TestControllerOpts struct {
|
||||
|
||||
// The time to use for CA certificate lifetime for worker auth
|
||||
WorkerAuthCaCertificateLifetime time.Duration
|
||||
|
||||
// Toggle worker auth debugging
|
||||
WorkerAuthDebuggingEnabled *atomic.Bool
|
||||
}
|
||||
|
||||
func NewTestController(t testing.TB, opts *TestControllerOpts) *TestController {
|
||||
@@ -494,6 +498,7 @@ func NewTestController(t testing.TB, opts *TestControllerOpts) *TestController {
|
||||
shutdownDoneCh: make(chan struct{}),
|
||||
shutdownOnce: new(sync.Once),
|
||||
}
|
||||
t.Cleanup(tc.Shutdown)
|
||||
|
||||
conf := TestControllerConfig(t, ctx, tc, opts)
|
||||
var err error
|
||||
@@ -546,6 +551,7 @@ func TestControllerConfig(t testing.TB, ctx context.Context, tc *TestController,
|
||||
ContextCancel: cancel,
|
||||
ShutdownCh: make(chan struct{}),
|
||||
})
|
||||
tc.b.WorkerAuthDebuggingEnabled = opts.WorkerAuthDebuggingEnabled
|
||||
|
||||
// Get dev config, or use a provided one
|
||||
var err error
|
||||
@@ -804,6 +810,8 @@ func (tc *TestController) AddClusterControllerMember(t testing.TB, opts *TestCon
|
||||
PublicClusterAddr: opts.PublicClusterAddr,
|
||||
WorkerStatusGracePeriodDuration: opts.WorkerStatusGracePeriodDuration,
|
||||
LivenessTimeToStaleDuration: opts.LivenessTimeToStaleDuration,
|
||||
WorkerAuthCaCertificateLifetime: tc.c.conf.TestOverrideWorkerAuthCaCertificateLifetime,
|
||||
WorkerAuthDebuggingEnabled: tc.c.conf.WorkerAuthDebuggingEnabled,
|
||||
}
|
||||
if opts.Logger != nil {
|
||||
nextOpts.Logger = opts.Logger
|
||||
|
||||
Reference in new issue
Block a user