From 4abb2c4531e66f588c45fb4ea306b5a046c6e7ef Mon Sep 17 00:00:00 2001 From: kartik-579 Date: Fri, 24 May 2024 09:31:34 +0530 Subject: [PATCH 1/2] fix --- scripts/sql/249_alter_trivy_fix.down.sql | 0 scripts/sql/249_alter_trivy_fix.up.sql | 3 +++ 2 files changed, 3 insertions(+) create mode 100644 scripts/sql/249_alter_trivy_fix.down.sql create mode 100644 scripts/sql/249_alter_trivy_fix.up.sql diff --git a/scripts/sql/249_alter_trivy_fix.down.sql b/scripts/sql/249_alter_trivy_fix.down.sql new file mode 100644 index 0000000000..e69de29bb2 diff --git a/scripts/sql/249_alter_trivy_fix.up.sql b/scripts/sql/249_alter_trivy_fix.up.sql new file mode 100644 index 0000000000..f4f6e3a258 --- /dev/null +++ b/scripts/sql/249_alter_trivy_fix.up.sql @@ -0,0 +1,3 @@ +UPDATE public.scan_tool_step +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}}' +WHERE id = 1; From 2029bb7ebaf0e9e2d720cb8c4b4551c3dc3ebce7 Mon Sep 17 00:00:00 2001 From: kartik-579 Date: Fri, 24 May 2024 20:00:02 +0530 Subject: [PATCH 2/2] updated common lib to f4ed1281e694 --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 4570029193..a4ccb6f9d3 100644 --- a/go.mod +++ b/go.mod @@ -18,7 +18,7 @@ require ( github.com/davecgh/go-spew v1.1.1 github.com/deckarep/golang-set v1.8.0 github.com/devtron-labs/authenticator v0.4.35-0.20240405091826-a91813c53470 - github.com/devtron-labs/common-lib v0.0.18-0.20240520084257-237319ab2bed + github.com/devtron-labs/common-lib v0.0.18-0.20240524141543-f4ed1281e694 github.com/devtron-labs/protos v0.0.3-0.20240326053929-48e42d9d4534 github.com/evanphx/json-patch v5.6.0+incompatible github.com/gammazero/workerpool v1.1.3 diff --git a/go.sum b/go.sum index 2cfb8a5ced..f558f2ac31 100644 --- a/go.sum +++ b/go.sum @@ -209,6 +209,8 @@ github.com/devtron-labs/authenticator v0.4.35-0.20240405091826-a91813c53470 h1:A github.com/devtron-labs/authenticator v0.4.35-0.20240405091826-a91813c53470/go.mod h1:JQxTCMmQisrpjzETJr0tzVadV+wW23rHEZAY7JVyK3s= github.com/devtron-labs/common-lib v0.0.18-0.20240520084257-237319ab2bed h1:Jt9dHdE+sYoH1N2v3Se9Tgnr/7YrpCKYmB+nDcI73B4= github.com/devtron-labs/common-lib v0.0.18-0.20240520084257-237319ab2bed/go.mod h1:deAcJ5IjUjM6ozZQLJEgPWDUA0mKa632LBsKx8uM9TE= +github.com/devtron-labs/common-lib v0.0.18-0.20240524141543-f4ed1281e694 h1:lUcMarRvAKzsLpmuYwFgOsKLJQpHsJuvbKG+we/dI58= +github.com/devtron-labs/common-lib v0.0.18-0.20240524141543-f4ed1281e694/go.mod h1:deAcJ5IjUjM6ozZQLJEgPWDUA0mKa632LBsKx8uM9TE= github.com/devtron-labs/protos v0.0.3-0.20240326053929-48e42d9d4534 h1:TElPRU69QedW7DIQiiQxtjwSQ6cK0fCTAMGvSLhP0ac= github.com/devtron-labs/protos v0.0.3-0.20240326053929-48e42d9d4534/go.mod h1:ypUknVph8Ph4dxSlrFoouf7wLedQxHku2LQwgRrdgS4= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=