Skip to content

Commit 8483975

Browse files
author
Néstor Salceda
authored
fix: Don't exit 1 if the scan has a failing image result (#4)
1 parent b9cab9c commit 8483975

File tree

2 files changed

+10
-26
lines changed

2 files changed

+10
-26
lines changed

pkg/scanner/inline_adapter.go

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -75,20 +75,12 @@ func (i *inlineAdapter) buildJob(req harbor.ScanRequest) *batchv1.Job {
7575
RestartPolicy: "OnFailure",
7676
Containers: []corev1.Container{
7777
{
78-
Name: "scanner",
79-
Image: "sysdiglabs/sysdig-inline-scan:harbor-1.0",
78+
Name: "scanner",
79+
Image: "sysdiglabs/sysdig-inline-scan:harbor-1.0",
80+
Command: []string{"/bin/sh"},
8081
Args: []string{
81-
"-s",
82-
i.secureURL,
83-
"-k",
84-
"$(SYSDIG_SECURE_API_TOKEN)",
85-
"-d",
86-
req.Artifact.Digest,
87-
"-P",
88-
"-n",
89-
"-u",
90-
userPassword,
91-
getImageFrom(req),
82+
"-c",
83+
fmt.Sprintf("/sysdig-inline-scan.sh -s %s -k '$(SYSDIG_SECURE_API_TOKEN)' -d %s -P -n -u %s %s || true", i.secureURL, req.Artifact.Digest, userPassword, getImageFrom(req)),
9284
},
9385
Env: []corev1.EnvVar{
9486
{

pkg/scanner/inline_adapter_test.go

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -148,20 +148,12 @@ func job() *batchv1.Job {
148148
RestartPolicy: "OnFailure",
149149
Containers: []corev1.Container{
150150
{
151-
Name: "scanner",
152-
Image: "sysdiglabs/sysdig-inline-scan:harbor-1.0",
151+
Name: "scanner",
152+
Image: "sysdiglabs/sysdig-inline-scan:harbor-1.0",
153+
Command: []string{"/bin/sh"},
153154
Args: []string{
154-
"-s",
155-
"https://secure.sysdig.com",
156-
"-k",
157-
"$(SYSDIG_SECURE_API_TOKEN)",
158-
"-d",
159-
"an image digest",
160-
"-P",
161-
"-n",
162-
"-u",
163-
"robot$9f6711d1-834d-11ea-867f-76103d08dca8:eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE1OTAwMDk5OTksImlhdCI6MTU4NzQxNzk5OSwiaXNzIjoiaGFyYm9yLXRva2VuLWRlZmF1bHRJc3N1ZXIiLCJpZCI6OSwicGlkIjoyLCJhY2Nlc3MiOlt7IlJlc291cmNlIjoiL3Byb2plY3QvMi9yZXBvc2l0b3J5IiwiQWN0aW9uIjoic2Nhbm5lci1wdWxsIiwiRWZmZWN0IjoiIn1dfQ.A3_aTzvxqSTvl26pQKa97ay15zRPC9K55NE0WbEyOsY3m0KFz-HuSDatncWLSYvOlcGVdysKlF3JXYWIjQ7tEI4V76WA9UMoi-fr9vEEdWLF5C1uWZJOz_S72sQ3G1BzsLp3HyWe9ZN5EBK9mhXzYNv2rONYrr0UJeBmNnMf2mU3sH71OO_G6JvRl5fwFSLSYx8nQs82PhfVhx50wRuWl_zyeCCDy_ytLzjRBvZwKuI9iVIxgM1pRfKG15NWMHfl0lcYnjm7f1_WFGKtVddkLOTICK0_FPtef1L8A16ozo_2NA32WD9PstdcTuD37XbZ6AFXUAZFoZLfCEW97mtIZBY2uYMwDQtc6Nme4o3Ya-MnBEIAs9Vi9d5a4pkf7Two-xjI-9ESgVz79YqL-_OnecQPNJ9yAFtJuxQ7StfsCIZx84hh5VdcZmW9jlezRHh4hTAjsNmrOBFTAjPyaXk98Se3Fj0Ev3bChod63og4frE7_fE7HnoBKVPHRAdBhJ2yrAiPymfij_kD4ke1Vb0AxmGGOwRP2K3TZNqEdKcq89lU6lHYV2UfrWchuF3u4ieNEC1BGu1_m_c55f0YZH1FAq6evCyA0JnFuXzO4cCxC7WHzXXRGSC9Lm3LF7cbaZAgFj5d34gbgUQmJst8nPlpW-KtwRL-pHC6mipunCBv9bU",
164-
"harbor.sysdig-demo.zone/sysdig/agent:9.7.0",
155+
"-c",
156+
"/sysdig-inline-scan.sh -s https://secure.sysdig.com -k '$(SYSDIG_SECURE_API_TOKEN)' -d an image digest -P -n -u robot$9f6711d1-834d-11ea-867f-76103d08dca8:eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE1OTAwMDk5OTksImlhdCI6MTU4NzQxNzk5OSwiaXNzIjoiaGFyYm9yLXRva2VuLWRlZmF1bHRJc3N1ZXIiLCJpZCI6OSwicGlkIjoyLCJhY2Nlc3MiOlt7IlJlc291cmNlIjoiL3Byb2plY3QvMi9yZXBvc2l0b3J5IiwiQWN0aW9uIjoic2Nhbm5lci1wdWxsIiwiRWZmZWN0IjoiIn1dfQ.A3_aTzvxqSTvl26pQKa97ay15zRPC9K55NE0WbEyOsY3m0KFz-HuSDatncWLSYvOlcGVdysKlF3JXYWIjQ7tEI4V76WA9UMoi-fr9vEEdWLF5C1uWZJOz_S72sQ3G1BzsLp3HyWe9ZN5EBK9mhXzYNv2rONYrr0UJeBmNnMf2mU3sH71OO_G6JvRl5fwFSLSYx8nQs82PhfVhx50wRuWl_zyeCCDy_ytLzjRBvZwKuI9iVIxgM1pRfKG15NWMHfl0lcYnjm7f1_WFGKtVddkLOTICK0_FPtef1L8A16ozo_2NA32WD9PstdcTuD37XbZ6AFXUAZFoZLfCEW97mtIZBY2uYMwDQtc6Nme4o3Ya-MnBEIAs9Vi9d5a4pkf7Two-xjI-9ESgVz79YqL-_OnecQPNJ9yAFtJuxQ7StfsCIZx84hh5VdcZmW9jlezRHh4hTAjsNmrOBFTAjPyaXk98Se3Fj0Ev3bChod63og4frE7_fE7HnoBKVPHRAdBhJ2yrAiPymfij_kD4ke1Vb0AxmGGOwRP2K3TZNqEdKcq89lU6lHYV2UfrWchuF3u4ieNEC1BGu1_m_c55f0YZH1FAq6evCyA0JnFuXzO4cCxC7WHzXXRGSC9Lm3LF7cbaZAgFj5d34gbgUQmJst8nPlpW-KtwRL-pHC6mipunCBv9bU harbor.sysdig-demo.zone/sysdig/agent:9.7.0 || true",
165157
},
166158
Env: []corev1.EnvVar{
167159
{

0 commit comments

Comments
 (0)