Skip to content

Commit a86b7cb

Browse files
authored
_cli: emit .sigstore.json by default (#1007)
* _cli: emit .sigstore.json by default Closes #814. Signed-off-by: William Woodruff <william@trailofbits.com> * CHANGELOG: record changes Signed-off-by: William Woodruff <william@trailofbits.com> * README: update `--help` Signed-off-by: William Woodruff <william@trailofbits.com> --------- Signed-off-by: William Woodruff <william@trailofbits.com>
1 parent 7d483ae commit a86b7cb

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,10 @@ All versions prior to 0.9.0 are untracked.
5858
* **BREAKING API CHANGE**: `Verifier.verify(...)` now takes a `sigstore.models.Bundle`,
5959
instead of a `VerificationMaterials` ([#937](https://github.com/sigstore/sigstore-python/pull/937))
6060

61+
* **BREAKING CLI CHANGE**: `sigstore sign` now emits `{input}.sigstore.json`
62+
by default instead of `{input}.sigstore`, per the client specification
63+
([#1007](https://github.com/sigstore/sigstore-python/pull/1007))
64+
6165
* sigstore-python now requires inclusion proofs in all signing and verification
6266
flows, regardless of bundle version of input types. Inputs that do not
6367
have an inclusion proof (such as detached materials) cause an online lookup

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,8 +162,8 @@ OpenID Connect options:
162162
False)
163163

164164
Output options:
165-
--no-default-files Don't emit the default output files ({input}.sigstore)
166-
(default: False)
165+
--no-default-files Don't emit the default output files
166+
({input}.sigstore.json) (default: False)
167167
--signature FILE, --output-signature FILE
168168
Write a single signature to the given file; does not
169169
work with multiple input files (default: None)

sigstore/_cli.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ def _parser() -> argparse.ArgumentParser:
283283
"--no-default-files",
284284
action="store_true",
285285
default=_boolify_env("SIGSTORE_NO_DEFAULT_FILES"),
286-
help="Don't emit the default output files ({input}.sigstore)",
286+
help="Don't emit the default output files ({input}.sigstore.json)",
287287
)
288288
output_options.add_argument(
289289
"--signature",
@@ -559,7 +559,7 @@ def _sign(args: argparse.Namespace) -> None:
559559
output_dir.mkdir(parents=True, exist_ok=True)
560560

561561
if not bundle and not args.no_default_files:
562-
bundle = output_dir / f"{file.name}.sigstore"
562+
bundle = output_dir / f"{file.name}.sigstore.json"
563563

564564
if not args.overwrite:
565565
extants = []

0 commit comments

Comments
 (0)