From 3518941d6dc9840f082bd7dc1b88b6b6e55e0e4a Mon Sep 17 00:00:00 2001 From: Andreea Lupu <58118008+Andreea-Lupu@users.noreply.github.com> Date: Wed, 13 Sep 2023 15:48:31 +0300 Subject: [PATCH] fix: change log msg for updating signatures validity (#1804) Signed-off-by: Andreea-Lupu --- pkg/extensions/extension_image_trust_test.go | 25 ++++++++------------ pkg/extensions/imagetrust/image_trust.go | 4 ++-- 2 files changed, 12 insertions(+), 17 deletions(-) diff --git a/pkg/extensions/extension_image_trust_test.go b/pkg/extensions/extension_image_trust_test.go index ed3f18b1..f1951fdf 100644 --- a/pkg/extensions/extension_image_trust_test.go +++ b/pkg/extensions/extension_image_trust_test.go @@ -254,12 +254,11 @@ func RunSignatureUploadAndVerificationTests(t *testing.T, cacheDriverParams map[ []string{fmt.Sprintf("localhost:%s/%s@%s", port, repo, image.DigestStr())}) So(err, ShouldBeNil) - found, err = test.ReadLogFileAndSearchString(logFile.Name(), "updating signatures validity", 10*time.Second) + found, err = test.ReadLogFileAndSearchString(logFile.Name(), "update signatures validity", 10*time.Second) So(err, ShouldBeNil) So(found, ShouldBeTrue) - found, err = test.ReadLogFileAndSearchString(logFile.Name(), "verifying signatures successfully completed", - time.Second) + found, err = test.ReadLogFileAndSearchString(logFile.Name(), "update signatures validity completed", time.Second) So(err, ShouldBeNil) So(found, ShouldBeTrue) @@ -367,12 +366,11 @@ func RunSignatureUploadAndVerificationTests(t *testing.T, cacheDriverParams map[ err = test.SignWithNotation(certName, imageURL, rootDir) So(err, ShouldBeNil) - found, err = test.ReadLogFileAndSearchString(logFile.Name(), "updating signatures validity", 10*time.Second) + found, err = test.ReadLogFileAndSearchString(logFile.Name(), "update signatures validity", 10*time.Second) So(err, ShouldBeNil) So(found, ShouldBeTrue) - found, err = test.ReadLogFileAndSearchString(logFile.Name(), "verifying signatures successfully completed", - time.Second) + found, err = test.ReadLogFileAndSearchString(logFile.Name(), "update signatures validity completed", time.Second) So(err, ShouldBeNil) So(found, ShouldBeTrue) @@ -501,12 +499,11 @@ func RunSignatureUploadAndVerificationTests(t *testing.T, cacheDriverParams map[ err = test.SignWithNotation(certName, imageURL, rootDir) So(err, ShouldBeNil) - found, err = test.ReadLogFileAndSearchString(logFile.Name(), "updating signatures validity", 10*time.Second) + found, err = test.ReadLogFileAndSearchString(logFile.Name(), "update signatures validity", 10*time.Second) So(err, ShouldBeNil) So(found, ShouldBeTrue) - found, err = test.ReadLogFileAndSearchString(logFile.Name(), "verifying signatures successfully completed", - time.Second) + found, err = test.ReadLogFileAndSearchString(logFile.Name(), "update signatures validity completed", time.Second) So(err, ShouldBeNil) So(found, ShouldBeTrue) @@ -672,12 +669,11 @@ func RunSignatureUploadAndVerificationTests(t *testing.T, cacheDriverParams map[ []string{fmt.Sprintf("localhost:%s/%s@%s", port, repo, image.DigestStr())}) So(err, ShouldBeNil) - found, err = test.ReadLogFileAndSearchString(logFile.Name(), "updating signatures validity", 10*time.Second) + found, err = test.ReadLogFileAndSearchString(logFile.Name(), "update signatures validity", 10*time.Second) So(err, ShouldBeNil) So(found, ShouldBeTrue) - found, err = test.ReadLogFileAndSearchString(logFile.Name(), "verifying signatures successfully completed", - time.Second) + found, err = test.ReadLogFileAndSearchString(logFile.Name(), "update signatures validity completed", time.Second) So(err, ShouldBeNil) So(found, ShouldBeTrue) @@ -883,12 +879,11 @@ func RunSignatureUploadAndVerificationTests(t *testing.T, cacheDriverParams map[ So(err, ShouldBeNil) So(found, ShouldBeTrue) - found, err = test.ReadLogFileAndSearchString(logFile.Name(), "updating signatures validity", 10*time.Second) + found, err = test.ReadLogFileAndSearchString(logFile.Name(), "update signatures validity", 10*time.Second) So(err, ShouldBeNil) So(found, ShouldBeTrue) - found, err = test.ReadLogFileAndSearchString(logFile.Name(), "verifying signatures successfully completed", - time.Second) + found, err = test.ReadLogFileAndSearchString(logFile.Name(), "update signatures validity completed", time.Second) So(err, ShouldBeNil) So(found, ShouldBeTrue) diff --git a/pkg/extensions/imagetrust/image_trust.go b/pkg/extensions/imagetrust/image_trust.go index 8db7775a..974418a2 100644 --- a/pkg/extensions/imagetrust/image_trust.go +++ b/pkg/extensions/imagetrust/image_trust.go @@ -242,7 +242,7 @@ func NewValidityTask(metaDB mTypes.MetaDB, repo mTypes.RepoMetadata, log log.Log } func (validityT *validityTask) DoWork(ctx context.Context) error { - validityT.log.Info().Msg("updating signatures validity") + validityT.log.Info().Msg("update signatures validity") for signedManifest, sigs := range validityT.repo.Signatures { if len(sigs[zcommon.CosignSignature]) != 0 || len(sigs[zcommon.NotationSignature]) != 0 { @@ -255,7 +255,7 @@ func (validityT *validityTask) DoWork(ctx context.Context) error { } } - validityT.log.Info().Msg("verifying signatures successfully completed") + validityT.log.Info().Msg("update signatures validity completed") return nil }