diff --git a/cmd/acra-server/acra-server.go b/cmd/acra-server/acra-server.go index da6d4815d..7d20b1e5b 100644 --- a/cmd/acra-server/acra-server.go +++ b/cmd/acra-server/acra-server.go @@ -70,8 +70,8 @@ import ( pgDialect "github.com/cossacklabs/acra/sqlparser/dialect/postgresql" "github.com/cossacklabs/acra/utils" - "github.com/boltdb/bolt" log "github.com/sirupsen/logrus" + bolt "go.etcd.io/bbolt" ) var restartSignalsChannel chan os.Signal diff --git a/cmd/acra-tokens/tokens/token-storage.go b/cmd/acra-tokens/tokens/token-storage.go index e3965fe5c..df4a58dce 100644 --- a/cmd/acra-tokens/tokens/token-storage.go +++ b/cmd/acra-tokens/tokens/token-storage.go @@ -21,11 +21,11 @@ import ( "flag" "os" - "github.com/boltdb/bolt" "github.com/cossacklabs/acra/cmd" tokenCommon "github.com/cossacklabs/acra/pseudonymization/common" tokenStorage "github.com/cossacklabs/acra/pseudonymization/storage" log "github.com/sirupsen/logrus" + bolt "go.etcd.io/bbolt" ) // CommonTokenStorageParameters is a mix-in of command line parameters for token storage construction. diff --git a/cmd/acra-translator/acra-translator.go b/cmd/acra-translator/acra-translator.go index c6dd259c5..a42db89bc 100644 --- a/cmd/acra-translator/acra-translator.go +++ b/cmd/acra-translator/acra-translator.go @@ -26,7 +26,6 @@ import ( "errors" "flag" "fmt" - "github.com/boltdb/bolt" "github.com/cossacklabs/acra/cmd" "github.com/cossacklabs/acra/cmd/acra-translator/common" _ "github.com/cossacklabs/acra/cmd/acra-translator/docs" @@ -47,6 +46,7 @@ import ( common2 "github.com/cossacklabs/acra/pseudonymization/common" "github.com/cossacklabs/acra/pseudonymization/storage" "github.com/cossacklabs/acra/utils" + bolt "go.etcd.io/bbolt" _ "net/http/pprof" "os" "os/signal" diff --git a/go.mod b/go.mod index e0e3aa9a3..5284f3d0d 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,6 @@ go 1.14 require ( contrib.go.opencensus.io/exporter/jaeger v0.2.1 github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 - github.com/boltdb/bolt v1.3.1 github.com/cossacklabs/themis/gothemis v0.13.1 github.com/gin-gonic/gin v1.7.2 github.com/go-redis/redis/v7 v7.0.1 @@ -21,6 +20,7 @@ require ( github.com/swaggo/files v0.0.0-20190704085106-630677cd5c14 github.com/swaggo/gin-swagger v1.3.0 github.com/swaggo/swag v1.5.1 + go.etcd.io/bbolt v1.3.6 go.opencensus.io v0.22.4 golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97 golang.org/x/net v0.0.0-20211123203042-d83791d6bcd9 diff --git a/go.sum b/go.sum index f89b28ed1..1173a03d4 100644 --- a/go.sum +++ b/go.sum @@ -61,8 +61,6 @@ github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+Ce github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= -github.com/boltdb/bolt v1.3.1 h1:JQmyP4ZBrce+ZQu0dY660FMfatumYDLun9hBCUVIkF4= -github.com/boltdb/bolt v1.3.1/go.mod h1:clJnj/oiGkjum5o1McbSZDSLxVThjynRyGBgiAx27Ps= github.com/casbin/casbin/v2 v2.1.2/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n9yuLkIJQ= github.com/cenkalti/backoff v2.2.1+incompatible h1:tNowT99t7UNflLxfYYSlKYsBpXdEet03Pg2g16Swow4= github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM= @@ -521,6 +519,8 @@ github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtX github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= +go.etcd.io/bbolt v1.3.6 h1:/ecaJf0sk1l4l6V4awd65v2C3ILy7MSj+s/x1ADCIMU= +go.etcd.io/bbolt v1.3.6/go.mod h1:qXsaaIqmgQH0T+OPdb99Bf+PKfBBQVAdyD6TY9G8XM4= go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod h1:dnLIgRNXwCJa5e+c6mIZCrds/GIG4ncV9HhK5PX7jPg= go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= go.opencensus.io v0.20.2/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= @@ -667,6 +667,7 @@ golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200923182605-d9f96fdee20d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= diff --git a/pseudonymization/storage/boltdb.go b/pseudonymization/storage/boltdb.go index 72df1b59d..39b122499 100644 --- a/pseudonymization/storage/boltdb.go +++ b/pseudonymization/storage/boltdb.go @@ -19,8 +19,8 @@ package storage import ( "time" - "github.com/boltdb/bolt" "github.com/cossacklabs/acra/pseudonymization/common" + bolt "go.etcd.io/bbolt" ) type boltdbStorage struct { diff --git a/pseudonymization/storage/boltdb_test.go b/pseudonymization/storage/boltdb_test.go index ca21600c3..d5254093a 100644 --- a/pseudonymization/storage/boltdb_test.go +++ b/pseudonymization/storage/boltdb_test.go @@ -24,7 +24,7 @@ import ( "os" "testing" - "github.com/boltdb/bolt" + bolt "go.etcd.io/bbolt" ) func TestBoltdbStorage(t *testing.T) {