Skip to content

Commit 015de69

Browse files
authored
fix: trivy scan step command fix (#5162)
* fix * updated common lib to f4ed1281e694
1 parent 282c0ff commit 015de69

File tree

4 files changed

+6
-1
lines changed

4 files changed

+6
-1
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ require (
1818
github.com/davecgh/go-spew v1.1.1
1919
github.com/deckarep/golang-set v1.8.0
2020
github.com/devtron-labs/authenticator v0.4.35-0.20240405091826-a91813c53470
21-
github.com/devtron-labs/common-lib v0.0.18-0.20240520084257-237319ab2bed
21+
github.com/devtron-labs/common-lib v0.0.18-0.20240524141543-f4ed1281e694
2222
github.com/devtron-labs/protos v0.0.3-0.20240326053929-48e42d9d4534
2323
github.com/evanphx/json-patch v5.6.0+incompatible
2424
github.com/gammazero/workerpool v1.1.3

go.sum

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -209,6 +209,8 @@ github.com/devtron-labs/authenticator v0.4.35-0.20240405091826-a91813c53470 h1:A
209209
github.com/devtron-labs/authenticator v0.4.35-0.20240405091826-a91813c53470/go.mod h1:JQxTCMmQisrpjzETJr0tzVadV+wW23rHEZAY7JVyK3s=
210210
github.com/devtron-labs/common-lib v0.0.18-0.20240520084257-237319ab2bed h1:Jt9dHdE+sYoH1N2v3Se9Tgnr/7YrpCKYmB+nDcI73B4=
211211
github.com/devtron-labs/common-lib v0.0.18-0.20240520084257-237319ab2bed/go.mod h1:deAcJ5IjUjM6ozZQLJEgPWDUA0mKa632LBsKx8uM9TE=
212+
github.com/devtron-labs/common-lib v0.0.18-0.20240524141543-f4ed1281e694 h1:lUcMarRvAKzsLpmuYwFgOsKLJQpHsJuvbKG+we/dI58=
213+
github.com/devtron-labs/common-lib v0.0.18-0.20240524141543-f4ed1281e694/go.mod h1:deAcJ5IjUjM6ozZQLJEgPWDUA0mKa632LBsKx8uM9TE=
212214
github.com/devtron-labs/protos v0.0.3-0.20240326053929-48e42d9d4534 h1:TElPRU69QedW7DIQiiQxtjwSQ6cK0fCTAMGvSLhP0ac=
213215
github.com/devtron-labs/protos v0.0.3-0.20240326053929-48e42d9d4534/go.mod h1:ypUknVph8Ph4dxSlrFoouf7wLedQxHku2LQwgRrdgS4=
214216
github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=

scripts/sql/249_alter_trivy_fix.down.sql

Whitespace-only changes.
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
UPDATE public.scan_tool_step
2+
SET cli_command = '{{if .CA_CERT_FILE_PATH}} SSL_CERT_FILE={{.CA_CERT_FILE_PATH}} {{end}} trivy {{if .insecure}} --insecure {{end}} image -f json -o {{.OUTPUT_FILE_PATH}} --timeout {{.timeout}} {{.IMAGE_NAME}} --username {{.USERNAME}} --password {{.PASSWORD}} {{.EXTRA_ARGS}}'
3+
WHERE id = 1;

0 commit comments

Comments
 (0)