From df9b11d5476ebf79ed952f8cb742ebccbdcf606c Mon Sep 17 00:00:00 2001 From: Erik Grinaker Date: Mon, 30 Mar 2020 08:24:55 +0200 Subject: [PATCH] boltdb: use correct import path (#81) --- CHANGELOG.md | 4 ++++ boltdb.go | 2 +- boltdb_batch.go | 2 +- boltdb_iterator.go | 2 +- go.mod | 3 +-- go.sum | 5 ----- 6 files changed, 8 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bd3e0d7b0..f0ef1ceb9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ ## Unreleased +### Bug Fixes + +- [boltdb] Use correct import path go.etcd.io/bbolt + ## 0.5.0 **2020-03-11** diff --git a/boltdb.go b/boltdb.go index 8360a6842..4fa89fb8f 100644 --- a/boltdb.go +++ b/boltdb.go @@ -7,8 +7,8 @@ import ( "os" "path/filepath" - "github.com/etcd-io/bbolt" "github.com/pkg/errors" + "go.etcd.io/bbolt" ) var ( diff --git a/boltdb_batch.go b/boltdb_batch.go index f3eaf9ce3..ae0f40b35 100644 --- a/boltdb_batch.go +++ b/boltdb_batch.go @@ -2,7 +2,7 @@ package db -import "github.com/etcd-io/bbolt" +import "go.etcd.io/bbolt" // boltDBBatch stores operations internally and dumps them to BoltDB on Write(). type boltDBBatch struct { diff --git a/boltdb_iterator.go b/boltdb_iterator.go index 013510959..95adc871f 100644 --- a/boltdb_iterator.go +++ b/boltdb_iterator.go @@ -5,7 +5,7 @@ package db import ( "bytes" - "github.com/etcd-io/bbolt" + "go.etcd.io/bbolt" ) // boltDBIterator allows you to iterate on range of keys/values given some diff --git a/go.mod b/go.mod index b99de3738..e7cb4d758 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,6 @@ go 1.12 require ( github.com/davecgh/go-spew v1.1.1 // indirect - github.com/etcd-io/bbolt v1.3.3 github.com/facebookgo/ensure v0.0.0-20160127193407-b4ab57deab51 // indirect github.com/facebookgo/stack v0.0.0-20160209184415-751773369052 // indirect github.com/facebookgo/subset v0.0.0-20150612182917-8dac2c3c4870 // indirect @@ -15,7 +14,7 @@ require ( github.com/stretchr/testify v1.5.1 github.com/syndtr/goleveldb v1.0.1-0.20190923125748-758128399b1d github.com/tecbot/gorocksdb v0.0.0-20191217155057-f0fad39f321c - go.etcd.io/bbolt v1.3.3 // indirect + go.etcd.io/bbolt v1.3.3 golang.org/x/net v0.0.0-20190628185345-da137c7871d7 // indirect google.golang.org/grpc v1.28.0 ) diff --git a/go.sum b/go.sum index 28783fcd1..e5e27c2ad 100644 --- a/go.sum +++ b/go.sum @@ -8,11 +8,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= -github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/etcd-io/bbolt v1.3.3 h1:gSJmxrs37LgTqR/oyJBWok6k6SvXEUerFTbltIhXkBM= -github.com/etcd-io/bbolt v1.3.3/go.mod h1:ZF2nL25h33cCyBtcyWeZ2/I3HQOfTP+0PIEvHjkjCrw= github.com/facebookgo/ensure v0.0.0-20160127193407-b4ab57deab51 h1:0JZ+dUmQeA8IIVUMzysrX4/AKuQwWhV2dYQuPZdvdSQ= github.com/facebookgo/ensure v0.0.0-20160127193407-b4ab57deab51/go.mod h1:Yg+htXGokKKdzcwhuNDwVvN+uBxDGXJ7G/VN1d8fa64= github.com/facebookgo/stack v0.0.0-20160209184415-751773369052 h1:JWuenKqqX8nojtoVVWjGfOF9635RETekkoH6Cc9SX0A= @@ -99,8 +96,6 @@ google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= -google.golang.org/grpc v1.27.1 h1:zvIju4sqAGvwKspUQOhwnpcqSbzi7/H6QomNNjTL4sk= -google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.28.0 h1:bO/TA4OxCOummhSf10siHuG7vJOiwh7SpRpFZDkOgl4= google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=