Skip to content

Commit

Permalink
Detail TODO comments; remove unneeded trusted root in e2e tests
Browse files Browse the repository at this point in the history
Signed-off-by: Zach Steindler <steiza@github.com>
  • Loading branch information
steiza committed Aug 6, 2024
1 parent 1ad1097 commit 3e3a61a
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 7 deletions.
3 changes: 2 additions & 1 deletion cmd/conformance/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ func usage() {
func parseArgs() {
for i := 2; i < len(os.Args); {
switch os.Args[i] {
// TODO: support staging
// TODO: support staging (see https://github.com/sigstore/cosign/issues/2434)
//
// Today cosign signing does not yet use sigstore-go, and so we would
// need to make some clever invocation of `cosign initialize` to
Expand Down Expand Up @@ -112,6 +112,7 @@ func main() {
args = append(args, "verify-blob")

// TODO: for now, we handle `verify` by constructing a bundle
// (see https://github.com/sigstore/cosign/issues/3700)
//
// Today cosign only supports `--trusted-root` with the new bundle
// format. When cosign supports `--trusted-root` with detached signed
Expand Down
6 changes: 0 additions & 6 deletions test/e2e_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1628,12 +1628,6 @@ func TestSignBlobNewBundle(t *testing.T) {
t.Fatal(err)
}

trustedRoot := "{\"mediaType\":\"application/vnd.dev.sigstore.trustedroot+json;version=0.1\"}"
trustedRootPath := filepath.Join(td1, "trusted_root.json")
if err := os.WriteFile(trustedRootPath, []byte(trustedRoot), 0644); err != nil {
t.Fatal(err)
}

bundlePath := filepath.Join(td1, "bundle.sigstore.json")

ctx := context.Background()
Expand Down

0 comments on commit 3e3a61a

Please sign in to comment.