From f3ec7819a915e21940d9b4657096693d28a8c3b4 Mon Sep 17 00:00:00 2001 From: David Ortiz Date: Tue, 4 Feb 2025 16:31:22 +0100 Subject: [PATCH 1/2] [podman] Switch to "github.com/mattn/go-sqlite3" --- go.mod | 1 + go.sum | 3 ++- pkg/util/podman/sqlite_db_client.go | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index 7cfe63fa8c603..6e984b9778a61 100644 --- a/go.mod +++ b/go.mod @@ -479,6 +479,7 @@ require ( github.com/DataDog/datadog-agent/pkg/util/compression v0.56.0-rc.3 github.com/Masterminds/sprig/v3 v3.3.0 github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e + 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 ) diff --git a/go.sum b/go.sum index 4d100aa4ecc60..055897ced091e 100644 --- a/go.sum +++ b/go.sum @@ -1318,8 +1318,9 @@ github.com/mattn/go-runewidth v0.0.15/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh github.com/mattn/go-shellwords v1.0.2/go.mod h1:3xCvwCdWdlDJUrvuMn7Wuy9eWs4pE8vqg+NOMyg4B2o= github.com/mattn/go-shellwords v1.0.12 h1:M2zGm7EW6UQJvDeQxo4T51eKPurbeFbe8WtebGE2xrk= github.com/mattn/go-shellwords v1.0.12/go.mod h1:EZzvwXDESEeg03EKmM+RmDnNOPKG4lLtQsUlTZDWQ8Y= -github.com/mattn/go-sqlite3 v1.14.22 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5o4kU= github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y= +github.com/mattn/go-sqlite3 v1.14.24 h1:tpSp2G2KyMnnQu99ngJ47EIkWVmliIizyZBfPrBWDRM= +github.com/mattn/go-sqlite3 v1.14.24/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/maxatome/go-testdeep v1.12.0 h1:Ql7Go8Tg0C1D/uMMX59LAoYK7LffeJQ6X2T04nTH68g= github.com/maxatome/go-testdeep v1.12.0/go.mod h1:lPZc/HAcJMP92l7yI6TRz1aZN5URwUBUAfUNvrclaNM= diff --git a/pkg/util/podman/sqlite_db_client.go b/pkg/util/podman/sqlite_db_client.go index 6b95f29ab96e1..87e7be2cdd1cc 100644 --- a/pkg/util/podman/sqlite_db_client.go +++ b/pkg/util/podman/sqlite_db_client.go @@ -14,7 +14,7 @@ import ( "path/filepath" // SQLite backend for database/sql - _ "modernc.org/sqlite" + _ "github.com/mattn/go-sqlite3" "github.com/DataDog/datadog-agent/pkg/util/log" ) From 8be3c7a697f86cc2c8033598a5845571a03dd871 Mon Sep 17 00:00:00 2001 From: David Ortiz Date: Wed, 12 Feb 2025 13:54:37 +0100 Subject: [PATCH 2/2] Update licenses --- LICENSE-3rdparty.csv | 1 + 1 file changed, 1 insertion(+) diff --git a/LICENSE-3rdparty.csv b/LICENSE-3rdparty.csv index 7d66b420f0507..41d91ce36e288 100644 --- a/LICENSE-3rdparty.csv +++ b/LICENSE-3rdparty.csv @@ -1486,6 +1486,7 @@ core,github.com/mattn/go-colorable,MIT,Copyright (c) 2016 Yasuhiro Matsumoto core,github.com/mattn/go-isatty,MIT,Copyright (c) Yasuhiro MATSUMOTO core,github.com/mattn/go-runewidth,MIT,Copyright (c) 2016 Yasuhiro Matsumoto core,github.com/mattn/go-shellwords,MIT,Copyright (c) 2017 Yasuhiro Matsumoto +core,github.com/mattn/go-sqlite3,MIT,Copyright (c) 2014 Yasuhiro Matsumoto core,github.com/mdlayher/netlink,MIT,Copyright (C) 2016-2022 Matt Layher core,github.com/mdlayher/netlink/nlenc,MIT,Copyright (C) 2016-2022 Matt Layher core,github.com/mdlayher/socket,MIT,Copyright (C) 2021 Matt Layher