From 3ae7bce3640036ce2d3c5ea2a513bf7e19e5ae2f Mon Sep 17 00:00:00 2001 From: Abdulrahman Elawady Date: Wed, 17 Dec 2025 13:02:42 +0200 Subject: [PATCH] fix: replace deprecated boltdb package with etcd package Signed-off-by: Abdulrahman Elawady --- go.mod | 2 +- go.sum | 4 ++-- pkg/provision/storage/storage.go | 2 +- pkg/provision/storage/storage_test.go | 2 +- pkg/rrd/rrd.go | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 1e7ae8fa..98488add 100644 --- a/go.mod +++ b/go.mod @@ -11,7 +11,6 @@ require ( github.com/alexflint/go-filemutex v1.1.0 github.com/alicebob/miniredis/v2 v2.35.0 github.com/blang/semver v3.5.1+incompatible - github.com/boltdb/bolt v1.3.1 github.com/cenkalti/backoff v2.2.1+incompatible github.com/cenkalti/backoff/v3 v3.2.2 github.com/centrifuge/go-substrate-rpc-client/v4 v4.0.12 @@ -56,6 +55,7 @@ require ( github.com/vishvananda/netns v0.0.0-20210104183010-2eb08e3e575f github.com/whs/nacl-sealed-box v0.0.0-20180930164530-92b9ba845d8d github.com/yggdrasil-network/yggdrasil-go v0.4.0 + go.etcd.io/bbolt v1.3.5 go.uber.org/mock v0.5.2 golang.org/x/crypto v0.37.0 golang.org/x/sys v0.32.0 diff --git a/go.sum b/go.sum index da1cf32e..17268dc2 100644 --- a/go.sum +++ b/go.sum @@ -32,8 +32,6 @@ github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24 github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= github.com/blang/semver v3.5.1+incompatible h1:cQNTCjp13qL8KC3Nbxr/y2Bqb63oX6wdnnjpJbkM4JQ= github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= -github.com/boltdb/bolt v1.3.1 h1:JQmyP4ZBrce+ZQu0dY660FMfatumYDLun9hBCUVIkF4= -github.com/boltdb/bolt v1.3.1/go.mod h1:clJnj/oiGkjum5o1McbSZDSLxVThjynRyGBgiAx27Ps= github.com/btcsuite/btcd v0.22.0-beta h1:LTDpDKUM5EeOFBPM8IXpinEcmZ6FWfNZbE3lfrfdnWo= github.com/btcsuite/btcd/btcec/v2 v2.2.0 h1:fzn1qaOt32TuLjFlkzYSsBC35Q3KUjT1SwPxiMSCF5k= github.com/btcsuite/btcd/btcec/v2 v2.2.0/go.mod h1:U7MHm051Al6XmscBQ0BoNydpOTsFAn707034b5nY8zU= @@ -633,6 +631,8 @@ github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q= go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= +go.etcd.io/bbolt v1.3.5 h1:XAzx9gjCb0Rxj7EoqcClPD1d5ZBxZJk0jbuoPHenBt0= +go.etcd.io/bbolt v1.3.5/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= diff --git a/pkg/provision/storage/storage.go b/pkg/provision/storage/storage.go index e320688a..528ec705 100644 --- a/pkg/provision/storage/storage.go +++ b/pkg/provision/storage/storage.go @@ -5,11 +5,11 @@ import ( "encoding/json" "fmt" - "github.com/boltdb/bolt" "github.com/pkg/errors" "github.com/rs/zerolog/log" "github.com/threefoldtech/zosbase/pkg/gridtypes" "github.com/threefoldtech/zosbase/pkg/provision" + bolt "go.etcd.io/bbolt" ) var ( diff --git a/pkg/provision/storage/storage_test.go b/pkg/provision/storage/storage_test.go index ca2eea37..1180483e 100644 --- a/pkg/provision/storage/storage_test.go +++ b/pkg/provision/storage/storage_test.go @@ -10,10 +10,10 @@ import ( "sort" "testing" - "github.com/boltdb/bolt" "github.com/stretchr/testify/require" "github.com/threefoldtech/zosbase/pkg/gridtypes" "github.com/threefoldtech/zosbase/pkg/provision" + bolt "go.etcd.io/bbolt" ) const ( diff --git a/pkg/rrd/rrd.go b/pkg/rrd/rrd.go index 797e3804..a38490ff 100644 --- a/pkg/rrd/rrd.go +++ b/pkg/rrd/rrd.go @@ -7,8 +7,8 @@ import ( "math" "time" - "github.com/boltdb/bolt" "github.com/pkg/errors" + bolt "go.etcd.io/bbolt" ) // RRD is a round robin database of fixed size which is specified on creation