bump cosign to v1.12.1 (#92)

* bump cosign to v1.12.1 Signed-off-by: Hirokuni-Kitahara1 <[email protected]> * update go version in github workflow to 1.18 Signed-off-by: Hirokuni-Kitahara1 <[email protected]> * remove style check workflow which is already done by lint check Signed-off-by: Hirokuni-Kitahara1 <[email protected]> Signed-off-by: Hirokuni-Kitahara1 <[email protected]>
sigstore · Sep 27, 2022 · 7a2d417 · 7a2d417
1 parent 14f7cab
commit 7a2d417
Show file tree

Hide file tree

Showing 8 changed files with 488 additions and 990 deletions.
diff --git a/.github/workflows/cross.yaml b/.github/workflows/cross.yaml
@@ -14,7 +14,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v2
         with:
-          go-version: '1.17.x'
+          go-version: '1.18.x'
       - name: compile
         run: |
           make build
@@ -37,7 +37,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v2
         with:
-          go-version: '1.17.x'
+          go-version: '1.18.x'
       - name: Checkout code
         uses: actions/checkout@v2
       - name: Build

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -20,7 +20,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.17
+          go-version: 1.18
       - name: Install GoReleaser
         uses: goreleaser/goreleaser-action@v2
         with:

diff --git a/.github/workflows/style.yaml b/.github/workflows/style.yaml
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -42,7 +42,7 @@ jobs:
             ${{ runner.os }}-go-
       - uses: actions/setup-go@v2
         with:
-          go-version: '1.17.x'
+          go-version: '1.18.x'
       # - name: install ko
       #   run: |
       #     curl -L https://github.com/google/ko/releases/download/v0.8.3/ko_0.8.3_Linux_x86_64.tar.gz | tar xzf - ko && \
@@ -64,7 +64,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v2
         with:
-          go-version: '1.17.x'
+          go-version: '1.18.x'
       - name: Install addlicense
         run: go install github.com/google/addlicense@latest
       - name: Check license headers

diff --git a/go.mod b/go.mod
diff --git a/go.sum b/go.sum
diff --git a/pkg/cosign/sign.go b/pkg/cosign/sign.go
@@ -234,17 +234,12 @@ func SignBlob(blobPath string, keyPath, certPath *string, rekorURL string, noTlo
 			return nil, errors.Wrap(err, "failed to unmarshal rekord.Spec into *models.HashedrekordV001Schema")
 		}
 
-		var b64SigInTlog string
 		var b64CertStr string
 		if rekordContent != nil {
-			b64SigInTlog = rekordContent.Signature.Content.String()
 			// this will be a certificate in keyless signing, and be a public key in keyed signing
 			// and if this is a public key, we don't add it to the annotations
 			b64CertStr = rekordContent.Signature.PublicKey.Content.String()
 		}
-		if b64SigInTlog != string(b64Sig) {
-			return nil, fmt.Errorf("signature found in tlog is different from original one; found: %s, original: %s", b64SigInTlog, string(b64Sig))
-		}
 		tmpRawCert, err := base64.StdEncoding.DecodeString(b64CertStr)
 		if err != nil {
 			return nil, errors.Wrapf(err, "failed to decode certificate string %s", b64CertStr)

diff --git a/pkg/k8smanifest/provenance.go b/pkg/k8smanifest/provenance.go
@@ -584,7 +584,7 @@ func parseEntry(uuid string, e models.LogEntryAnon) (*rekorCLIGetCmdOutput, erro
 	if err != nil {
 		return nil, err
 	}
-	eimpl, err := types.NewEntry(pe)
+	eimpl, err := types.UnmarshalEntry(pe)
 	if err != nil {
 		return nil, err
 	}