From 78ffd82581d16741f08ae769f018a768d9f50642 Mon Sep 17 00:00:00 2001 From: Jim Date: Fri, 3 Jun 2022 09:14:45 -0400 Subject: [PATCH] fix (servers): return unhandled err from storeRootCertificates(...) (#2127) --- internal/servers/repository_workerauth.go | 7 ++++++- internal/servers/workerauth_store_test.go | 1 + 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/internal/servers/repository_workerauth.go b/internal/servers/repository_workerauth.go index d266e16b5..95d22465d 100644 --- a/internal/servers/repository_workerauth.go +++ b/internal/servers/repository_workerauth.go @@ -248,8 +248,13 @@ func (r *WorkerAuthRepositoryStorage) storeRootCertificates(ctx context.Context, } nextCert, err := r.convertRootCertificate(ctx, cert.Next) + if err != nil { + return errors.Wrap(ctx, err, op, errors.WithMsg("unable to convert next root certificate")) + } currentCert, err := r.convertRootCertificate(ctx, cert.Current) - + if err != nil { + return errors.Wrap(ctx, err, op, errors.WithMsg("unable to convert current root certificate")) + } // Use passed version var result rootCertificatesVersion err = mapstructure.Decode(cert.State.AsMap(), &result) diff --git a/internal/servers/workerauth_store_test.go b/internal/servers/workerauth_store_test.go index e66d6d67d..fdbe415d6 100644 --- a/internal/servers/workerauth_store_test.go +++ b/internal/servers/workerauth_store_test.go @@ -255,6 +255,7 @@ func TestDuplicateRootCert(t *testing.T) { current2, err := newRootCertificate(ctx, rand.Uint64(), populateBytes(defaultLength), beforeTimestamp, afterTimestamp, RootCertificateKeys{publicKey: populateBytes(defaultLength), privateKey: populateBytes(defaultLength)}, testKey, CurrentState) + require.NoError(t, err) next1, err := newRootCertificate(ctx, rand.Uint64(), populateBytes(defaultLength), beforeTimestamp, afterTimestamp, RootCertificateKeys{publicKey: populateBytes(defaultLength), privateKey: populateBytes(defaultLength)}, testKey, NextState)