Skip to content

Commit 794838d

Browse files
daniel-weissedaniel-weisse
committed
coordinator: add debug logging
Signed-off-by: Daniel Weiße <[email protected]>
1 parent ea27924 commit 794838d

19 files changed

+135
-60
lines changed

Diff for: ‎cmd/coordinator/enclavemain.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ func main() {
3232
sealDirPrefix := filepath.Join(filepath.FromSlash("/edg"), "hostfs")
3333
sealDir := util.Getenv(constants.SealDir, constants.SealDirDefault())
3434
sealDir = filepath.Join(sealDirPrefix, sealDir)
35-
sealer := seal.NewAESGCMSealer()
35+
sealer := seal.NewAESGCMSealer(log)
3636
recovery := recovery.NewSinglePartyRecovery()
3737
run(log, validator, issuer, sealDir, sealer, recovery)
3838
}

Diff for: ‎cmd/coordinator/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ func main() {
2929
validator := quote.NewFailValidator()
3030
issuer := quote.NewFailIssuer()
3131
sealDir := util.Getenv(constants.SealDir, constants.SealDirDefault())
32-
sealer := seal.NewNoEnclaveSealer()
32+
sealer := seal.NewNoEnclaveSealer(log)
3333
recovery := recovery.NewSinglePartyRecovery()
3434
run(log, validator, issuer, sealDir, sealer, recovery)
3535
}

Diff for: ‎cmd/coordinator/run.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ func run(log *zap.Logger, validator quote.Validator, issuer quote.Issuer, sealDi
6666
go server.RunPrometheusServer(promServerAddr, log, promRegistry, eventlog)
6767
}
6868

69-
store := stdstore.New(sealer, afero.NewOsFs(), sealDir)
69+
store := stdstore.New(sealer, afero.NewOsFs(), sealDir, log)
7070

7171
// creating core
7272
log.Info("Creating the Core object")

Diff for: ‎coordinator/clientapi/clientapi_test.go

