diff --git a/Makefile b/Makefile index f4de94d4..f269f43c 100644 --- a/Makefile +++ b/Makefile @@ -60,7 +60,7 @@ GOTESTSUM = $(BIN)/gotestsum $(BIN)/gotestsum: PACKAGE=gotest.tools/gotestsum@latest MOCKGEN = $(BIN)/mockgen -$(BIN)/mockgen: PACKAGE=github.com/golang/mock/mockgen@v1.6.0 +$(BIN)/mockgen: PACKAGE=go.uber.org/mock/mockgen@v0.4.0 PIGEON = $(BIN)/pigeon $(BIN)/pigeon: PACKAGE=github.com/mna/pigeon@v1.1.0 diff --git a/common/clickhousedb/mocks/empty.go b/common/clickhousedb/mocks/empty.go index 6a994f7e..e0b828b7 100644 --- a/common/clickhousedb/mocks/empty.go +++ b/common/clickhousedb/mocks/empty.go @@ -6,5 +6,5 @@ package mocks import ( _ "github.com/ClickHouse/clickhouse-go/v2/lib/driver" // for mockgen in vendor mode - _ "github.com/golang/mock/mockgen/model" // for mockgen in vendor mode + _ "go.uber.org/mock/mockgen/model" // for mockgen in vendor mode ) diff --git a/common/clickhousedb/root_test.go b/common/clickhousedb/root_test.go index 2bcac7fa..68a0b7c6 100644 --- a/common/clickhousedb/root_test.go +++ b/common/clickhousedb/root_test.go @@ -8,7 +8,7 @@ import ( "errors" "testing" - "github.com/golang/mock/gomock" + "go.uber.org/mock/gomock" "akvorado/common/clickhousedb/mocks" "akvorado/common/helpers" diff --git a/common/clickhousedb/tests.go b/common/clickhousedb/tests.go index 15cf4177..3aaaa9cd 100644 --- a/common/clickhousedb/tests.go +++ b/common/clickhousedb/tests.go @@ -9,7 +9,7 @@ import ( "testing" "time" - "github.com/golang/mock/gomock" + "go.uber.org/mock/gomock" "akvorado/common/clickhousedb/mocks" "akvorado/common/daemon" diff --git a/conntrackfixer/mocks/empty.go b/conntrackfixer/mocks/empty.go index 5e407bbf..0f74ad99 100644 --- a/conntrackfixer/mocks/empty.go +++ b/conntrackfixer/mocks/empty.go @@ -5,5 +5,5 @@ package mocks import ( - _ "github.com/golang/mock/mockgen/model" // for mockgen in vendor mode + _ "go.uber.org/mock/mockgen/model" // for mockgen in vendor mode ) diff --git a/conntrackfixer/root_test.go b/conntrackfixer/root_test.go index ade900cc..8a74db31 100644 --- a/conntrackfixer/root_test.go +++ b/conntrackfixer/root_test.go @@ -14,8 +14,8 @@ import ( "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/events" "github.com/docker/go-connections/nat" - "github.com/golang/mock/gomock" "github.com/ti-mo/conntrack" + "go.uber.org/mock/gomock" "akvorado/common/daemon" "akvorado/common/helpers" diff --git a/console/clickhouse_test.go b/console/clickhouse_test.go index baa25b20..53ea949b 100644 --- a/console/clickhouse_test.go +++ b/console/clickhouse_test.go @@ -10,7 +10,7 @@ import ( "akvorado/common/helpers" - "github.com/golang/mock/gomock" + "go.uber.org/mock/gomock" ) func TestRefreshFlowsTables(t *testing.T) { diff --git a/console/filter_test.go b/console/filter_test.go index f9cdebd4..07adf3c2 100644 --- a/console/filter_test.go +++ b/console/filter_test.go @@ -8,7 +8,7 @@ import ( "testing" "github.com/gin-gonic/gin" - "github.com/golang/mock/gomock" + "go.uber.org/mock/gomock" "akvorado/common/helpers" "akvorado/common/schema" diff --git a/console/line_test.go b/console/line_test.go index 38679316..26323580 100644 --- a/console/line_test.go +++ b/console/line_test.go @@ -10,7 +10,7 @@ import ( "time" "github.com/gin-gonic/gin" - "github.com/golang/mock/gomock" + "go.uber.org/mock/gomock" "akvorado/common/helpers" "akvorado/common/schema" diff --git a/console/sankey_test.go b/console/sankey_test.go index 6dfb4db7..177cf158 100644 --- a/console/sankey_test.go +++ b/console/sankey_test.go @@ -9,7 +9,7 @@ import ( "time" "github.com/gin-gonic/gin" - "github.com/golang/mock/gomock" + "go.uber.org/mock/gomock" "akvorado/common/helpers" "akvorado/common/schema" diff --git a/console/widgets_test.go b/console/widgets_test.go index afdc3836..48525148 100644 --- a/console/widgets_test.go +++ b/console/widgets_test.go @@ -12,7 +12,7 @@ import ( "github.com/ClickHouse/clickhouse-go/v2/lib/driver" "github.com/gin-gonic/gin" - "github.com/golang/mock/gomock" + "go.uber.org/mock/gomock" "akvorado/common/clickhousedb/mocks" "akvorado/common/helpers" diff --git a/go.mod b/go.mod index 7c0ae449..87827d81 100644 --- a/go.mod +++ b/go.mod @@ -32,6 +32,7 @@ require ( github.com/mattn/go-isatty v0.0.20 github.com/mitchellh/mapstructure v1.5.0 github.com/netsampler/goflow2/v2 v2.1.2-0.20240106090313-c38607daf962 + github.com/opencontainers/image-spec v1.1.0-rc5 github.com/oschwald/maxminddb-golang v1.12.0 github.com/osrg/gobgp/v3 v3.21.0 github.com/prometheus/client_golang v1.18.0 @@ -44,6 +45,7 @@ require ( github.com/xdg-go/scram v1.1.2 github.com/yuin/goldmark v1.6.0 github.com/yuin/goldmark-highlighting v0.0.0-20220208100518-594be1970594 + go.uber.org/mock v0.4.0 golang.org/x/exp v0.0.0-20230510235704-dd950f8aeaea golang.org/x/sys v0.15.0 golang.org/x/text v0.14.0 @@ -113,7 +115,6 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/opencontainers/go-digest v1.0.0 // indirect - github.com/opencontainers/image-spec v1.1.0-rc5 // indirect github.com/paulmach/orb v0.10.0 // indirect github.com/pelletier/go-toml/v2 v2.0.8 // indirect github.com/pierrec/lz4/v4 v4.1.18 // indirect @@ -142,7 +143,7 @@ require ( go.uber.org/zap v1.25.0 // indirect golang.org/x/arch v0.3.0 // indirect golang.org/x/crypto v0.16.0 // indirect - golang.org/x/mod v0.9.0 // indirect + golang.org/x/mod v0.11.0 // indirect golang.org/x/net v0.19.0 // indirect golang.org/x/sync v0.5.0 // indirect golang.org/x/tools v0.7.0 // indirect diff --git a/go.sum b/go.sum index 6a2d5c32..31c77ae9 100644 --- a/go.sum +++ b/go.sum @@ -471,6 +471,8 @@ go.opentelemetry.io/otel/trace v1.19.0 h1:DFVQmlVbfVeOuBRrwdtaehRrWiL1JoVs9CPIQ1 go.opentelemetry.io/otel/trace v1.19.0/go.mod h1:mfaSyvGyEJEI0nyV2I4qhNQnbBOUUmYZpYojqMnX2vo= go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A= go.uber.org/goleak v1.2.1 h1:NBol2c7O1ZokfZ0LEU9K6Whx/KnwvepVetCUhtKja4A= +go.uber.org/mock v0.4.0 h1:VcM4ZOtdbR4f6VXfiOpwpVJDL6lCReaZ6mw31wqh7KU= +go.uber.org/mock v0.4.0/go.mod h1:a6FSlNadKUHUa9IP5Vyt1zh4fC7uAwxMutEAscFbkZc= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= go.uber.org/zap v1.25.0 h1:4Hvk6GtkucQ790dqmj7l1eEnRdKm3k3ZUrUMS2d5+5c= @@ -523,8 +525,8 @@ golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= -golang.org/x/mod v0.9.0 h1:KENHtAZL2y3NLMYZeHY9DW8HW8V+kQyJsY/V9JlKvCs= -golang.org/x/mod v0.9.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/mod v0.11.0 h1:bUO06HqtnRcc/7l71XBe4WcqTZ+3AH1J59zWDDwLKgU= +golang.org/x/mod v0.11.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=