Skip to content

Commit f397ed6

Browse files
jkhelilvdemeester
jkhelil
and
vdemeester
authored
fix mapping between Status.Steps and Status.TaskSpec.Steps (#1188) (#1203)
* fix mapping between Status.Steps and Status.TaskSpec.Steps (#1188) * .github: add github-actions to dependabot… (#1194) * .github: add github-actions to dependabot… … so that we also get dependabot actions updates. Today, we seems to be using deprecated actions. Signed-off-by: Vincent Demeester <[email protected]> * .github/workflows: update some action versions Signed-off-by: Vincent Demeester <[email protected]> --------- Signed-off-by: Vincent Demeester <[email protected]> --------- Signed-off-by: Vincent Demeester <[email protected]> Co-authored-by: Vincent Demeester <[email protected]>
1 parent 7fd8992 commit f397ed6

File tree

8 files changed

+555
-27
lines changed

8 files changed

+555
-27
lines changed

‎.github/dependabot.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,17 @@ updates:
1010
all:
1111
patterns:
1212
- "*"
13+
labels:
14+
- "ok-to-test"
15+
- "dependencies"
16+
- "release-note-none"
17+
- "kind/misc"
18+
- package-ecosystem: "github-actions"
19+
directory: "/"
20+
schedule:
21+
interval: "weekly"
22+
labels:
23+
- "ok-to-test"
24+
- "dependencies"
25+
- "release-note-none"
26+
- "kind/misc"

‎.github/workflows/goclean.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ jobs:
2424
goclean:
2525
runs-on: ubuntu-latest
2626
steps:
27-
- uses: actions/checkout@v3 # check-out repository
27+
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
2828

2929
- name: Setup Go
30-
uses: actions/setup-go@v3
30+
uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
3131
with:
3232
go-version: '1.22'
3333

‎.github/workflows/lint.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@ jobs:
1717
name: lint
1818
runs-on: ubuntu-latest
1919
steps:
20-
- uses: actions/setup-go@v4
20+
- uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
2121
with:
2222
go-version: "1.22"
2323

24-
- uses: actions/checkout@v3
24+
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
2525

2626
- name: golangci-lint
27-
uses: golangci/golangci-lint-action@v4
27+
uses: golangci/golangci-lint-action@v6.1.0
2828
with:
2929
# Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version
3030
version: latest

‎.github/workflows/reusable-e2e.yaml

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -34,26 +34,12 @@ jobs:
3434
TEKTON_CLI_RELEASE: "0.30.0"
3535

3636
steps:
37-
# https://github.com/mvdan/github-actions-golang#how-do-i-set-up-caching-between-builds
38-
- uses: actions/cache@v2
39-
with:
40-
# In order:
41-
# * Module download cache
42-
# * Build cache (Linux)
43-
path: |
44-
~/go/pkg/mod
45-
~/.cache/go-build
46-
${{ env.KOCACHE }}
47-
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
48-
restore-keys: |
49-
${{ runner.os }}-go-
50-
5137
- name: Set up Go
52-
uses: actions/setup-go@v2
38+
uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
5339
with:
5440
go-version: 1.22.x
5541

56-
- uses: imjasonh/setup-ko@v0.6
42+
- uses: ko-build/setup-ko@v0.7
5743
with:
5844
version: tip
5945

@@ -64,7 +50,7 @@ jobs:
6450
chmod u+x ./tkn
6551
6652
- name: Check out our repo
67-
uses: actions/checkout@v2
53+
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
6854
with:
6955
path: ./src/github.com/tektoncd/chains
7056

@@ -140,7 +126,7 @@ jobs:
140126
141127
- name: Collect diagnostics
142128
if: ${{ failure() }}
143-
uses: chainguard-dev/actions/kind-diag@84c993eaf02da1c325854fb272a4df9184bd80fc # main
129+
uses: chainguard-dev/actions/kind-diag@9ba949ac63357c725a9438f3e05a1e33d313498e # main
144130
with:
145131
cluster-resources: nodes
146132
namespace-resources: pods,taskruns,jobs

‎pkg/chains/formats/slsa/testdata/pipeline-v1beta1/taskrun4.json

Lines changed: 136 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,136 @@
1+
{
2+
"metadata": {
3+
"name": "mismatch Status.Step.Name and Status.TaskSpec.Step.Name",
4+
"labels": {
5+
"tekton.dev/pipelineTask": "build"
6+
}
7+
},
8+
"spec": {
9+
"params": [
10+
{
11+
"name": "IMAGE",
12+
"value": "test.io/test/image"
13+
},
14+
{
15+
"name": "CHAINS-GIT_COMMIT",
16+
"value": "sha:taskrun"
17+
},
18+
{
19+
"name": "CHAINS-GIT_URL",
20+
"value": "https://git.test.com"
21+
}
22+
],
23+
"taskRef": {
24+
"name": "build",
25+
"kind": "Task"
26+
},
27+
"serviceAccountName": "default"
28+
},
29+
"status": {
30+
"startTime": "2021-03-29T09:50:00Z",
31+
"completionTime": "2021-03-29T09:50:15Z",
32+
"conditions": [
33+
{
34+
"type": "Succeeded",
35+
"status": "True",
36+
"lastTransitionTime": "2021-03-29T09:50:15Z",
37+
"reason": "Succeeded",
38+
"message": "All Steps have completed executing"
39+
}
40+
],
41+
"podName": "test-pod-name",
42+
"steps": [
43+
{
44+
"name": "unnamed-",
45+
"container": "step-step1",
46+
"imageID": "docker-pullable://gcr.io/test7/test7@sha256:d4b63d3e24d6eef04a6dc0795cf8a73470688803d97c52cffa3c8d4efd3397b6"
47+
},
48+
{
49+
"name": "step2",
50+
"container": "step-step2",
51+
"imageID": "docker-pullable://gcr.io/test8/test8@sha256:4d6dd704ef58cb214dd826519929e92a978a57cdee43693006139c0080fd6fac"
52+
},
53+
{
54+
"name": "step3",
55+
"container": "step-step3",
56+
"imageID": "docker-pullable://gcr.io/test9/test9@sha256:f1a8b8549c179f41e27ff3db0fe1a1793e4b109da46586501a8343637b1d0478"
57+
}
58+
],
59+
"taskResults": [
60+
{
61+
"name": "IMAGE_DIGEST",
62+
"value": "sha256:827521c857fdcd4374f4da5442fbae2edb01e7fbae285c3ec15673d4c1daecb7"
63+
},
64+
{
65+
"name": "IMAGE_URL",
66+
"value": "gcr.io/my/image"
67+
}
68+
],
69+
"taskSpec": {
70+
"params": [
71+
{
72+
"name": "IMAGE",
73+
"type": "string"
74+
},
75+
{
76+
"name": "filename",
77+
"type": "string"
78+
},
79+
{
80+
"name": "DOCKERFILE",
81+
"type": "string"
82+
},
83+
{
84+
"name": "CONTEXT",
85+
"type": "string"
86+
},
87+
{
88+
"name": "EXTRA_ARGS",
89+
"type": "string"
90+
},
91+
{
92+
"name": "BUILDER_IMAGE",
93+
"type": "string"
94+
}, {
95+
"name": "CHAINS-GIT_COMMIT",
96+
"type": "string",
97+
"default": "sha:task"
98+
}, {
99+
"name": "CHAINS-GIT_URL",
100+
"type": "string",
101+
"default": "https://defaultgit.test.com"
102+
}
103+
],
104+
"steps": [
105+
{
106+
"name": "step1"
107+
},
108+
{
109+
"name": "step2"
110+
},
111+
{
112+
"name": "step3"
113+
}
114+
],
115+
"results": [
116+
{
117+
"name": "IMAGE_DIGEST",
118+
"description": "Digest of the image just built."
119+
},
120+
{
121+
"name": "filename_DIGEST",
122+
"description": "Digest of the file just built."
123+
}
124+
]
125+
},
126+
"provenance": {
127+
"refSource": {
128+
"uri": "github.com/test",
129+
"digest": {
130+
"sha1": "ab123"
131+
},
132+
"entryPoint": "build.yaml"
133+
}
134+
}
135+
}
136+
}

‎pkg/chains/formats/slsa/testdata/pipeline-v1beta1/taskrun5.json

Lines changed: 141 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,141 @@
1+
{
2+
"metadata": {
3+
"name": "mismatch size between Status.Steps and Status.TaskSpec.Steps",
4+
"labels": {
5+
"tekton.dev/pipelineTask": "build"
6+
}
7+
},
8+
"spec": {
9+
"params": [
10+
{
11+
"name": "IMAGE",
12+
"value": "test.io/test/image"
13+
},
14+
{
15+
"name": "CHAINS-GIT_COMMIT",
16+
"value": "sha:taskrun"
17+
},
18+
{
19+
"name": "CHAINS-GIT_URL",
20+
"value": "https://git.test.com"
21+
}
22+
],
23+
"taskRef": {
24+
"name": "build",
25+
"kind": "Task"
26+
},
27+
"serviceAccountName": "default"
28+
},
29+
"status": {
30+
"startTime": "2021-03-29T09:50:00Z",
31+
"completionTime": "2021-03-29T09:50:15Z",
32+
"conditions": [
33+
{
34+
"type": "Succeeded",
35+
"status": "True",
36+
"lastTransitionTime": "2021-03-29T09:50:15Z",
37+
"reason": "Succeeded",
38+
"message": "All Steps have completed executing"
39+
}
40+
],
41+
"podName": "test-pod-name",
42+
"steps": [
43+
{
44+
"name": "step1",
45+
"container": "step-step1",
46+
"imageID": "docker-pullable://gcr.io/test10/test10@sha256:d4b63d3e24d6eef04a6dc0795cf8a73470688803d97c52cffa3c8d4efd3397b6"
47+
},
48+
{
49+
"name": "step2",
50+
"container": "step-step2",
51+
"imageID": "docker-pullable://gcr.io/test11/test11@sha256:4d6dd704ef58cb214dd826519929e92a978a57cdee43693006139c0080fd6fac"
52+
},
53+
{
54+
"name": "step3",
55+
"container": "step-step3",
56+
"imageID": "docker-pullable://gcr.io/test12/test12@sha256:f1a8b8549c179f41e27ff3db0fe1a1793e4b109da46586501a8343637b1d0478"
57+
},
58+
{
59+
"name": "step4",
60+
"container": "step-step3",
61+
"imageID": "docker-pullable://gcr.io/test13/test13@sha256:f1a8b8549c179f41e27ff3db0fe1a1793e4b109da46586501a8343637b1d0478"
62+
}
63+
],
64+
"taskResults": [
65+
{
66+
"name": "IMAGE_DIGEST",
67+
"value": "sha256:827521c857fdcd4374f4da5442fbae2edb01e7fbae285c3ec15673d4c1daecb7"
68+
},
69+
{
70+
"name": "IMAGE_URL",
71+
"value": "gcr.io/my/image"
72+
}
73+
],
74+
"taskSpec": {
75+
"params": [
76+
{
77+
"name": "IMAGE",
78+
"type": "string"
79+
},
80+
{
81+
"name": "filename",
82+
"type": "string"
83+
},
84+
{
85+
"name": "DOCKERFILE",
86+
"type": "string"
87+
},
88+
{
89+
"name": "CONTEXT",
90+
"type": "string"
91+
},
92+
{
93+
"name": "EXTRA_ARGS",
94+
"type": "string"
95+
},
96+
{
97+
"name": "BUILDER_IMAGE",
98+
"type": "string"
99+
}, {
100+
"name": "CHAINS-GIT_COMMIT",
101+
"type": "string",
102+
"default": "sha:task"
103+
}, {
104+
"name": "CHAINS-GIT_URL",
105+
"type": "string",
106+
"default": "https://defaultgit.test.com"
107+
}
108+
],
109+
"steps": [
110+
{
111+
"name": "step1"
112+
},
113+
{
114+
"name": "step2"
115+
},
116+
{
117+
"name": "step3"
118+
}
119+
],
120+
"results": [
121+
{
122+
"name": "IMAGE_DIGEST",
123+
"description": "Digest of the image just built."
124+
},
125+
{
126+
"name": "filename_DIGEST",
127+
"description": "Digest of the file just built."
128+
}
129+
]
130+
},
131+
"provenance": {
132+
"refSource": {
133+
"uri": "github.com/test",
134+
"digest": {
135+
"sha1": "ab123"
136+
},
137+
"entryPoint": "build.yaml"
138+
}
139+
}
140+
}
141+
}

0 commit comments

Comments
 (0)