Skip to content

Commit b3a3bb4

Browse files
authored
Merge pull request #74 from krancour/sbom-fix
ci: fix names of jobs that publish SBOMs
2 parents 767f8e6 + 11b40d8 commit b3a3bb4

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

.brigade/brigade.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ class ScanJob extends MakeTargetJob {
144144
}
145145

146146
class PublishSBOMJob extends MakeTargetJob {
147-
constructor(image: string, event: Event, version: string) {
147+
constructor(name: string, image: string, event: Event, version: string) {
148148
const secrets = event.project.secrets
149149
const env = {
150150
"GITHUB_ORG": secrets.githubOrg,
@@ -158,7 +158,7 @@ class PublishSBOMJob extends MakeTargetJob {
158158
if (secrets.stableImageRegistryOrg) {
159159
env["DOCKER_ORG"] = secrets.stableImageRegistryOrg
160160
}
161-
super(`publish-sbom-${image}`, [`publish-sbom-${image}`], dockerClientImg, event, env)
161+
super(name, [`publish-sbom-${image}`], dockerClientImg, event, env)
162162
}
163163
}
164164

@@ -214,15 +214,15 @@ const scanGrafanaJob = (event: Event) => {
214214
}
215215
jobs[scanGrafanaJobName] = scanGrafanaJob
216216

217-
const publishExporterSBOMJobName = "publish-exporter-sbom"
217+
const publishExporterSBOMJobName = "publish-sbom-exporter"
218218
const publishExporterSBOMJob = (event: Event, version: string) => {
219-
return new PublishSBOMJob("receiver", event, version)
219+
return new PublishSBOMJob(publishExporterSBOMJobName, "exporter", event, version)
220220
}
221221
jobs[publishExporterSBOMJobName] = publishExporterSBOMJob
222222

223-
const publishGrafanaSBOMJobName = "publish-grafana-sbom"
223+
const publishGrafanaSBOMJobName = "publish-sbom-grafana"
224224
const publishGrafanaSBOMJob = (event: Event, version: string) => {
225-
return new PublishSBOMJob("monitor", event, version)
225+
return new PublishSBOMJob(publishGrafanaSBOMJobName, "grafana", event, version)
226226
}
227227
jobs[publishGrafanaSBOMJobName] = publishGrafanaSBOMJob
228228

0 commit comments

Comments
 (0)