From 6aa6c9190ab57545b3a9e5133dcee18b9e33e2e0 Mon Sep 17 00:00:00 2001 From: cpanato Date: Tue, 28 Feb 2023 13:39:29 -0500 Subject: [PATCH] comment out temporarily the verify image signatures Signed-off-by: cpanato --- pkg/anago/release_test.go | 16 +++++++---- pkg/release/images.go | 9 ++++-- pkg/release/images_test.go | 56 ++++++++++++++++++++------------------ 3 files changed, 47 insertions(+), 34 deletions(-) diff --git a/pkg/anago/release_test.go b/pkg/anago/release_test.go index 2b0e250cfee..b212d768410 100644 --- a/pkg/anago/release_test.go +++ b/pkg/anago/release_test.go @@ -208,12 +208,16 @@ func TestPushArtifacts(t *testing.T) { }, shouldError: true, }, - { // ValidateImages fails - prepare: func(mock *anagofakes.FakeReleaseImpl) { - mock.ValidateImagesReturns(err) - }, - shouldError: true, - }, + // TODO: bypassing this for now due to the fail in the promotion process + // that sign the images. We will release the Feb/2023 patch releases without full + // signatures but we will sign those in a near future in a deatached process + // revert this change when the patches are out + // { // ValidateImages fails + // prepare: func(mock *anagofakes.FakeReleaseImpl) { + // mock.ValidateImagesReturns(err) + // }, + // shouldError: true, + // }, { // PusblishVersion fails prepare: func(mock *anagofakes.FakeReleaseImpl) { mock.PublishVersionReturns(err) diff --git a/pkg/release/images.go b/pkg/release/images.go index a42da1daa4c..1bf3c20aaa8 100644 --- a/pkg/release/images.go +++ b/pkg/release/images.go @@ -93,8 +93,13 @@ func (*defaultImageImpl) SignImage(signer *sign.Signer, reference string) error } func (*defaultImageImpl) VerifyImage(signer *sign.Signer, reference string) error { - _, err := signer.VerifyImage(reference) - return err + // TODO: bypassing this for now due to the fail in the promotion process + // that sign the images. We will release the Feb/2023 patch releases without full + // signatures but we will sign those in a near future in a deatached process + // revert this change when the patches are out + // _, err := signer.VerifyImage(reference) + // return err + return nil } var tagRegex = regexp.MustCompile(`^.+/(.+):.+$`) diff --git a/pkg/release/images_test.go b/pkg/release/images_test.go index bdde00ea65d..0aafe704075 100644 --- a/pkg/release/images_test.go +++ b/pkg/release/images_test.go @@ -204,32 +204,36 @@ func TestPublish(t *testing.T) { }, shouldError: true, }, - { // failure on sign image - prepare: func(mock *releasefakes.FakeImageImpl) (string, func()) { - tempDir := newImagesPath(t) - prepareImages(t, tempDir, mock) - - mock.SignImageReturns(errors.New("")) - - return tempDir, func() { - require.Nil(t, os.RemoveAll(tempDir)) - } - }, - shouldError: true, - }, - { // failure on sign manifest - prepare: func(mock *releasefakes.FakeImageImpl) (string, func()) { - tempDir := newImagesPath(t) - prepareImages(t, tempDir, mock) - - mock.SignImageReturnsOnCall(10, errors.New("")) - - return tempDir, func() { - require.Nil(t, os.RemoveAll(tempDir)) - } - }, - shouldError: true, - }, + // TODO: bypassing this for now due to the fail in the promotion process + // that sign the images. We will release the Feb/2023 patch releases without full + // signatures but we will sign those in a near future in a deatached process + // revert this change when the patches are out + // { // failure on sign image + // prepare: func(mock *releasefakes.FakeImageImpl) (string, func()) { + // tempDir := newImagesPath(t) + // prepareImages(t, tempDir, mock) + // + // mock.SignImageReturns(errors.New("")) + // + // return tempDir, func() { + // require.Nil(t, os.RemoveAll(tempDir)) + // } + // }, + // shouldError: true, + // }, + // { // failure on sign manifest + // prepare: func(mock *releasefakes.FakeImageImpl) (string, func()) { + // tempDir := newImagesPath(t) + // prepareImages(t, tempDir, mock) + // + // mock.SignImageReturnsOnCall(10, errors.New("")) + // + // return tempDir, func() { + // require.Nil(t, os.RemoveAll(tempDir)) + // } + // }, + // shouldError: true, + // }, } { sut := release.NewImages() clientMock := &releasefakes.FakeImageImpl{}