+12-12
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ func TestGetCertQuote(t *testing.T) {
5959
rootCert, intermediateCert := test.MustSetupTestCerts(test.RecoveryPrivateKey)
6060

6161
prepareDefaultStore := func() store.Store {
62-
s := stdstore.New(&seal.MockSealer{}, afero.NewMemMapFs(), "")
62+
s := stdstore.New(&seal.MockSealer{}, afero.NewMemMapFs(), "", zaptest.NewLogger(t))
6363
require.NoError(t, wrapper.New(s).PutCertificate(constants.SKCoordinatorRootCert, rootCert))
6464
require.NoError(t, wrapper.New(s).PutCertificate(constants.SKCoordinatorIntermediateCert, intermediateCert))
6565
return s
@@ -114,7 +114,7 @@ func TestGetCertQuote(t *testing.T) {
114114
},
115115
"root certificate not set": {
116116
store: func() store.Store {
117-
s := stdstore.New(&seal.MockSealer{}, afero.NewMemMapFs(), "")
117+
s := stdstore.New(&seal.MockSealer{}, afero.NewMemMapFs(), "", zaptest.NewLogger(t))
118118
require.NoError(t, wrapper.New(s).PutCertificate(constants.SKCoordinatorIntermediateCert, intermediateCert))
119119
return s
120120
}(),
@@ -126,7 +126,7 @@ func TestGetCertQuote(t *testing.T) {
126126
},
127127
"intermediate certificate not set": {
128128
store: func() store.Store {
129-
s := stdstore.New(&seal.MockSealer{}, afero.NewMemMapFs(), "")
129+
s := stdstore.New(&seal.MockSealer{}, afero.NewMemMapFs(), "", zaptest.NewLogger(t))
130130
require.NoError(t, wrapper.New(s).PutCertificate(constants.SKCoordinatorRootCert, rootCert))
131131
return s
132132
}(),
@@ -186,23 +186,23 @@ func TestGetManifestSignature(t *testing.T) {
186186
}{
187187
"success": {
188188
store: func() store.Store {
189-
s := stdstore.New(&seal.MockSealer{}, afero.NewMemMapFs(), "")
189+
s := stdstore.New(&seal.MockSealer{}, afero.NewMemMapFs(), "", zaptest.NewLogger(t))
190190
require.NoError(t, s.Put(request.Manifest, []byte("manifest")))
191191
require.NoError(t, s.Put(request.ManifestSignature, []byte("signature")))
192192
return s
193193
}(),
194194
},
195195
"GetRawManifest fails": {
196196
store: func() store.Store {
197-
s := stdstore.New(&seal.MockSealer{}, afero.NewMemMapFs(), "")
197+
s := stdstore.New(&seal.MockSealer{}, afero.NewMemMapFs(), "", zaptest.NewLogger(t))
198198
require.NoError(t, s.Put(request.ManifestSignature, []byte("signature")))
199199
return s
200200
}(),
201201
wantErr: true,
202202
},
203203
"GetManifestSignature fails": {
204204
store: func() store.Store {
205-
s := stdstore.New(&seal.MockSealer{}, afero.NewMemMapFs(), "")
205+
s := stdstore.New(&seal.MockSealer{}, afero.NewMemMapFs(), "", zaptest.NewLogger(t))
206206
require.NoError(t, s.Put(request.Manifest, []byte("manifest")))
207207
return s
208208
}(),
@@ -255,7 +255,7 @@ func TestGetSecrets(t *testing.T) {
255255
}{
256256
"success": {
257257
store: func() store.Store {
258-
s := stdstore.New(&seal.MockSealer{}, afero.NewMemMapFs(), "")
258+
s := stdstore.New(&seal.MockSealer{}, afero.NewMemMapFs(), "", zaptest.NewLogger(t))
259259
require.NoError(t, wrapper.New(s).PutSecret("secret1", manifest.Secret{
260260
Type: manifest.SecretTypePlain,
261261
Private: []byte("secret"),
@@ -275,7 +275,7 @@ func TestGetSecrets(t *testing.T) {
275275
},
276276
"wrong state": {
277277
store: func() store.Store {
278-
s := stdstore.New(&seal.MockSealer{}, afero.NewMemMapFs(), "")
278+
s := stdstore.New(&seal.MockSealer{}, afero.NewMemMapFs(), "", zaptest.NewLogger(t))
279279
require.NoError(t, wrapper.New(s).PutSecret("secret1", manifest.Secret{
280280
Type: manifest.SecretTypePlain,
281281
Private: []byte("secret"),
@@ -296,7 +296,7 @@ func TestGetSecrets(t *testing.T) {
296296
},
297297
"user is missing permissions": {
298298
store: func() store.Store {
299-
s := stdstore.New(&seal.MockSealer{}, afero.NewMemMapFs(), "")
299+
s := stdstore.New(&seal.MockSealer{}, afero.NewMemMapFs(), "", zaptest.NewLogger(t))
300300
require.NoError(t, wrapper.New(s).PutSecret("secret1", manifest.Secret{
301301
Type: manifest.SecretTypePlain,
302302
Private: []byte("secret"),
@@ -317,7 +317,7 @@ func TestGetSecrets(t *testing.T) {
317317
},
318318
"secret does not exist": {
319319
store: func() store.Store {
320-
s := stdstore.New(&seal.MockSealer{}, afero.NewMemMapFs(), "")
320+
s := stdstore.New(&seal.MockSealer{}, afero.NewMemMapFs(), "", zaptest.NewLogger(t))
321321
require.NoError(t, wrapper.New(s).PutSecret("secret1", manifest.Secret{
322322
Type: manifest.SecretTypePlain,
323323
Private: []byte("secret"),
@@ -410,7 +410,7 @@ func TestRecover(t *testing.T) {
410410
someErr := errors.New("failed")
411411
_, rootCert := test.MustSetupTestCerts(test.RecoveryPrivateKey)
412412
defaultStore := func() store.Store {
413-
s := stdstore.New(&seal.MockSealer{}, afero.NewMemMapFs(), "")
413+
s := stdstore.New(&seal.MockSealer{}, afero.NewMemMapFs(), "", zaptest.NewLogger(t))
414414
wr := wrapper.New(s)
415415
require.NoError(t, wr.PutCertificate(constants.SKCoordinatorRootCert, rootCert))
416416
require.NoError(t, wr.PutRawManifest([]byte(`{}`)))
@@ -500,7 +500,7 @@ func TestRecover(t *testing.T) {
500500
},
501501
"GetCertificate fails": {
502502
store: &fakeStore{
503-
store: stdstore.New(&seal.MockSealer{}, afero.NewMemMapFs(), ""),
503+
store: stdstore.New(&seal.MockSealer{}, afero.NewMemMapFs(), "", zaptest.NewLogger(t)),
504504
},
505505
recovery: &stubRecovery{},
506506
core: &fakeCore{

Diff for: ‎coordinator/clientapi/legacy_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -616,8 +616,8 @@ func setupAPI(t *testing.T) (*ClientAPI, wrapper.Wrapper) {
616616
t.Helper()
617617
require := require.New(t)
618618

619-
store := stdstore.New(&seal.MockSealer{}, afero.NewMemMapFs(), "")
620619
log := zaptest.NewLogger(t)
620+
store := stdstore.New(&seal.MockSealer{}, afero.NewMemMapFs(), "", log)
621621

622622
wrapper := wrapper.New(store)
623623

Diff for: ‎coordinator/constants/constants.go

+5
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,11 @@ const (
5959
// DevModeDefault is the default logging mode.
6060
DevModeDefault = "0"
6161

62+
// DebugLogging enables debug logs.
63+
DebugLogging = "EDG_DEBUG_LOGGING"
64+
// DebugLoggingDefault is the default value to use when the [DebugLogging] env variable is not set.
65+
DebugLoggingDefault = "0"
66+
6267
// StartupManifest is a path to a manifest to start with instead of waiting for a manifest from the api.
6368
StartupManifest = "EDG_STARTUP_MANIFEST"
6469
)

Diff for: ‎coordinator/core/certificate_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ func TestCertificateVerify(t *testing.T) {
4747
// create core
4848
validator := quote.NewMockValidator()
4949
issuer := quote.NewMockIssuer()
50-
stor := stdstore.New(&seal.MockSealer{}, afero.NewMemMapFs(), "")
50+
stor := stdstore.New(&seal.MockSealer{}, afero.NewMemMapFs(), "", zapLogger)
5151
recovery := recovery.NewSinglePartyRecovery()
5252
coreServer, err := NewCore([]string{"localhost"}, validator, issuer, stor, recovery, zapLogger, nil, nil)
5353
require.NoError(err)

Diff for: ‎coordinator/core/core.go

+11-4
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ func (c *Core) AdvanceState(newState state.State, tx interface {
9191
GetState() (state.State, error)
9292
},
9393
) error {
94+
c.log.Debug("Advancing state", zap.Int("from", int(newState)), zap.Int("to", int(newState)))
9495
curState, err := tx.GetState()
9596
if err != nil {
9697
return err
@@ -123,6 +124,7 @@ func NewCore(
123124

124125
zapLogger.Info("Loading state")
125126
recoveryData, loadErr := txHandle.LoadState()
127+
c.log.Debug("Loaded state", zap.Error(loadErr), zap.ByteString("recoveryData", recoveryData))
126128
if err := c.recovery.SetRecoveryData(recoveryData); err != nil {
127129
c.log.Error("Could not retrieve recovery data from state. Recovery will be unavailable", zap.Error(err))
128130
}
@@ -197,7 +199,7 @@ func NewCoreWithMocks() *Core {
197199
issuer := quote.NewMockIssuer()
198200
sealer := &seal.MockSealer{}
199201
recovery := recovery.NewSinglePartyRecovery()
200-
core, err := NewCore([]string{"localhost"}, validator, issuer, stdstore.New(sealer, afero.Afero{Fs: afero.NewMemMapFs()}, ""), recovery, zapLogger, nil, nil)
202+
core, err := NewCore([]string{"localhost"}, validator, issuer, stdstore.New(sealer, afero.Afero{Fs: afero.NewMemMapFs()}, "", zapLogger), recovery, zapLogger, nil, nil)
201203
if err != nil {
202204
panic(err)
203205
}
@@ -281,8 +283,10 @@ func (c *Core) GetTLSMarbleRootCertificate(clientHello *tls.ClientHelloInfo) (*t
281283
// If reportData is not nil, a new quote is generated over the data and returned.
282284
func (c *Core) GetQuote(reportData []byte) ([]byte, error) {
283285
if len(reportData) == 0 {
286+
c.log.Debug("Returning cached quote")
284287
return c.quote, nil
285288
}
289+
c.log.Debug("Generating new quote for report data")
286290
quote, err := c.qi.Issue(reportData)
287291
if err != nil && err.Error() != "OE_UNSUPPORTED" {
288292
return nil, QuoteError{err}
@@ -308,6 +312,7 @@ func (c *Core) GenerateQuote(cert []byte) error {
308312
}
309313

310314
c.quote = quote
315+
c.log.Debug("Quote generated and stored")
311316

312317
return nil
313318
}
@@ -366,11 +371,13 @@ func (c *Core) GenerateSecrets(
366371
for name, secret := range secrets {
367372
// Skip user defined secrets, these will be uploaded by a user
368373
if secret.UserDefined {
374+
c.log.Debug("Skipping generation of user defined secret", zap.String("name", name))
369375
continue
370376
}
371377

372378
// Skip secrets from wrong context
373379
if secret.Shared != (id == uuid.Nil) {
380+
c.log.Debug("Skipping generation of secret", zap.String("name", name), zap.String("type", secret.Type), zap.Bool("shared", secret.Shared))
374381
continue
375382
}
376383

@@ -425,7 +432,7 @@ func (c *Core) GenerateSecrets(
425432

426433
case manifest.SecretTypeCertED25519:
427434
if secret.Size != 0 {
428-
return nil, fmt.Errorf("invalid secret size for cert-ed25519, none is expected. given: %v", name)
435+
return nil, fmt.Errorf("invalid secret size for cert-ed25519 secret %s: none is expected, got: %d", name, secret.Size)
429436
}
430437

431438
// Generate keys
@@ -455,7 +462,7 @@ func (c *Core) GenerateSecrets(
455462
curve = elliptic.P521()
456463
default:
457464
c.log.Error("ECDSA secrets only support P224, P256, P384 and P521 as curve. Check the supplied size.", zap.String("name", name), zap.String("type", secret.Type), zap.Uint("size", secret.Size))
458-
return nil, fmt.Errorf("unsupported size %d: does not map to a supported curve", secret.Size)
465+
return nil, fmt.Errorf("invalid secret size for cert-ecdsa secret %s: unsupported size %d: does not map to a supported curve", name, secret.Size)
459466
}
460467

461468
// Generate keys
@@ -472,7 +479,7 @@ func (c *Core) GenerateSecrets(
472479
}
473480

474481
default:
475-
return nil, fmt.Errorf("unsupported secret of type %s", secret.Type)
482+
return nil, fmt.Errorf("secret %s is invalid: unsupported secret of type %s", name, secret.Type)
476483
}
477484
}
478485

Diff for: ‎coordinator/core/core_test.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ func TestSeal(t *testing.T) {
7171
fs := afero.NewMemMapFs()
7272
recovery := recovery.NewSinglePartyRecovery()
7373

74-
c, err := NewCore([]string{"localhost"}, validator, issuer, stdstore.New(sealer, fs, ""), recovery, zapLogger, nil, nil)
74+
c, err := NewCore([]string{"localhost"}, validator, issuer, stdstore.New(sealer, fs, "", zapLogger), recovery, zapLogger, nil, nil)
7575
require.NoError(err)
7676

7777
// Set manifest. This will seal the state.
@@ -89,7 +89,7 @@ func TestSeal(t *testing.T) {
8989
cSecrets := testutil.GetSecretMap(t, c.txHandle)
9090

9191
// Check sealing with a new core initialized with the sealed state.
92-
c2, err := NewCore([]string{"localhost"}, validator, issuer, stdstore.New(sealer, fs, ""), recovery, zapLogger, nil, nil)
92+
c2, err := NewCore([]string{"localhost"}, validator, issuer, stdstore.New(sealer, fs, "", zapLogger), recovery, zapLogger, nil, nil)
9393
require.NoError(err)
9494
clientAPI, err = clientapi.New(c2.txHandle, c2.recovery, c2, zapLogger)
9595
require.NoError(err)
@@ -125,7 +125,7 @@ func TestRecover(t *testing.T) {
125125
fs := afero.NewMemMapFs()
126126
recovery := recovery.NewSinglePartyRecovery()
127127

128-
c, err := NewCore([]string{"localhost"}, validator, issuer, stdstore.New(sealer, fs, ""), recovery, zapLogger, nil, nil)
128+
c, err := NewCore([]string{"localhost"}, validator, issuer, stdstore.New(sealer, fs, "", zapLogger), recovery, zapLogger, nil, nil)
129129
require.NoError(err)
130130
clientAPI, err := clientapi.New(c.txHandle, c.recovery, c, zapLogger)
131131
require.NoError(err)
@@ -145,7 +145,7 @@ func TestRecover(t *testing.T) {
145145

146146
// Initialize new core and let unseal fail
147147
sealer.UnsealError = &seal.EncryptionKeyError{}
148-
c2, err := NewCore([]string{"localhost"}, validator, issuer, stdstore.New(sealer, fs, ""), recovery, zapLogger, nil, nil)
148+
c2, err := NewCore([]string{"localhost"}, validator, issuer, stdstore.New(sealer, fs, "", zapLogger), recovery, zapLogger, nil, nil)
149149
sealer.UnsealError = nil
150150
require.NoError(err)
151151
clientAPI, err = clientapi.New(c2.txHandle, c2.recovery, c2, zapLogger)
@@ -304,14 +304,14 @@ func TestUnsetRestart(t *testing.T) {
304304
recovery := recovery.NewSinglePartyRecovery()
305305

306306
// create a new core, this seals the state with only certificate and keys
307-
c1, err := NewCore([]string{"localhost"}, validator, issuer, stdstore.New(sealer, fs, ""), recovery, zapLogger, nil, nil)
307+
c1, err := NewCore([]string{"localhost"}, validator, issuer, stdstore.New(sealer, fs, "", zapLogger), recovery, zapLogger, nil, nil)
308308
require.NoError(err)
309309
c1State := testutil.GetState(t, c1.txHandle)
310310
assert.Equal(state.AcceptingManifest, c1State)
311311
cCert := testutil.GetCertificate(t, c1.txHandle, constants.SKCoordinatorRootCert)
312312

313313
// create a second core, this should overwrite the previously sealed certificate and keys since no manifest was set
314-
c2, err := NewCore([]string{"localhost"}, validator, issuer, stdstore.New(sealer, fs, ""), recovery, zapLogger, nil, nil)
314+
c2, err := NewCore([]string{"localhost"}, validator, issuer, stdstore.New(sealer, fs, "", zapLogger), recovery, zapLogger, nil, nil)
315315
require.NoError(err)
316316
c2State := testutil.GetState(t, c2.txHandle)
317317
assert.Equal(state.AcceptingManifest, c2State)

Diff for: ‎coordinator/core/marbleapi_test.go

+8-7
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ func TestActivate(t *testing.T) {
5959
sealer := &seal.MockSealer{}
6060
fs := afero.NewMemMapFs()
6161
recovery := recovery.NewSinglePartyRecovery()
62-
coreServer, err := NewCore([]string{"localhost"}, validator, issuer, stdstore.New(sealer, fs, ""), recovery, zapLogger, nil, nil)
62+
coreServer, err := NewCore([]string{"localhost"}, validator, issuer, stdstore.New(sealer, fs, "", zapLogger), recovery, zapLogger, nil, nil)
6363
require.NoError(err)
6464
require.NotNil(coreServer)
6565

@@ -153,7 +153,7 @@ func TestMarbleSecretDerivation(t *testing.T) {
153153
sealer := &seal.MockSealer{}
154154
fs := afero.NewMemMapFs()
155155
recovery := recovery.NewSinglePartyRecovery()
156-
coreServer, err := NewCore([]string{"localhost"}, validator, issuer, stdstore.New(sealer, fs, ""), recovery, zapLogger, nil, nil)
156+
coreServer, err := NewCore([]string{"localhost"}, validator, issuer, stdstore.New(sealer, fs, "", zapLogger), recovery, zapLogger, nil, nil)
157157
require.NoError(err)
158158
require.NotNil(coreServer)
159159

@@ -584,7 +584,7 @@ func TestSecurityLevelUpdate(t *testing.T) {
584584
sealer := &seal.MockSealer{}
585585
fs := afero.NewMemMapFs()
586586
recovery := recovery.NewSinglePartyRecovery()
587-
coreServer, err := NewCore([]string{"localhost"}, validator, issuer, stdstore.New(sealer, fs, ""), recovery, zapLogger, nil, nil)
587+
coreServer, err := NewCore([]string{"localhost"}, validator, issuer, stdstore.New(sealer, fs, "", zapLogger), recovery, zapLogger, nil, nil)
588588
require.NoError(err)
589589
require.NotNil(coreServer)
590590

@@ -615,7 +615,7 @@ func TestSecurityLevelUpdate(t *testing.T) {
615615
spawner.newMarble(t, "frontend", "Azure", uuid.New(), false)
616616

617617
// Use a new core and test if updated manifest persisted after restart
618-
coreServer2, err := NewCore([]string{"localhost"}, validator, issuer, stdstore.New(sealer, fs, ""), recovery, zapLogger, nil, nil)
618+
coreServer2, err := NewCore([]string{"localhost"}, validator, issuer, stdstore.New(sealer, fs, "", zapLogger), recovery, zapLogger, nil, nil)
619619
require.NoError(err)
620620
coreServer2State := testutil.GetState(t, coreServer2.txHandle)
621621
coreServer2UpdatedPkg := testutil.GetPackage(t, coreServer2.txHandle, "frontend")
@@ -691,7 +691,7 @@ func TestActivateWithMissingParameters(t *testing.T) {
691691
sealer := &seal.MockSealer{}
692692
fs := afero.NewMemMapFs()
693693
recovery := recovery.NewSinglePartyRecovery()
694-
coreServer, err := NewCore([]string{"localhost"}, validator, issuer, stdstore.New(sealer, fs, ""), recovery, zapLogger, nil, nil)
694+
coreServer, err := NewCore([]string{"localhost"}, validator, issuer, stdstore.New(sealer, fs, "", zapLogger), recovery, zapLogger, nil, nil)
695695
require.NoError(err)
696696
require.NotNil(coreServer)
697697

@@ -718,10 +718,11 @@ func TestActivateWithTTLSforMarbleWithoutEnvVars(t *testing.T) {
718718
assert := assert.New(t)
719719
require := require.New(t)
720720

721+
log := zaptest.NewLogger(t)
721722
validator := quote.NewMockValidator()
722723
issuer := quote.NewMockIssuer()
723-
store := stdstore.New(&seal.MockSealer{}, afero.NewMemMapFs(), "")
724-
coreServer, err := NewCore(nil, validator, issuer, store, recovery.NewSinglePartyRecovery(), zaptest.NewLogger(t), nil, nil)
724+
store := stdstore.New(&seal.MockSealer{}, afero.NewMemMapFs(), "", log)
725+
coreServer, err := NewCore(nil, validator, issuer, store, recovery.NewSinglePartyRecovery(), log, nil, nil)
725726
require.NoError(err)
726727

727728
clientAPI, err := clientapi.New(coreServer.txHandle, coreServer.recovery, coreServer, coreServer.log)

Diff for: ‎coordinator/core/metrics_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ func TestStoreWrapperMetrics(t *testing.T) {
4747
//
4848
reg := prometheus.NewRegistry()
4949
fac := promauto.With(reg)
50-
c, _ := NewCore([]string{"localhost"}, validator, issuer, stdstore.New(sealer, fs, ""), recovery, zapLogger, &fac, nil)
50+
c, _ := NewCore([]string{"localhost"}, validator, issuer, stdstore.New(sealer, fs, "", zapLogger), recovery, zapLogger, &fac, nil)
5151
assert.Equal(1, promtest.CollectAndCount(c.metrics.coordinatorState))
5252
assert.Equal(float64(state.AcceptingManifest), promtest.ToFloat64(c.metrics.coordinatorState))
5353

@@ -64,7 +64,7 @@ func TestStoreWrapperMetrics(t *testing.T) {
6464
reg = prometheus.NewRegistry()
6565
fac = promauto.With(reg)
6666
sealer.UnsealError = &seal.EncryptionKeyError{}
67-
c, err = NewCore([]string{"localhost"}, validator, issuer, stdstore.New(sealer, fs, ""), recovery, zapLogger, &fac, nil)
67+
c, err = NewCore([]string{"localhost"}, validator, issuer, stdstore.New(sealer, fs, "", zapLogger), recovery, zapLogger, &fac, nil)
6868
sealer.UnsealError = nil
6969
require.NoError(err)
7070
assert.Equal(1, promtest.CollectAndCount(c.metrics.coordinatorState))
@@ -98,7 +98,7 @@ func TestMarbleAPIMetrics(t *testing.T) {
9898
recovery := recovery.NewSinglePartyRecovery()
9999
promRegistry := prometheus.NewRegistry()
100100
promFactory := promauto.With(promRegistry)
101-
c, err := NewCore([]string{"localhost"}, validator, issuer, stdstore.New(sealer, afero.NewMemMapFs(), ""), recovery, zapLogger, &promFactory, nil)
101+
c, err := NewCore([]string{"localhost"}, validator, issuer, stdstore.New(sealer, afero.NewMemMapFs(), "", zapLogger), recovery, zapLogger, &promFactory, nil)
102102
require.NoError(err)
103103
require.NotNil(c)
104104

0 commit comments

Comments
 (0)