Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: fixing breaking changes in rekor v1.12.0 upgrade #2260

Merged
merged 3 commits into from Sep 20, 2022

Conversation

developer-guy
Copy link
Member

Signed-off-by: Batuhan Apaydın batuhan.apaydin@trendyol.com

This PR aims to fix breaking changes in Rekor v1.12.0 pkg

Summary

Release Note

Documentation

/cc @priyawadhwa

Signed-off-by: Batuhan Apaydın <batuhan.apaydin@trendyol.com>
asraa
asraa previously approved these changes Sep 16, 2022
Copy link
Contributor

@asraa asraa left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM minus that I think the test code also needed to be changed. Happy to push a fix for that.

return types.NewProposedEntry(ctx, intoto.KIND, intoto_v001.APIVERSION, types.ArtifactProperties{
ArtifactBytes: signature,
PublicKeyBytes: pubKey,
PublicKeyBytes: pubKeyBytes,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

had to check up on why the rekorEntry function here that reconstructs hashedrekord types didn't need to be changed: that directly creates a v0.0.1 hashed rekord type, instead of relying on the general entry construction.

@asraa
Copy link
Contributor

asraa commented Sep 16, 2022

Just ran into a problem that we can't generate a rekor entry for testing for intoto v0.0.1 at 0.12.0 because v0.0.1 intoto was explicitly not supported. We need Priya's fix here: sigstore/rekor@a6d36b8

Signed-off-by: Asra Ali <asraa@google.com>
@asraa
Copy link
Contributor

asraa commented Sep 16, 2022

I think you may have branch protection on! (didn't expect anything less!)

But this PR is updated with two commits in my fork: https://github.com/asraa/cosign/tree/fix-rekorv112

@codecov-commenter
Copy link

codecov-commenter commented Sep 17, 2022

Codecov Report

Merging #2260 (4621231) into main (ff18e66) will decrease coverage by 0.02%.
The diff coverage is 35.29%.

@@            Coverage Diff             @@
##             main    #2260      +/-   ##
==========================================
- Coverage   28.56%   28.54%   -0.03%     
==========================================
  Files         131      131              
  Lines        7855     7866      +11     
==========================================
+ Hits         2244     2245       +1     
- Misses       5305     5314       +9     
- Partials      306      307       +1     
Impacted Files Coverage Δ
pkg/cosign/tlog.go 37.75% <0.00%> (-0.80%) ⬇️
cmd/cosign/cli/verify/verify_blob.go 45.09% <66.66%> (-0.17%) ⬇️

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

Signed-off-by: Asra Ali <asraa@google.com>
Signed-off-by: Batuhan Apaydın <batuhan.apaydin@trendyol.com>
@dlorenc
Copy link
Member

dlorenc commented Sep 18, 2022

Is this one ready to go @asraa ?

@haydentherapper
Copy link
Contributor

This is blocking 0.12 rolling out to prod, so this should be prioritized.

@dlorenc
Copy link
Member

dlorenc commented Sep 20, 2022

This is blocking 0.12 rolling out to prod, so this should be prioritized.

what still needs to happen here? cc @asraa ?

Copy link
Contributor

@asraa asraa left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry about that! LGTM -- the tests have the change now

@dlorenc dlorenc merged commit 0baa044 into sigstore:main Sep 20, 2022
@github-actions github-actions bot added this to the v1.13.0 milestone Sep 20, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants