Skip to content

Commit 54f6dc2

Browse files
simonbairdsimonbaird
authored
Merge pull request #3108 from SequeI/bumpCosign
Bump cosign v2.4.1 to v3.0.4 and use trusted_root.json for verification
2 parents 85237cf + f051691 commit 54f6dc2

53 files changed

Lines changed: 1214 additions & 1211 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.tool-versions‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
golang 1.24.6
1+
golang 1.25.3

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
## Build
1818

19-
FROM docker.io/library/golang:1.24.6 AS build
19+
FROM docker.io/library/golang:1.25.3 AS build
2020

2121
ARG TARGETOS
2222
ARG TARGETARCH

‎Dockerfile.dist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
## Build
1818

19-
FROM registry.access.redhat.com/ubi9/go-toolset:1.24.6@sha256:6234f572204d672a0ee0686d748fbb9b7b05679368bf0d7a4446e13970e58060 AS build
19+
FROM registry.access.redhat.com/ubi9/go-toolset:1.25.3@sha256:e8938564f866174a6d79e55dfe577c2ed184b1f53e91d782173fb69b07ce69ef AS build
2020

2121
ARG TARGETOS
2222
ARG TARGETARCH

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ _SHELL := bash
1212
SHELL=$(if $@,$(info ❱ $@))$(_SHELL)
1313
ROOT_DIR:=$(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))
1414
COPY:=The Conforma Contributors
15-
COSIGN_VERSION=$(shell go list -f '{{.Version}}' -m github.com/sigstore/cosign/v2)
15+
COSIGN_VERSION=$(shell go list -f '{{.Version}}' -m github.com/sigstore/cosign/v3)
1616
E2E_INSTRUMENTATION_FLAGS := $(if $(filter $(E2E_INSTRUMENTATION),true),-cover -covermode atomic)
1717

1818
##@ Information

‎acceptance/attestation/attestation.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ import (
2626

2727
v1 "github.com/google/go-containerregistry/pkg/v1"
2828
"github.com/in-toto/in-toto-golang/in_toto"
29-
"github.com/sigstore/cosign/v2/pkg/cosign/attestation"
30-
"github.com/sigstore/cosign/v2/pkg/types"
29+
"github.com/sigstore/cosign/v3/pkg/cosign/attestation"
30+
"github.com/sigstore/cosign/v3/pkg/types"
3131
"github.com/sigstore/sigstore/pkg/signature/dsse"
3232
"github.com/sigstore/sigstore/pkg/signature/options"
3333

‎acceptance/crypto/keys.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"fmt"
2323

2424
"github.com/cucumber/godog"
25-
"github.com/sigstore/cosign/v2/pkg/cosign"
25+
"github.com/sigstore/cosign/v3/pkg/cosign"
2626
"github.com/sigstore/sigstore/pkg/signature"
2727

2828
"github.com/conforma/cli/acceptance/testenv"
@@ -101,7 +101,7 @@ func SignerWithKey(ctx context.Context, keyName string) (signature.SignerVerifie
101101
return nil, err
102102
}
103103

104-
return cosign.LoadPrivateKey(key.PrivateBytes, key.Password())
104+
return cosign.LoadPrivateKey(key.PrivateBytes, key.Password(), nil)
105105
}
106106

107107
// PublicKeysFrom returns a map of all public keys encoded in PEM format

‎acceptance/go.mod‎

Lines changed: 90 additions & 89 deletions
Large diffs are not rendered by default.

‎acceptance/go.sum‎

Lines changed: 346 additions & 487 deletions
Large diffs are not rendered by default.

‎acceptance/image/image.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,13 @@ import (
4646
s "github.com/google/go-containerregistry/pkg/v1/static"
4747
"github.com/google/go-containerregistry/pkg/v1/types"
4848
"github.com/in-toto/in-toto-golang/in_toto"
49-
"github.com/sigstore/cosign/v2/pkg/cosign"
50-
"github.com/sigstore/cosign/v2/pkg/cosign/bundle"
51-
"github.com/sigstore/cosign/v2/pkg/oci"
52-
"github.com/sigstore/cosign/v2/pkg/oci/layout"
53-
cosignRemote "github.com/sigstore/cosign/v2/pkg/oci/remote"
54-
"github.com/sigstore/cosign/v2/pkg/oci/static"
55-
cosigntypes "github.com/sigstore/cosign/v2/pkg/types"
49+
"github.com/sigstore/cosign/v3/pkg/cosign"
50+
"github.com/sigstore/cosign/v3/pkg/cosign/bundle"
51+
"github.com/sigstore/cosign/v3/pkg/oci"
52+
"github.com/sigstore/cosign/v3/pkg/oci/layout"
53+
cosignRemote "github.com/sigstore/cosign/v3/pkg/oci/remote"
54+
"github.com/sigstore/cosign/v3/pkg/oci/static"
55+
cosigntypes "github.com/sigstore/cosign/v3/pkg/types"
5656
rc "github.com/sigstore/rekor/pkg/client"
5757
"github.com/sigstore/sigstore/pkg/cryptoutils"
5858
"github.com/sigstore/sigstore/pkg/signature"
@@ -726,7 +726,7 @@ func createAndPushKeylessImage(ctx context.Context, imageName string) (context.C
726726
return ctx, err
727727
}
728728

729-
if err := cosignRemote.WriteSignedImageIndexImages(ref, sii); err != nil {
729+
if err := cosignRemote.WriteSignedImageIndexImages(ref, sii, ""); err != nil {
730730
return ctx, err
731731
}
732732

‎acceptance/rekor/rekor.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ import (
3636
"github.com/cyberphone/json-canonicalization/go/src/webpki.org/jsoncanonicalizer"
3737
"github.com/go-openapi/strfmt"
3838
"github.com/secure-systems-lab/go-securesystemslib/encrypted"
39-
"github.com/sigstore/cosign/v2/pkg/cosign"
40-
"github.com/sigstore/cosign/v2/pkg/cosign/bundle"
39+
"github.com/sigstore/cosign/v3/pkg/cosign"
40+
"github.com/sigstore/cosign/v3/pkg/cosign/bundle"
4141
"github.com/sigstore/rekor/pkg/generated/models"
4242
hashedrekord "github.com/sigstore/rekor/pkg/types/hashedrekord/v0.0.1"
4343
intoto "github.com/sigstore/rekor/pkg/types/intoto/v0.0.2"

0 commit comments

Comments
 (0)