Skip to content

Commit d7e28bc

Browse files
SequeISequeI
authored
Merge pull request #455 from securesign/update-to-upstream
Update to upstream v1.3.10
2 parents 969aef5 + 235593a commit d7e28bc

Some content is hidden

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

72 files changed

+1459
-814
lines changed

‎.github/workflows/build.yml‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,24 +37,23 @@ jobs:
3737
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
3838
with:
3939
persist-credentials: false
40-
- uses: sigstore/cosign-installer@dc72c7d5c4d10cd6bcb8cf6e3fd625a9e5e537da # v3.7.0
40+
- uses: sigstore/cosign-installer@3454372f43399081ed03b604cb2d021dabca52bb # v3.8.2
4141

4242
- name: Extract version of Go to use
4343
run: echo "GOVERSION=$(awk -F'[:@]' '/FROM golang/{print $2; exit}' Dockerfile)" >> $GITHUB_ENV
4444

45-
- uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
45+
- uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
4646
with:
4747
go-version: ${{ env.GOVERSION }}
4848
check-latest: true
4949

5050
- name: deps
5151
run: sudo apt-get update && sudo apt-get install -yq libpcsclite-dev
5252

53-
- uses: ko-build/setup-ko@d982fec422852203cfb2053a8ec6ad302280d04d # v0.8
53+
- uses: ko-build/setup-ko@d006021bd0c28d1ce33a07e7943d48b079944c8d # v0.9
5454

5555
- name: Set up Cloud SDK
56-
if: false # securesign/rekor we dont have access to this gcp resource so this will always fail, this skips the step
57-
uses: google-github-actions/auth@6fc4af4b145ae7821d527454aa9bd537d1f2dc5f # v2.1.7
56+
uses: google-github-actions/auth@ba79af03959ebeac9769e648f473a284504d9193 # v2.1.10
5857
with:
5958
workload_identity_provider: 'projects/498091336538/locations/global/workloadIdentityPools/githubactions/providers/sigstore-rekor'
6059
service_account: '[email protected]'

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,19 +49,19 @@ jobs:
4949
- name: Extract version of Go to use
5050
run: echo "GOVERSION=$(awk -F'[:@]' '/FROM golang/{print $2; exit}' Dockerfile)" >> $GITHUB_ENV
5151

52-
- uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
52+
- uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
5353
with:
5454
go-version: ${{ env.GOVERSION }}
5555
check-latest: true
5656

5757
# Initializes the CodeQL tools for scanning.
5858
- name: Initialize CodeQL
59-
uses: github/codeql-action/init@f6091c0113d1dcf9b98e269ee48e8a7e51b7bdd4 # v3.28.5
59+
uses: github/codeql-action/init@ff0a06e83cb2de871e5a09832bc6a81e7276941f # v3.28.18
6060
with:
6161
languages: ${{ matrix.language }}
6262

6363
- name: Autobuild
64-
uses: github/codeql-action/autobuild@f6091c0113d1dcf9b98e269ee48e8a7e51b7bdd4 # v3.28.5
64+
uses: github/codeql-action/autobuild@ff0a06e83cb2de871e5a09832bc6a81e7276941f # v3.28.18
6565

6666
- name: Perform CodeQL Analysis
67-
uses: github/codeql-action/analyze@f6091c0113d1dcf9b98e269ee48e8a7e51b7bdd4 # v3.28.5
67+
uses: github/codeql-action/analyze@ff0a06e83cb2de871e5a09832bc6a81e7276941f # v3.28.18

‎.github/workflows/main.yml‎

Lines changed: 40 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
persist-credentials: false
3939
- name: Extract version of Go to use
4040
run: echo "GOVERSION=$(awk -F'[:@]' '/FROM golang/{print $2; exit}' Dockerfile)" >> $GITHUB_ENV
41-
- uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
41+
- uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
4242
with:
4343
go-version: ${{ env.GOVERSION }}
4444

