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.

Sign up for GitHub

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

Jump to bottom

chore: cherry pick fixes from main #487

Merged
merged 15 commits into from
Dec 10, 2024
Merged

chore: cherry pick fixes from main #487

merged 15 commits into from
Dec 10, 2024

Conversation

Two-Hearts
Copy link
Contributor

@Two-Hearts Two-Hearts commented Dec 9, 2024 •
edited
Loading

This PR cherry picks from main to release-1.3. This is for v1.3.0-rc.2 release.

This PR targets on branch release-1.3.

@codecov Codecov
Copy link

codecov bot commented Dec 9, 2024 •
edited
Loading

Codecov Report

Attention: Patch coverage is 97.72727% with 1 line in your changes missing coverage. Please review.

Project coverage is 80.60%. Comparing base (fb1f0c8) to head (dd73327).

Files with missing lines Patch % Lines
notation.go 50.00% 1 Missing ⚠️
Additional details and impacted files 
@@               Coverage Diff               @@
##           release-1.3     #487      +/-   ##
===============================================
- Coverage        81.71%   80.60%   -1.12%     
===============================================
  Files               33       33              
  Lines             2374     3062     +688     
===============================================
+ Hits              1940     2468     +528     
- Misses             302      463     +161     
+ Partials           132      131       -1

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

JeyJeyGao
JeyJeyGao previously approved these changes Dec 9, 2024
View reviewed changes
Copy link
Contributor

@JeyJeyGao JeyJeyGao left a comment

Choose a reason for hiding this comment

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

LGTM. Compared commit history and diff against main branch.

@Two-Hearts Two-Hearts changed the title bump: cherry pick from main chore: cherry pick from main Dec 9, 2024
@shizhMSFT shizhMSFT changed the title chore: cherry pick from main chore: cherry pick fixes from main Dec 9, 2024
shizhMSFT
shizhMSFT reviewed Dec 9, 2024
View reviewed changes
Copy link
Contributor

@shizhMSFT shizhMSFT left a comment

Choose a reason for hiding this comment

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

The commit e723406 is required to be backported.

JeyJeyGao and others added 12 commits December 9, 2024 14:16
@JeyJeyGao @Two-Hearts
fix: OS error when setting CRL cache leads to denial of signature ver…
3c33022 
…ification

