From e93e159b772686a4b4a37ce8d6030c34044b9948 Mon Sep 17 00:00:00 2001 From: Paul Cacheux Date: Tue, 4 Mar 2025 15:03:20 +0100 Subject: [PATCH] [CWS] use `modernc.org/sqlite` in CWS functional tests (#34702) --- LICENSE-3rdparty.csv | 35 +++++++++++++++++++++++++++ go.mod | 9 +++++++ go.sum | 12 +++++++++ pkg/util/trivy/sqlite_functests.go | 15 ++++++++++++ pkg/util/trivy/sqlite_no_functests.go | 23 ++++++++++++++++++ pkg/util/trivy/trivy.go | 10 -------- 6 files changed, 94 insertions(+), 10 deletions(-) create mode 100644 pkg/util/trivy/sqlite_functests.go create mode 100644 pkg/util/trivy/sqlite_no_functests.go diff --git a/LICENSE-3rdparty.csv b/LICENSE-3rdparty.csv index c964bdf2f98a10..dfdc07836d4ece 100644 --- a/LICENSE-3rdparty.csv +++ b/LICENSE-3rdparty.csv @@ -1350,6 +1350,7 @@ core,github.com/mostynb/go-grpc-compression/nonclobbering/zstd,Apache-2.0,Copyri core,github.com/munnerz/goautoneg,BSD-3-Clause,"Copyright (c) 2011, Open Knowledge Foundation Ltd" core,github.com/mwitkow/go-conntrack,Apache-2.0,Copyright 2016 Michal Witkowski. All Rights Reserved. core,github.com/mxk/go-flowrate/flowrate,BSD-3-Clause,Copyright (c) 2014 The Go-FlowRate Authors. All rights reserved +core,github.com/ncruces/go-strftime,MIT,Copyright (c) 2022 Nuno Cruces core,github.com/netsampler/goflow2/decoders,BSD-3-Clause,"Copyright (c) 2021, NetSampler" core,github.com/netsampler/goflow2/decoders/netflow,BSD-3-Clause,"Copyright (c) 2021, NetSampler" core,github.com/netsampler/goflow2/decoders/netflow/templates,BSD-3-Clause,"Copyright (c) 2021, NetSampler" @@ -1831,6 +1832,7 @@ core,github.com/redis/go-redis/v9/internal/pool,BSD-2-Clause,Copyright (c) 2013 core,github.com/redis/go-redis/v9/internal/proto,BSD-2-Clause,Copyright (c) 2013 The github.com/redis/go-redis Authors core,github.com/redis/go-redis/v9/internal/rand,BSD-2-Clause,Copyright (c) 2013 The github.com/redis/go-redis Authors core,github.com/redis/go-redis/v9/internal/util,BSD-2-Clause,Copyright (c) 2013 The github.com/redis/go-redis Authors +core,github.com/remyoudompheng/bigfft,BSD-3-Clause,Copyright (c) 2012 The Go Authors. All rights reserved core,github.com/richardartoul/molecule,MIT,Copyright (c) 2020 Richard Artoul core,github.com/richardartoul/molecule/src/codec,Apache-2.0,Copyright (c) 2020 Richard Artoul core,github.com/richardartoul/molecule/src/protowire,BSD-3-Clause,Copyright (c) 2018 The Go Authors. All rights reserved | Copyright (c) 2020 Richard Artoul @@ -3683,6 +3685,39 @@ core,k8s.io/utils/ptr,Apache-2.0,Copyright 2014 The Kubernetes Authors. core,k8s.io/utils/strings/slices,Apache-2.0,Copyright 2014 The Kubernetes Authors. core,k8s.io/utils/trace,Apache-2.0,Copyright 2014 The Kubernetes Authors. core,mellium.im/sasl,BSD-2-Clause,Copyright © 2014 The Mellium Contributors +core,modernc.org/gc/v3,BSD-3-Clause,Copyright (c) 2009 The Go Authors. All rights reserved | Copyright (c) 2016 The GC Authors. All rights reserved +core,modernc.org/libc,BSD-3-Clause,Bjørn Wiegell | Copyright (c) 2017 The Libc Authors. All rights reserved | Dan Kortschak | Dan Peterson | Fabrice Colliot | Jaap Aarts | Jan Mercl <0xjnml@gmail.com> | Jason DeBettencourt | Koichi Shiraishi | Marius Orcsik | Patricio Whittingslow | Scot C Bontrager | Steffen Butzer | W. Michael Petullo | ZHU Zijia +core,modernc.org/libc/errno,BSD-3-Clause,Bjørn Wiegell | Copyright (c) 2017 The Libc Authors. All rights reserved | Dan Kortschak | Dan Peterson | Fabrice Colliot | Jaap Aarts | Jan Mercl <0xjnml@gmail.com> | Jason DeBettencourt | Koichi Shiraishi | Marius Orcsik | Patricio Whittingslow | Scot C Bontrager | Steffen Butzer | W. Michael Petullo | ZHU Zijia +core,modernc.org/libc/fcntl,BSD-3-Clause,Bjørn Wiegell | Copyright (c) 2017 The Libc Authors. All rights reserved | Dan Kortschak | Dan Peterson | Fabrice Colliot | Jaap Aarts | Jan Mercl <0xjnml@gmail.com> | Jason DeBettencourt | Koichi Shiraishi | Marius Orcsik | Patricio Whittingslow | Scot C Bontrager | Steffen Butzer | W. Michael Petullo | ZHU Zijia +core,modernc.org/libc/fts,BSD-3-Clause,Bjørn Wiegell | Copyright (c) 2017 The Libc Authors. All rights reserved | Dan Kortschak | Dan Peterson | Fabrice Colliot | Jaap Aarts | Jan Mercl <0xjnml@gmail.com> | Jason DeBettencourt | Koichi Shiraishi | Marius Orcsik | Patricio Whittingslow | Scot C Bontrager | Steffen Butzer | W. Michael Petullo | ZHU Zijia +core,modernc.org/libc/grp,BSD-3-Clause,Bjørn Wiegell | Copyright (c) 2017 The Libc Authors. All rights reserved | Dan Kortschak | Dan Peterson | Fabrice Colliot | Jaap Aarts | Jan Mercl <0xjnml@gmail.com> | Jason DeBettencourt | Koichi Shiraishi | Marius Orcsik | Patricio Whittingslow | Scot C Bontrager | Steffen Butzer | W. Michael Petullo | ZHU Zijia +core,modernc.org/libc/honnef.co/go/netdb,MIT,Bjørn Wiegell | Copyright (c) 2012 Dominik Honnef | Copyright (c) 2017 The Libc Authors. All rights reserved | Dan Kortschak | Dan Peterson | Fabrice Colliot | Jaap Aarts | Jan Mercl <0xjnml@gmail.com> | Jason DeBettencourt | Koichi Shiraishi | Marius Orcsik | Patricio Whittingslow | Scot C Bontrager | Steffen Butzer | W. Michael Petullo | ZHU Zijia +core,modernc.org/libc/langinfo,BSD-3-Clause,Bjørn Wiegell | Copyright (c) 2017 The Libc Authors. All rights reserved | Dan Kortschak | Dan Peterson | Fabrice Colliot | Jaap Aarts | Jan Mercl <0xjnml@gmail.com> | Jason DeBettencourt | Koichi Shiraishi | Marius Orcsik | Patricio Whittingslow | Scot C Bontrager | Steffen Butzer | W. Michael Petullo | ZHU Zijia +core,modernc.org/libc/limits,BSD-3-Clause,Bjørn Wiegell | Copyright (c) 2017 The Libc Authors. All rights reserved | Dan Kortschak | Dan Peterson | Fabrice Colliot | Jaap Aarts | Jan Mercl <0xjnml@gmail.com> | Jason DeBettencourt | Koichi Shiraishi | Marius Orcsik | Patricio Whittingslow | Scot C Bontrager | Steffen Butzer | W. Michael Petullo | ZHU Zijia +core,modernc.org/libc/netdb,BSD-3-Clause,Bjørn Wiegell | Copyright (c) 2017 The Libc Authors. All rights reserved | Dan Kortschak | Dan Peterson | Fabrice Colliot | Jaap Aarts | Jan Mercl <0xjnml@gmail.com> | Jason DeBettencourt | Koichi Shiraishi | Marius Orcsik | Patricio Whittingslow | Scot C Bontrager | Steffen Butzer | W. Michael Petullo | ZHU Zijia +core,modernc.org/libc/netinet/in,BSD-3-Clause,Bjørn Wiegell | Copyright (c) 2017 The Libc Authors. All rights reserved | Dan Kortschak | Dan Peterson | Fabrice Colliot | Jaap Aarts | Jan Mercl <0xjnml@gmail.com> | Jason DeBettencourt | Koichi Shiraishi | Marius Orcsik | Patricio Whittingslow | Scot C Bontrager | Steffen Butzer | W. Michael Petullo | ZHU Zijia +core,modernc.org/libc/poll,BSD-3-Clause,Bjørn Wiegell | Copyright (c) 2017 The Libc Authors. All rights reserved | Dan Kortschak | Dan Peterson | Fabrice Colliot | Jaap Aarts | Jan Mercl <0xjnml@gmail.com> | Jason DeBettencourt | Koichi Shiraishi | Marius Orcsik | Patricio Whittingslow | Scot C Bontrager | Steffen Butzer | W. Michael Petullo | ZHU Zijia +core,modernc.org/libc/pthread,BSD-3-Clause,Bjørn Wiegell | Copyright (c) 2017 The Libc Authors. All rights reserved | Dan Kortschak | Dan Peterson | Fabrice Colliot | Jaap Aarts | Jan Mercl <0xjnml@gmail.com> | Jason DeBettencourt | Koichi Shiraishi | Marius Orcsik | Patricio Whittingslow | Scot C Bontrager | Steffen Butzer | W. Michael Petullo | ZHU Zijia +core,modernc.org/libc/pwd,BSD-3-Clause,Bjørn Wiegell | Copyright (c) 2017 The Libc Authors. All rights reserved | Dan Kortschak | Dan Peterson | Fabrice Colliot | Jaap Aarts | Jan Mercl <0xjnml@gmail.com> | Jason DeBettencourt | Koichi Shiraishi | Marius Orcsik | Patricio Whittingslow | Scot C Bontrager | Steffen Butzer | W. Michael Petullo | ZHU Zijia +core,modernc.org/libc/signal,BSD-3-Clause,Bjørn Wiegell | Copyright (c) 2017 The Libc Authors. All rights reserved | Dan Kortschak | Dan Peterson | Fabrice Colliot | Jaap Aarts | Jan Mercl <0xjnml@gmail.com> | Jason DeBettencourt | Koichi Shiraishi | Marius Orcsik | Patricio Whittingslow | Scot C Bontrager | Steffen Butzer | W. Michael Petullo | ZHU Zijia +core,modernc.org/libc/stdio,BSD-3-Clause,Bjørn Wiegell | Copyright (c) 2017 The Libc Authors. All rights reserved | Dan Kortschak | Dan Peterson | Fabrice Colliot | Jaap Aarts | Jan Mercl <0xjnml@gmail.com> | Jason DeBettencourt | Koichi Shiraishi | Marius Orcsik | Patricio Whittingslow | Scot C Bontrager | Steffen Butzer | W. Michael Petullo | ZHU Zijia +core,modernc.org/libc/stdlib,BSD-3-Clause,Bjørn Wiegell | Copyright (c) 2017 The Libc Authors. All rights reserved | Dan Kortschak | Dan Peterson | Fabrice Colliot | Jaap Aarts | Jan Mercl <0xjnml@gmail.com> | Jason DeBettencourt | Koichi Shiraishi | Marius Orcsik | Patricio Whittingslow | Scot C Bontrager | Steffen Butzer | W. Michael Petullo | ZHU Zijia +core,modernc.org/libc/sys/socket,BSD-3-Clause,Bjørn Wiegell | Copyright (c) 2017 The Libc Authors. All rights reserved | Dan Kortschak | Dan Peterson | Fabrice Colliot | Jaap Aarts | Jan Mercl <0xjnml@gmail.com> | Jason DeBettencourt | Koichi Shiraishi | Marius Orcsik | Patricio Whittingslow | Scot C Bontrager | Steffen Butzer | W. Michael Petullo | ZHU Zijia +core,modernc.org/libc/sys/stat,BSD-3-Clause,Bjørn Wiegell | Copyright (c) 2017 The Libc Authors. All rights reserved | Dan Kortschak | Dan Peterson | Fabrice Colliot | Jaap Aarts | Jan Mercl <0xjnml@gmail.com> | Jason DeBettencourt | Koichi Shiraishi | Marius Orcsik | Patricio Whittingslow | Scot C Bontrager | Steffen Butzer | W. Michael Petullo | ZHU Zijia +core,modernc.org/libc/sys/types,BSD-3-Clause,Bjørn Wiegell | Copyright (c) 2017 The Libc Authors. All rights reserved | Dan Kortschak | Dan Peterson | Fabrice Colliot | Jaap Aarts | Jan Mercl <0xjnml@gmail.com> | Jason DeBettencourt | Koichi Shiraishi | Marius Orcsik | Patricio Whittingslow | Scot C Bontrager | Steffen Butzer | W. Michael Petullo | ZHU Zijia +core,modernc.org/libc/termios,BSD-3-Clause,Bjørn Wiegell | Copyright (c) 2017 The Libc Authors. All rights reserved | Dan Kortschak | Dan Peterson | Fabrice Colliot | Jaap Aarts | Jan Mercl <0xjnml@gmail.com> | Jason DeBettencourt | Koichi Shiraishi | Marius Orcsik | Patricio Whittingslow | Scot C Bontrager | Steffen Butzer | W. Michael Petullo | ZHU Zijia +core,modernc.org/libc/time,BSD-3-Clause,Bjørn Wiegell | Copyright (c) 2017 The Libc Authors. All rights reserved | Dan Kortschak | Dan Peterson | Fabrice Colliot | Jaap Aarts | Jan Mercl <0xjnml@gmail.com> | Jason DeBettencourt | Koichi Shiraishi | Marius Orcsik | Patricio Whittingslow | Scot C Bontrager | Steffen Butzer | W. Michael Petullo | ZHU Zijia +core,modernc.org/libc/unistd,BSD-3-Clause,Bjørn Wiegell | Copyright (c) 2017 The Libc Authors. All rights reserved | Dan Kortschak | Dan Peterson | Fabrice Colliot | Jaap Aarts | Jan Mercl <0xjnml@gmail.com> | Jason DeBettencourt | Koichi Shiraishi | Marius Orcsik | Patricio Whittingslow | Scot C Bontrager | Steffen Butzer | W. Michael Petullo | ZHU Zijia +core,modernc.org/libc/utime,BSD-3-Clause,Bjørn Wiegell | Copyright (c) 2017 The Libc Authors. All rights reserved | Dan Kortschak | Dan Peterson | Fabrice Colliot | Jaap Aarts | Jan Mercl <0xjnml@gmail.com> | Jason DeBettencourt | Koichi Shiraishi | Marius Orcsik | Patricio Whittingslow | Scot C Bontrager | Steffen Butzer | W. Michael Petullo | ZHU Zijia +core,modernc.org/libc/uuid,BSD-3-Clause,Bjørn Wiegell | Copyright (c) 2017 The Libc Authors. All rights reserved | Dan Kortschak | Dan Peterson | Fabrice Colliot | Jaap Aarts | Jan Mercl <0xjnml@gmail.com> | Jason DeBettencourt | Koichi Shiraishi | Marius Orcsik | Patricio Whittingslow | Scot C Bontrager | Steffen Butzer | W. Michael Petullo | ZHU Zijia +core,modernc.org/libc/uuid/uuid,BSD-3-Clause,Bjørn Wiegell | Copyright (c) 2017 The Libc Authors. All rights reserved | Dan Kortschak | Dan Peterson | Fabrice Colliot | Jaap Aarts | Jan Mercl <0xjnml@gmail.com> | Jason DeBettencourt | Koichi Shiraishi | Marius Orcsik | Patricio Whittingslow | Scot C Bontrager | Steffen Butzer | W. Michael Petullo | ZHU Zijia +core,modernc.org/libc/wctype,BSD-3-Clause,Bjørn Wiegell | Copyright (c) 2017 The Libc Authors. All rights reserved | Dan Kortschak | Dan Peterson | Fabrice Colliot | Jaap Aarts | Jan Mercl <0xjnml@gmail.com> | Jason DeBettencourt | Koichi Shiraishi | Marius Orcsik | Patricio Whittingslow | Scot C Bontrager | Steffen Butzer | W. Michael Petullo | ZHU Zijia +core,modernc.org/mathutil,BSD-3-Clause,Bodecker DellaMaria | CZ.NIC z.s.p.o. | Copyright (c) 2014 The mathutil Authors. All rights reserved | Edward Betts | Faiz Abbasi | Gary Burd | Jan Mercl <0xjnml@gmail.com> | Muhammad Surya | Santiago De la Cruz +core,modernc.org/memory,BSD-3-Clause,Anup Kodlekere | Copyright (c) 2017 The Memory Authors. All rights reserved | Gleb Sakhnov | Jan Mercl <0xjnml@gmail.com> | Scot C Bontrager | Steffen Butzer | ZHU Zijia +core,modernc.org/sqlite,BSD-3-Clause,Alexander Menzhinsky | Alexey Palazhchenko | Angus Dippenaar | Artyom Pervukhin | Copyright (c) 2017 The Sqlite Authors. All rights reserved | Dan Kortschak | Dan Peterson | David Skinner | David Walton | Davsk Ltd Co | Elle Mouton | FerretDB Inc. | FlyingOnion <731677080@qq.com> | Gleb Sakhnov | Jaap Aarts | Jan Mercl <0xjnml@gmail.com> | Josh Bleecher Snyder | Josh Klein | Kim | Logan Snow | Mario Salgado | Mark Summerfield | Matthew Gabeler-Lee | Michael Hoffmann | Michael Rykov | Morgan Bazalgette | Prathyush PV | Romain Le Disez | Ross Light | Saed SayedAhmed | Sean McGivern | Steffen Butzer | Toni Spets | W. Michael Petullo | Yaacov Akiba Slama +core,modernc.org/sqlite/lib,BSD-3-Clause,Alexander Menzhinsky | Alexey Palazhchenko | Angus Dippenaar | Artyom Pervukhin | Copyright (c) 2017 The Sqlite Authors. All rights reserved | Dan Kortschak | Dan Peterson | David Skinner | David Walton | Davsk Ltd Co | Elle Mouton | FerretDB Inc. | FlyingOnion <731677080@qq.com> | Gleb Sakhnov | Jaap Aarts | Jan Mercl <0xjnml@gmail.com> | Josh Bleecher Snyder | Josh Klein | Kim | Logan Snow | Mario Salgado | Mark Summerfield | Matthew Gabeler-Lee | Michael Hoffmann | Michael Rykov | Morgan Bazalgette | Prathyush PV | Romain Le Disez | Ross Light | Saed SayedAhmed | Sean McGivern | Steffen Butzer | Toni Spets | W. Michael Petullo | Yaacov Akiba Slama +core,modernc.org/strutil,BSD-3-Clause,CZ.NIC z.s.p.o. | Copyright (c) 2014 The strutil Authors. All rights reserved | Jan Mercl <0xjnml@gmail.com> +core,modernc.org/token,BSD-3-Clause,Copyright (c) 2009 The Go Authors. All rights reserved core,rsc.io/binaryregexp,BSD-3-Clause,Copyright (c) 2009 The Go Authors. All rights reserved core,rsc.io/binaryregexp/syntax,BSD-3-Clause,Copyright (c) 2009 The Go Authors. All rights reserved core,sigs.k8s.io/apiserver-network-proxy/konnectivity-client/pkg/client,Apache-2.0,Copyright 2017 The Kubernetes Authors. diff --git a/go.mod b/go.mod index fea77ae95a5f23..9435ab01913353 100644 --- a/go.mod +++ b/go.mod @@ -485,6 +485,7 @@ require ( github.com/mattn/go-sqlite3 v1.14.24 github.com/shirou/gopsutil/v4 v4.25.1 go.opentelemetry.io/collector/component/componenttest v0.120.0 + modernc.org/sqlite v1.34.1 ) require ( @@ -789,6 +790,7 @@ require ( github.com/moby/sys/user v0.3.0 // indirect github.com/moby/sys/userns v0.1.0 // indirect github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect + github.com/ncruces/go-strftime v0.1.9 // indirect github.com/nxadm/tail v1.4.11 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector v0.120.1 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sapmexporter v0.120.1 // indirect @@ -845,6 +847,7 @@ require ( github.com/prometheus/common/sigv4 v0.1.0 // indirect github.com/prometheus/prometheus v0.300.1 // indirect github.com/puzpuzpuz/xsync/v3 v3.4.0 // indirect + github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect github.com/rogpeppe/go-internal v1.13.1 // indirect github.com/rs/zerolog v1.33.0 // indirect github.com/ryanuber/go-glob v1.0.0 // indirect @@ -911,6 +914,12 @@ require ( honnef.co/go/tools v0.5.1 // indirect k8s.io/kms v0.31.2 // indirect k8s.io/sample-controller v0.31.2 // indirect + modernc.org/gc/v3 v3.0.0-20240107210532-573471604cb6 // indirect + modernc.org/libc v1.55.3 // indirect + modernc.org/mathutil v1.6.0 // indirect + modernc.org/memory v1.8.0 // indirect + modernc.org/strutil v1.2.0 // indirect + modernc.org/token v1.1.0 // indirect rsc.io/binaryregexp v0.2.0 // indirect ) diff --git a/go.sum b/go.sum index 6417afb8fda734..d60673ff9ab1d2 100644 --- a/go.sum +++ b/go.sum @@ -2717,6 +2717,14 @@ k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 h1:M3sRQVHv7vB20Xc2ybTt7ODCeFj6J k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= mellium.im/sasl v0.3.2 h1:PT6Xp7ccn9XaXAnJ03FcEjmAn7kK1x7aoXV6F+Vmrl0= mellium.im/sasl v0.3.2/go.mod h1:NKXDi1zkr+BlMHLQjY3ofYuU4KSPFxknb8mfEu6SveY= +modernc.org/cc/v4 v4.21.4 h1:3Be/Rdo1fpr8GrQ7IVw9OHtplU4gWbb+wNgeoBMmGLQ= +modernc.org/cc/v4 v4.21.4/go.mod h1:HM7VJTZbUCR3rV8EYBi9wxnJ0ZBRiGE5OeGXNA0IsLQ= +modernc.org/ccgo/v4 v4.19.2 h1:lwQZgvboKD0jBwdaeVCTouxhxAyN6iawF3STraAal8Y= +modernc.org/ccgo/v4 v4.19.2/go.mod h1:ysS3mxiMV38XGRTTcgo0DQTeTmAO4oCmJl1nX9VFI3s= +modernc.org/fileutil v1.3.0 h1:gQ5SIzK3H9kdfai/5x41oQiKValumqNTDXMvKo62HvE= +modernc.org/fileutil v1.3.0/go.mod h1:XatxS8fZi3pS8/hKG2GH/ArUogfxjpEKs3Ku3aK4JyQ= +modernc.org/gc/v2 v2.4.1 h1:9cNzOqPyMJBvrUipmynX0ZohMhcxPtMccYgGOJdOiBw= +modernc.org/gc/v2 v2.4.1/go.mod h1:wzN5dK1AzVGoH6XOzc3YZ+ey/jPgYHLuVckd62P0GYU= modernc.org/gc/v3 v3.0.0-20240107210532-573471604cb6 h1:5D53IMaUuA5InSeMu9eJtlQXS2NxAhyWQvkKEgXZhHI= modernc.org/gc/v3 v3.0.0-20240107210532-573471604cb6/go.mod h1:Qz0X07sNOR1jWYCrJMEnbW/X55x206Q7Vt4mz6/wHp4= modernc.org/libc v1.55.3 h1:AzcW1mhlPNrRtjS5sS+eW2ISCgSOLLNyFzRh/V3Qj/U= @@ -2725,6 +2733,10 @@ modernc.org/mathutil v1.6.0 h1:fRe9+AmYlaej+64JsEEhoWuAYBkOtQiMEU7n/XgfYi4= modernc.org/mathutil v1.6.0/go.mod h1:Ui5Q9q1TR2gFm0AQRqQUaBWFLAhQpCwNcuhBOSedWPo= modernc.org/memory v1.8.0 h1:IqGTL6eFMaDZZhEWwcREgeMXYwmW83LYW8cROZYkg+E= modernc.org/memory v1.8.0/go.mod h1:XPZ936zp5OMKGWPqbD3JShgd/ZoQ7899TUuQqxY+peU= +modernc.org/opt v0.1.3 h1:3XOZf2yznlhC+ibLltsDGzABUGVx8J6pnFMS3E4dcq4= +modernc.org/opt v0.1.3/go.mod h1:WdSiB5evDcignE70guQKxYUl14mgWtbClRi5wmkkTX0= +modernc.org/sortutil v1.2.0 h1:jQiD3PfS2REGJNzNCMMaLSp/wdMNieTbKX920Cqdgqc= +modernc.org/sortutil v1.2.0/go.mod h1:TKU2s7kJMf1AE84OoiGppNHJwvB753OYfNl2WRb++Ss= modernc.org/sqlite v1.34.1 h1:u3Yi6M0N8t9yKRDwhXcyp1eS5/ErhPTBggxWFuR6Hfk= modernc.org/sqlite v1.34.1/go.mod h1:pXV2xHxhzXZsgT/RtTFAPY6JJDEvOTcTdwADQCCWD4k= modernc.org/strutil v1.2.0 h1:agBi9dp1I+eOnxXeiZawM8F4LawKv4NzGWSaLfyeNZA= diff --git a/pkg/util/trivy/sqlite_functests.go b/pkg/util/trivy/sqlite_functests.go new file mode 100644 index 00000000000000..ebdff70ef2bcc8 --- /dev/null +++ b/pkg/util/trivy/sqlite_functests.go @@ -0,0 +1,15 @@ +// Unless explicitly stated otherwise all files in this repository are licensed +// under the Apache License Version 2.0. +// This product includes software developed at Datadog (https://www.datadoghq.com/). +// Copyright 2016-present Datadog, Inc. + +//go:build trivy && functionaltests + +// Package trivy holds the scan components +package trivy + +import ( + // used to read RPM database + // mattn/go-sqlite3 is currently not fully supported by our functional tests setup + _ "modernc.org/sqlite" +) diff --git a/pkg/util/trivy/sqlite_no_functests.go b/pkg/util/trivy/sqlite_no_functests.go new file mode 100644 index 00000000000000..c35850839d2d4a --- /dev/null +++ b/pkg/util/trivy/sqlite_no_functests.go @@ -0,0 +1,23 @@ +// Unless explicitly stated otherwise all files in this repository are licensed +// under the Apache License Version 2.0. +// This product includes software developed at Datadog (https://www.datadoghq.com/). +// Copyright 2016-present Datadog, Inc. + +//go:build trivy && !functionaltests + +// Package trivy holds the scan components +package trivy + +import ( + // used to read RPM database + "database/sql" + + "github.com/mattn/go-sqlite3" +) + +// This is required to load sqlite based RPM databases +func init() { + // mattn/go-sqlite3 is only registering the sqlite3 driver + // let's register the sqlite (no 3) driver as well + sql.Register("sqlite", &sqlite3.SQLiteDriver{}) +} diff --git a/pkg/util/trivy/trivy.go b/pkg/util/trivy/trivy.go index 52392b060be6b9..00a664d8e8150d 100644 --- a/pkg/util/trivy/trivy.go +++ b/pkg/util/trivy/trivy.go @@ -10,7 +10,6 @@ package trivy import ( "context" - "database/sql" "errors" "fmt" "io/fs" @@ -34,8 +33,6 @@ import ( "github.com/aquasecurity/trivy/pkg/types" "github.com/aquasecurity/trivy/pkg/vulnerability" - "github.com/mattn/go-sqlite3" - "github.com/DataDog/datadog-agent/comp/core/config" workloadmeta "github.com/DataDog/datadog-agent/comp/core/workloadmeta/def" "github.com/DataDog/datadog-agent/pkg/sbom" @@ -43,13 +40,6 @@ import ( "github.com/DataDog/datadog-agent/pkg/util/option" ) -// This is required to load sqlite based RPM databases -func init() { - // mattn/go-sqlite3 is only registering the sqlite3 driver - // let's register the sqlite (no 3) driver as well - sql.Register("sqlite", &sqlite3.SQLiteDriver{}) -} - const ( OSAnalyzers = "os" // OSAnalyzers defines an OS analyzer LanguagesAnalyzers = "languages" // LanguagesAnalyzers defines a language analyzer