diff --git a/go.sum b/go.sum index 940c395b6..30e60a87a 100644 --- a/go.sum +++ b/go.sum @@ -1299,8 +1299,6 @@ github.com/muesli/cancelreader v0.2.2 h1:3I4Kt4BQjOR54NavqnDogx/MIoWBFa0StPA8ELU github.com/muesli/cancelreader v0.2.2/go.mod h1:3XuTXfFS2VjM+HTLZY9Ak0l6eUKfijIfMUZ4EgX0QYo= github.com/muesli/termenv v0.16.0 h1:S5AlUN9dENB57rsbnkPyfdGuWIlkmzJjbFf0Tf5FWUc= github.com/muesli/termenv v0.16.0/go.mod h1:ZRfOIKPFDYQoDFF4Olj7/QJbW60Ol/kL1pU3VfY/Cnk= -github.com/mulgadc/predastore v1.10.0 h1:kMBI31HTYV0fxXYY+XiLgxO6rJd4WPPDXswDgJaK8HY= -github.com/mulgadc/predastore v1.10.0/go.mod h1:j2DOdAOj/c42MRI6SkZrfh9KFbIyDDJLmf63SJ2yizw= github.com/mulgadc/predastore v1.11.0-dev h1:GMkwHWEANG9Oazf5Fxk8IATDNlNLcbJ15/tJ0JrdIeE= github.com/mulgadc/predastore v1.11.0-dev/go.mod h1:j2DOdAOj/c42MRI6SkZrfh9KFbIyDDJLmf63SJ2yizw= github.com/mulgadc/viperblock v1.10.0 h1:a8KKJ/qgeYsInlnOJ5S/o+HCfqTIklgzz/FpzdeXAEY= diff --git a/spinifex/network/ovn/ovntest/server.go b/spinifex/network/ovn/ovntest/server.go index 354ffce1f..67faf9350 100644 --- a/spinifex/network/ovn/ovntest/server.go +++ b/spinifex/network/ovn/ovntest/server.go @@ -15,7 +15,6 @@ import ( "testing" "time" - "github.com/go-logr/logr" "github.com/ovn-kubernetes/libovsdb/database/inmemory" "github.com/ovn-kubernetes/libovsdb/model" "github.com/ovn-kubernetes/libovsdb/ovsdb" @@ -62,10 +61,11 @@ func StartNB(t testing.TB) *NB { t.Fatalf("model.NewDatabaseModel: %v", errs) } - logger := logr.Discard() - db := inmemory.NewDatabase(map[string]model.ClientDBModel{"OVN_Northbound": clientModel}, &logger) + // nil logger: libovsdb falls back to logr.Discard internally, and dropping + // the explicit logr.Discard() keeps go-logr out of our direct imports. + db := inmemory.NewDatabase(map[string]model.ClientDBModel{"OVN_Northbound": clientModel}, nil) - srv, err := server.NewOvsdbServer(db, &logger, dbModel) + srv, err := server.NewOvsdbServer(db, nil, dbModel) if err != nil { t.Fatalf("server.NewOvsdbServer: %v", err) }