@@ -49,7 +49,7 @@ jobs:
4949
- name: Test
5050
run: go test -v -coverprofile=coverage.txt -covermode=atomic ./...
5151
- name: Upload Coverage Report
52-
uses: codecov/codecov-action@13ce06bfc6bbe3ecf90edbbf1bc32fe5978ca1d3 # v5.3.1
52+
uses: codecov/codecov-action@18283e04ce6e62d37312384ff67231eb8fd56d24 # v5.4.3
5353
with:
5454
flags: unittests
5555
- name: Ensure no files were modified as a result of the build
@@ -63,11 +63,11 @@ jobs:
6363
persist-credentials: false
6464
- name: Extract version of Go to use
6565
run: echo "GOVERSION=$(awk -F'[:@]' '/FROM golang/{print $2; exit}' Dockerfile)" >> $GITHUB_ENV
66-
- uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
66+
- uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
6767
with:
6868
go-version: ${{ env.GOVERSION }}
6969

70-
- uses: ko-build/setup-ko@d982fec422852203cfb2053a8ec6ad302280d04d # v0.8
70+
- uses: ko-build/setup-ko@d006021bd0c28d1ce33a07e7943d48b079944c8d # v0.9
7171

7272
- name: container
7373
run: |
@@ -92,7 +92,7 @@ jobs:
9292
persist-credentials: false
9393
- name: Extract version of Go to use
9494
run: echo "GOVERSION=$(awk -F'[:@]' '/FROM golang/{print $2; exit}' Dockerfile)" >> $GITHUB_ENV
95-
- uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
95+
- uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
9696
with:
9797
go-version: ${{ env.GOVERSION }}
9898
- name: install gocovmerge
@@ -115,13 +115,13 @@ jobs:
115115
env:
116116
INDEX_BACKEND: redis
117117
- name: Upload logs if they exist
118-
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
118+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
119119
if: failure()
120120
with:
121121
name: E2E Docker Compose logs
122122
path: /tmp/docker-compose.log
123123
- name: Upload Coverage Report
124-
uses: codecov/codecov-action@13ce06bfc6bbe3ecf90edbbf1bc32fe5978ca1d3 # v5.3.1
124+
uses: codecov/codecov-action@18283e04ce6e62d37312384ff67231eb8fd56d24 # v5.4.3
125125
with:
126126
files: /tmp/rekor-merged.cov,/tmp/pkg-rekor-merged.cov
127127
flags: e2etests
@@ -142,7 +142,7 @@ jobs:
142142
persist-credentials: false
143143
- name: Extract version of Go to use
144144
run: echo "GOVERSION=$(awk -F'[:@]' '/FROM golang/{print $2; exit}' Dockerfile)" >> $GITHUB_ENV
145-
- uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
145+
- uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
146146
with:
147147
go-version: ${{ env.GOVERSION }}
148148
- name: Install backfill test dependencies
@@ -165,7 +165,7 @@ jobs:
165165
- name: Copy index test
166166
run: ./tests/copy-index-test.sh
167167
- name: Upload logs if they exist
168-
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
168+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
169169
if: failure()
170170
with:
171171
name: E2E Docker Compose logs
@@ -189,14 +189,14 @@ jobs:
189189
run: docker compose build
190190
- name: Extract version of Go to use
191191
run: echo "GOVERSION=$(awk -F'[:@]' '/FROM golang/{print $2; exit}' Dockerfile)" >> $GITHUB_ENV
192-
- uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
192+
- uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
193193
with:
194194
go-version: ${{ env.GOVERSION }}
195195

196196
- name: Sharding Test
197197
run: ./tests/sharding-e2e-test.sh
198198
- name: Upload logs if they exist
199-
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
199+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
200200
if: failure()
201201
with:
202202
name: Sharding E2E Docker Compose logs
@@ -214,14 +214,39 @@ jobs:
214214
run: docker compose build
215215
- name: Extract version of Go to use
216216
run: echo "GOVERSION=$(awk -F'[:@]' '/FROM golang/{print $2; exit}' Dockerfile)" >> $GITHUB_ENV
217-
- uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
217+
- uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
218218
with:
219219
go-version: ${{ env.GOVERSION }}
220220

