diff --git a/ee/agent/startupsettings/writer_test.go b/ee/agent/startupsettings/writer_test.go index a46e5ae2a..8a4dc6509 100644 --- a/ee/agent/startupsettings/writer_test.go +++ b/ee/agent/startupsettings/writer_test.go @@ -13,9 +13,9 @@ import ( agentsqlite "github.com/kolide/launcher/ee/agent/storage/sqlite" typesmocks "github.com/kolide/launcher/ee/agent/types/mocks" "github.com/kolide/launcher/pkg/log/multislogger" + _ "github.com/mattn/go-sqlite3" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - _ "modernc.org/sqlite" ) func TestOpenWriter_NewDatabase(t *testing.T) { diff --git a/ee/agent/storage/sqlite/keyvalue_store_sqlite.go b/ee/agent/storage/sqlite/keyvalue_store_sqlite.go index eb6d7d65b..b7c87e21d 100644 --- a/ee/agent/storage/sqlite/keyvalue_store_sqlite.go +++ b/ee/agent/storage/sqlite/keyvalue_store_sqlite.go @@ -16,7 +16,7 @@ import ( "github.com/golang-migrate/migrate/v4" sqlitemigrationdriver "github.com/golang-migrate/migrate/v4/database/sqlite" "github.com/golang-migrate/migrate/v4/source/iofs" - _ "modernc.org/sqlite" + _ "github.com/mattn/go-sqlite3" ) type storeName int diff --git a/ee/katc/sqlite.go b/ee/katc/sqlite.go index 467db4928..f5e0e9c0c 100644 --- a/ee/katc/sqlite.go +++ b/ee/katc/sqlite.go @@ -8,8 +8,8 @@ import ( "path/filepath" "strings" + _ "github.com/mattn/go-sqlite3" "github.com/osquery/osquery-go/plugin/table" - _ "modernc.org/sqlite" ) // sqliteData is the dataFunc for sqlite KATC tables diff --git a/ee/katc/table_test.go b/ee/katc/table_test.go index 8cba6ce69..f9d43e521 100644 --- a/ee/katc/table_test.go +++ b/ee/katc/table_test.go @@ -14,7 +14,7 @@ import ( "github.com/osquery/osquery-go/plugin/table" "github.com/stretchr/testify/require" - _ "modernc.org/sqlite" + _ "github.com/mattn/go-sqlite3" ) func Test_generate_SqliteBackedIndexedDB(t *testing.T) { diff --git a/go.mod b/go.mod index 487b7d14d..ab0359b06 100644 --- a/go.mod +++ b/go.mod @@ -17,7 +17,7 @@ require ( github.com/kolide/kit v0.0.0-20240411131714-94dd1939cf50 github.com/kolide/krypto v0.1.1-0.20231229162826-db516b7e0121 github.com/mat/besticon v3.9.0+incompatible - github.com/mattn/go-sqlite3 v1.14.19 + github.com/mattn/go-sqlite3 v1.14.22 github.com/mixer/clock v0.0.0-20170901150240-b08e6b4da7ea github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 github.com/osquery/osquery-go v0.0.0-20231006172600-d6f325f636a9 @@ -49,6 +49,7 @@ require ( github.com/apache/thrift v0.16.0 github.com/golang-jwt/jwt/v5 v5.0.0 github.com/golang-migrate/migrate/v4 v4.16.2 + github.com/golang/snappy v0.0.4 github.com/kolide/goleveldb v0.0.0-20240514204455-8d30cd4d31c6 github.com/kolide/systray v0.0.0-20240530130728-8265cd4e35db github.com/kolide/toast v1.0.2 @@ -56,14 +57,12 @@ require ( github.com/spf13/pflag v1.0.5 go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.19.0 - modernc.org/sqlite v1.28.0 ) require ( github.com/cenkalti/backoff/v4 v4.2.1 // indirect github.com/dustin/go-humanize v1.0.1 // indirect github.com/felixge/httpsnoop v1.0.3 // indirect - github.com/golang/snappy v0.0.4 // indirect github.com/grpc-ecosystem/grpc-gateway/v2 v2.18.0 // indirect github.com/hashicorp/errwrap v1.1.0 // indirect github.com/hashicorp/go-multierror v1.1.1 // indirect @@ -84,6 +83,7 @@ require ( modernc.org/mathutil v1.6.0 // indirect modernc.org/memory v1.7.2 // indirect modernc.org/opt v0.1.3 // indirect + modernc.org/sqlite v1.28.0 // indirect modernc.org/strutil v1.1.3 // indirect modernc.org/token v1.0.1 // indirect ) diff --git a/go.sum b/go.sum index 048672642..972da7054 100644 --- a/go.sum +++ b/go.sum @@ -200,8 +200,8 @@ github.com/mat/besticon v3.9.0+incompatible h1:SLaWKCE7ptsjWbQee8Sbx8F/WK4bw8b55 github.com/mat/besticon v3.9.0+incompatible/go.mod h1:mA1auQYHt6CW5e7L9HJLmqVQC8SzNk2gVwouO0AbiEU= github.com/mattn/go-isatty v0.0.16 h1:bq3VjFmv/sOjHtdEhmkEV4x1AJtvUvOJ2PFAZ5+peKQ= github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= -github.com/mattn/go-sqlite3 v1.14.19 h1:fhGleo2h1p8tVChob4I9HpmVFIAkKGpiukdrgQbWfGI= -github.com/mattn/go-sqlite3 v1.14.19/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg= +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/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=