Signed-off-by: Junjie Gao <[email protected]>
Signed-off-by: Patrick Zheng <[email protected]>
@Two-Hearts
fix: added tsa trust store root cert validation (notaryproject#471)
d66c7ab 
This PR adds tsa trust store root cert validation while getting
certificates from trust store. This is to fail fast if cert in TSA trust
store is not a root CA certificate.

Resolves notaryproject#470

---------

Signed-off-by: Patrick Zheng <[email protected]>
@Two-Hearts
chore: add crl cache debug logs (notaryproject#473)
0b9f71f 
Signed-off-by: Patrick Zheng <[email protected]>
@dependabot @Two-Hearts
build(deps): bump golang.org/x/crypto from 0.27.0 to 0.28.0 (notarypr…
0c84a37 
…oject#468)

Signed-off-by: Patrick Zheng <[email protected]>
@dependabot @Two-Hearts
build(deps): bump github.com/golang-jwt/jwt/v4 from 4.5.0 to 4.5.1 (n…
c32fb1a 
…otaryproject#474)

Signed-off-by: Patrick Zheng <[email protected]>
@dependabot @Two-Hearts
build(deps): bump golang.org/x/crypto from 0.28.0 to 0.29.0 (notarypr…
5395b65 
…oject#476)

Signed-off-by: Patrick Zheng <[email protected]>
@Two-Hearts
fix: crl cache log and err msg (notaryproject#475)
e277e40 
Signed-off-by: Patrick Zheng <[email protected]>
@dependabot @Two-Hearts
build(deps): bump golang.org/x/mod from 0.21.0 to 0.22.0 (notaryproje…
5384dde 
…ct#477)

Signed-off-by: Patrick Zheng <[email protected]>
@priteshbandi @Two-Hearts
chore: Improve error message in case of plugin timeout (notaryproject…
2307de5 
…#472)

When a plugin exceeds the specified timeout or deadline for content
processing, the current error message displayed is ```signal: killed```.
This PR updates the error message to a more informative message:
```[plugin_name] [command_name] command execution timeout: signal:
killed```

---------

Signed-off-by: Pritesh Bandi <[email protected]>
Signed-off-by: Patrick Zheng <[email protected]>
@Two-Hearts @priteshbandi
fix: timestamping (notaryproject#478)
ffc04d8 
Signed-off-by: Patrick Zheng <[email protected]>
Co-authored-by: Pritesh Bandi <[email protected]>
Signed-off-by: Patrick Zheng <[email protected]>
@JeyJeyGao @Two-Hearts
fix: add warning message for non-revokable certificate (notaryproject…
0a9ff2a 
…#479)

Fix:
- added warning message for non-revokable certificate

---------

Signed-off-by: Junjie Gao <[email protected]>
Signed-off-by: Patrick Zheng <[email protected]>
@Two-Hearts
fix: enable timestamping cert chain revocation check during signing (n…
e7005a6 
…otaryproject#482)

Signed-off-by: Patrick Zheng <[email protected]>
@JeyJeyGao @Two-Hearts
perf(log): encode objects only when logged (notaryproject#481)
5b21f2f 
Fix:
- replaced `.String()` with the `%v` format to avoid rendering the
string before actually logging it.

Resolves notaryproject#480

Signed-off-by: Junjie Gao <[email protected]>
Signed-off-by: Patrick Zheng <[email protected]>
JeyJeyGao
JeyJeyGao previously approved these changes Dec 9, 2024
View reviewed changes
Copy link
Contributor

@JeyJeyGao JeyJeyGao left a comment

Choose a reason for hiding this comment

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

LGTM

@Two-Hearts
Copy link
Contributor Author

The commit e723406 is required to be backported.

Updated.

@shizhMSFT
Copy link
Contributor

Should cherry pick the following commits 84c2ec0...95bac00. Since #469 has merge conflicts, the related commit is covered by #489

shizhMSFT
shizhMSFT requested changes Dec 9, 2024
View reviewed changes
Copy link
Contributor

@shizhMSFT shizhMSFT left a comment

Choose a reason for hiding this comment

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

dd73327 should not be in this PR. Also, 11866a5 is missed.

Please create a new PR for bumping notation-core-go and merge after this PR.

@Two-Hearts
Copy link
Contributor Author

dd73327 should not be in this PR. Also, 11866a5 is missed.

Please create a new PR for bumping notation-core-go and merge after this PR.

@shizhMSFT removed dd73327. However, cherry picking 11866a5 leads to conflict, so it has to be dropped. Will create another PR to bump up the dependencies.

shizhMSFT
shizhMSFT approved these changes Dec 9, 2024
View reviewed changes
Copy link
Contributor

@shizhMSFT shizhMSFT left a comment

Choose a reason for hiding this comment

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

LGTM

JeyJeyGao
JeyJeyGao approved these changes Dec 9, 2024
View reviewed changes
Copy link
Contributor

@JeyJeyGao JeyJeyGao left a comment

Choose a reason for hiding this comment

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

LGTM

vaninrao10
vaninrao10 approved these changes Dec 9, 2024
View reviewed changes
Copy link

@vaninrao10 vaninrao10 left a comment

Choose a reason for hiding this comment

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

LGTM

@Two-Hearts Two-Hearts merged commit 41d0380 into notaryproject:release-1.3 Dec 10, 2024
9 checks passed
@Two-Hearts Two-Hearts deleted the release-1.3 branch December 10, 2024 00:13
This was referenced Dec 12, 2024
Closed
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@vaninrao10 vaninrao10 vaninrao10 approved these changes

@JeyJeyGao JeyJeyGao JeyJeyGao approved these changes

@shizhMSFT shizhMSFT shizhMSFT approved these changes

@gokarnm gokarnm Awaiting requested review from gokarnm gokarnm is a code owner

@NiazFK NiazFK Awaiting requested review from NiazFK NiazFK is a code owner

@priteshbandi priteshbandi Awaiting requested review from priteshbandi priteshbandi is a code owner

@rgnote rgnote Awaiting requested review from rgnote rgnote is a code owner

@toddysm toddysm Awaiting requested review from toddysm toddysm is a code owner

@yizha1 yizha1 Awaiting requested review from yizha1 yizha1 is a code owner

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@Two-Hearts @shizhMSFT @JeyJeyGao @vaninrao10 @AdamKorcz @priteshbandi