221221
- name: Test for Attestation begin returned that was previously persisted in tlog
222222
run: ./tests/issue-872-e2e-test.sh
223223
- name: Upload logs if they exist
224-
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
224+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
225+
if: failure()
226+
with:
227+
name: Docker Compose logs
228+
path: /tmp/*docker-compose.log
229+
230+
client-algorithms-e2e:
231+
runs-on: ubuntu-latest
232+
needs: build
233+
234+
steps:
235+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
236+
with:
237+
persist-credentials: false
238+
- name: Docker Build
239+
run: docker compose build
240+
- name: Extract version of Go to use
241+
run: echo "GOVERSION=$(awk -F'[:@]' '/FROM golang/{print $2; exit}' Dockerfile)" >> $GITHUB_ENV
242+
- uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
243+
with:
244+
go-version: ${{ env.GOVERSION }}
245+
246+
- name: Test for supported client algorithms
247+
run: ./tests/client-algos-e2e-test.sh
248+
- name: Upload logs if they exist
249+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
225250
if: failure()
226251
with:
227252
name: Docker Compose logs
@@ -241,7 +266,7 @@ jobs:
241266
- name: Extract version of Go to use
242267
run: echo "GOVERSION=$(awk -F'[:@]' '/FROM golang/{print $2; exit}' Dockerfile)" >> $GITHUB_ENV
243268

244-
- uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
269+
- uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
245270
with:
246271
go-version: ${{ env.GOVERSION }}
247272
check-latest: true
@@ -250,7 +275,7 @@ jobs:
250275
run: ./tests/rekor-harness.sh
251276

252277
- name: Upload logs if they exist
253-
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
278+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
254279
if: failure()
255280
with:
256281
name: E2E Docker Compose logs

‎.github/workflows/validate-release.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,14 @@ jobs:
2828
check-signature:
2929
runs-on: ubuntu-latest
3030
container:
31-
image: ghcr.io/sigstore/cosign/cosign:v2.4.1-dev@sha256:a1bb112f1758703aa1d222bf30b9655d04cf196c0b7feaf3479d1222c2283590
31+
image: ghcr.io/sigstore/cosign/cosign:v2.5.0-dev@sha256:d6786d0b31f9577ed6cc1f7fb5080f2335f0cbff2cfceffef5043ee83ebc3a6e
3232

3333
steps:
3434
- name: Check Signature
3535
run: |
36-
cosign verify ghcr.io/gythialy/golang-cross:v1.23.4-0@sha256:fac6f9675e3e3a4ccc2b8cdab87b907cabae3a9c4e046d16816b9876315005e4 \
36+
cosign verify ghcr.io/gythialy/golang-cross:v1.24.2-0@sha256:03daa4bcae0ac852b4d0c84021f794ed2732d712c492a5577b86d6503e476c0c \
3737
--certificate-oidc-issuer https://token.actions.githubusercontent.com \
38-
--certificate-identity "https://github.com/gythialy/golang-cross/.github/workflows/release-golang-cross.yml@refs/tags/v1.23.4-0"
38+
--certificate-identity "https://github.com/gythialy/golang-cross/.github/workflows/release-golang-cross.yml@refs/tags/v1.24.2-0"
3939
env:
4040
TUF_ROOT: /tmp
4141

@@ -44,7 +44,7 @@ jobs:
4444
needs:
4545
- check-signature
4646
container:
47-
image: ghcr.io/gythialy/golang-cross:v1.23.4-0@sha256:fac6f9675e3e3a4ccc2b8cdab87b907cabae3a9c4e046d16816b9876315005e4
47+
image: ghcr.io/gythialy/golang-cross:v1.24.2-0@sha256:03daa4bcae0ac852b4d0c84021f794ed2732d712c492a5577b86d6503e476c0c
4848

4949
steps:
5050
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

‎.github/workflows/verify.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
- name: Extract version of Go to use
3737
run: echo "GOVERSION=$(awk -F'[:@]' '/FROM golang/{print $2; exit}' Dockerfile)" >> $GITHUB_ENV
3838

39-
- uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
39+
- uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
4040
with:
4141
go-version: ${{ env.GOVERSION }}
4242

@@ -60,11 +60,11 @@ jobs:
6060
- name: Extract version of Go to use
6161
run: echo "GOVERSION=$(awk -F'[:@]' '/FROM golang/{print $2; exit}' Dockerfile)" >> $GITHUB_ENV
6262

63-
- uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
63+
- uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
6464
with:
6565
go-version: ${{ env.GOVERSION }}
6666

6767
- name: golangci-lint
68-
uses: golangci/golangci-lint-action@ec5d18412c0aeab7936cb16880d708ba2a64e1ae # v6.2.0
68+
uses: golangci/golangci-lint-action@4afd733a84b1f43292c63897423277bb7f4313a9 # v8.0.0
6969
with:
70-
version: v1.62
70+
version: v2.1

‎.golangci.yml‎

Lines changed: 41 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -13,33 +13,49 @@
1313
# See the License for the specific language governing permissions and
1414
# limitations under the License.
1515

16+
version: "2"
17+
run:
18+
issues-exit-code: 1
1619
linters:
1720
enable:
18-
- unused
19-
- errcheck
20-
- gofmt
21-
- goimports
22-
- gosec
23-
- gocritic
24-
- revive
25-
- misspell
26-
output:
27-
uniq-by-line: false
28-
issues:
29-
exclude-rules:
30-
- path: _test\.go
31-
linters:
32-
- errcheck
33-
- gosec
34-
# TODO, tracked in #286
35-
- text: "SA1019: package golang.org/x/crypto/openpgp"
36-
linters:
37-
- staticcheck
38-
- text: "G115: "
39-
linters:
21+
- gocritic
4022
- gosec
23+
- misspell
24+
- revive
25+
- unused
26+
exclusions:
27+
generated: lax
28+
presets:
29+
- comments
30+
- common-false-positives
31+
- legacy
32+
- std-error-handling
33+
rules:
34+
- linters:
35+
- errcheck
36+
- gosec
37+
path: _test\.go
38+
- linters:
39+
- staticcheck
40+
# TODO, tracked in #286
41+
text: 'SA1019: package golang.org/x/crypto/openpgp'
42+
- linters:
43+
- gosec
44+
text: 'G115: '
45+
paths:
46+
- third_party$
47+
- builtin$
48+
- examples$
49+
issues:
4150
max-issues-per-linter: 0
4251
max-same-issues: 0
43-
run:
44-
issues-exit-code: 1
45-
timeout: 10m
52+
formatters:
53+
enable:
54+
- gofmt
55+
- goimports
56+
exclusions:
57+
generated: lax
58+
paths:
59+
- third_party$
60+
- builtin$
61+
- examples$

‎.tekton/backfill-redis-pull-request.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ spec:
4242
- name: go_unit_test
4343
value: "true"
4444
- name: go_base_image
45-
value: brew.registry.redhat.io/rh-osbs/openshift-golang-builder:v1.23.4@sha256:5c6607f82aeb2cd3f71075d17555d4170b17927e8551967d2fd0e534b22b1c7b
45+
value: brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_1.23@sha256:44fd8f88f3b6463cda15571260f9ca3a0b78d3c8c8827a338e04ab3a23581a88
4646
pipelineRef:
4747
params:
4848
- name: url

‎.tekton/backfill-redis-push.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ spec:
4040
- name: go_unit_test
4141
value: "true"
4242
- name: go_base_image
43-
value: brew.registry.redhat.io/rh-osbs/openshift-golang-builder:v1.23.4@sha256:5c6607f82aeb2cd3f71075d17555d4170b17927e8551967d2fd0e534b22b1c7b
43+
value: brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_1.23@sha256:44fd8f88f3b6463cda15571260f9ca3a0b78d3c8c8827a338e04ab3a23581a88
4444
pipelineRef:
4545
params:
4646
- name: url

‎.tekton/rekor-cli-pull-request.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ spec:
4242
- name: go_unit_test
4343
value: "true"
4444
- name: go_base_image
45-
value: brew.registry.redhat.io/rh-osbs/openshift-golang-builder:v1.23.4@sha256:5c6607f82aeb2cd3f71075d17555d4170b17927e8551967d2fd0e534b22b1c7b
45+
value: brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_1.23@sha256:44fd8f88f3b6463cda15571260f9ca3a0b78d3c8c8827a338e04ab3a23581a88
4646
pipelineRef:
4747
params:
4848
- name: url

‎.tekton/rekor-cli-push.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ spec:
3939
- name: go_unit_test
4040
value: "true"
4141
- name: go_base_image
42-
value: brew.registry.redhat.io/rh-osbs/openshift-golang-builder:v1.23.4@sha256:5c6607f82aeb2cd3f71075d17555d4170b17927e8551967d2fd0e534b22b1c7b
42+
value: brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_1.23@sha256:44fd8f88f3b6463cda15571260f9ca3a0b78d3c8c8827a338e04ab3a23581a88
4343
pipelineRef:
4444
params:
4545
- name: url

0 commit comments

Comments
 (0)