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

_cli: don't warn on bare .sigstore if cert/sig is used #1179

Merged
merged 2 commits into from
Oct 23, 2024
Merged

_cli: don't warn on bare .sigstore if cert/sig is used #1179

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3d6a11d
_cli: don't warn on bare .sigstore if cert/sig is used
woodruffw Oct 22, 2024
6dbe38c
Merge branch 'main' into ww/fix-warning
woodruffw Oct 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion sigstore/_cli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -931,7 +931,14 @@ def _collect_verification_state(
legacy_default_bundle = file.parent / f"{file.name}.sigstore"
bundle = file.parent / f"{file.name}.sigstore.json"

if not bundle.is_file() and legacy_default_bundle.is_file():
if (
not bundle.is_file()
and legacy_default_bundle.is_file()
# NOTE(ww): Only show this warning if bare materials
# are not provided, since bare materials take precedence over
# a .sigstore bundle.
and not (cert or sig)
):
_logger.warning(
f"{file}: {legacy_default_bundle} should be named {bundle}. "
"Support for discovering 'bare' .sigstore inputs will be deprecated in "
Expand Down
Loading