beckermj/vaguerent
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Upgrade bolt to bbolt

Browse Source 
boltdb/bolt is no longer a maintained project. bbolt is the CoreOS
fork that the author of boltdb suggests using as a replacement.
This commit is contained in:
sophia 2021-08-17 11:27:37 -05:00 committed by Paul Hinze
parent 90903417c4
commit ea87b6824d
No known key found for this signature in database
GPG Key ID: B69DEDF2D55501C0
18 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
go.mod
View File

@ -87,6 +87,7 @@ require (
github.com/stretchr/testify v1.6.1
github.com/zclconf/go-cty v1.5.1
github.com/zclconf/go-cty-yaml v1.0.2
go.etcd.io/bbolt v1.3.6 // indirect
golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0
golang.org/x/net v0.0.0-20210520170846-37e1c6afe023 // indirect
golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e

2
go.sum
View File

@ -1302,6 +1302,8 @@ gitlab.com/nyarla/go-crypt v0.0.0-20160106005555-d9a5dc2b789b/go.mod h1:T3BPAOm2
go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
go.etcd.io/bbolt v1.3.3 h1:MUGmc65QhB3pIlaQ5bB4LwqSj6GIonVJXpZiaKNyaKk=
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.mongodb.org/mongo-driver v1.0.3/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM=
go.mongodb.org/mongo-driver v1.1.0/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM=

2
internal/client/server.go
View File

@ -8,10 +8,10 @@ import (
"runtime"
"time"
"github.com/boltdb/bolt"
"github.com/golang/protobuf/ptypes/empty"
"github.com/hashicorp/go-plugin"
"github.com/hashicorp/vagrant-plugin-sdk/helper/paths"
bolt "go.etcd.io/bbolt"
"google.golang.org/grpc"
"github.com/hashicorp/vagrant/internal/protocolversion"

2
internal/server/singleprocess/service.go
View File

@ -1,7 +1,7 @@
package singleprocess
import (
"github.com/boltdb/bolt"
bolt "go.etcd.io/bbolt"
"github.com/hashicorp/go-hclog"

2
internal/server/singleprocess/state/basis.go
View File

@ -3,9 +3,9 @@ package state
import (
"strings"
"github.com/boltdb/bolt"
"github.com/golang/protobuf/proto"
"github.com/hashicorp/go-memdb"
bolt "go.etcd.io/bbolt"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"

2
internal/server/singleprocess/state/config.go
View File

@ -4,10 +4,10 @@ import (
"fmt"
"sort"
"github.com/boltdb/bolt"
"github.com/golang/protobuf/proto"
"github.com/hashicorp/go-memdb"
"github.com/hashicorp/vagrant-plugin-sdk/proto/vagrant_plugin_sdk"
bolt "go.etcd.io/bbolt"
"github.com/hashicorp/vagrant/internal/server/proto/vagrant_server"
serversort "github.com/hashicorp/vagrant/internal/server/sort"

2
internal/server/singleprocess/state/db.go
View File

@ -4,8 +4,8 @@ import (
"strconv"
"strings"
"github.com/boltdb/bolt"
"github.com/golang/protobuf/proto"
bolt "go.etcd.io/bbolt"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
)

3
internal/server/singleprocess/state/generic_operation.go
View File

@ -8,11 +8,12 @@ import (
"sync/atomic"
"time"
"github.com/boltdb/bolt"
"github.com/golang/protobuf/proto"
"github.com/golang/protobuf/ptypes"
"github.com/hashicorp/go-memdb"
"github.com/mitchellh/go-testing-interface"
bolt "go.etcd.io/bbolt"
// "github.com/stretchr/testify/require"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"

2
internal/server/singleprocess/state/hmac.go
View File

@ -5,9 +5,9 @@ import (
"io"
"sync/atomic"
"github.com/boltdb/bolt"
"github.com/golang/protobuf/proto"
"github.com/hashicorp/go-memdb"
bolt "go.etcd.io/bbolt"
"github.com/hashicorp/vagrant/internal/server/proto/vagrant_server"
)

2
internal/server/singleprocess/state/job.go
View File

@ -7,11 +7,11 @@ import (
"sort"
"time"
"github.com/boltdb/bolt"
"github.com/golang/protobuf/proto"
"github.com/golang/protobuf/ptypes"
"github.com/golang/protobuf/ptypes/timestamp"
"github.com/hashicorp/go-memdb"
bolt "go.etcd.io/bbolt"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"

2
internal/server/singleprocess/state/project.go
View File

@ -3,9 +3,9 @@ package state
import (
"strings"
"github.com/boltdb/bolt"
"github.com/golang/protobuf/proto"
"github.com/hashicorp/go-memdb"
bolt "go.etcd.io/bbolt"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"

2
internal/server/singleprocess/state/server_config.go
View File

@ -1,9 +1,9 @@
package state
import (
"github.com/boltdb/bolt"
"github.com/golang/protobuf/proto"
"github.com/hashicorp/go-memdb"
bolt "go.etcd.io/bbolt"
"github.com/hashicorp/vagrant/internal/server/proto/vagrant_server"
)

2
internal/server/singleprocess/state/server_id.go
View File

@ -1,7 +1,7 @@
package state
import (
"github.com/boltdb/bolt"
bolt "go.etcd.io/bbolt"
)
var (

2
internal/server/singleprocess/state/snapshot.go
View File

@ -13,10 +13,10 @@ import (
"strings"
"time"
"github.com/boltdb/bolt"
"github.com/gofrs/flock"
"github.com/hashicorp/go-hclog"
"github.com/natefinch/atomic"
bolt "go.etcd.io/bbolt"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"

2
internal/server/singleprocess/state/state.go
View File

@ -8,10 +8,10 @@ import (
"reflect"
"time"
"github.com/boltdb/bolt"
"github.com/hashicorp/go-hclog"
"github.com/hashicorp/go-memdb"
"github.com/oklog/ulid/v2"
bolt "go.etcd.io/bbolt"
)
// The global variables below can be set by init() functions of other

2
internal/server/singleprocess/state/target.go
View File

@ -1,10 +1,10 @@
package state
import (
"github.com/boltdb/bolt"
"github.com/golang/protobuf/proto"
"github.com/google/uuid"
"github.com/hashicorp/go-memdb"
bolt "go.etcd.io/bbolt"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"

2
internal/server/singleprocess/state/testing.go
View File

@ -5,13 +5,13 @@ import (
"os"
"path/filepath"
"github.com/boltdb/bolt"
"github.com/hashicorp/go-hclog"
"github.com/hashicorp/vagrant-plugin-sdk/proto/vagrant_plugin_sdk"
"github.com/hashicorp/vagrant/internal/server/proto/vagrant_server"
serverptypes "github.com/hashicorp/vagrant/internal/server/ptypes"
"github.com/mitchellh/go-testing-interface"
"github.com/stretchr/testify/require"
bolt "go.etcd.io/bbolt"
)
// TestState returns an initialized State for testing.

2
internal/server/singleprocess/testing.go
View File

@ -6,10 +6,10 @@ import (
"os"
"path/filepath"
"github.com/boltdb/bolt"
"github.com/imdario/mergo"
"github.com/mitchellh/go-testing-interface"
"github.com/stretchr/testify/require"
bolt "go.etcd.io/bbolt"
"github.com/hashicorp/vagrant/internal/server"
pb "github.com/hashicorp/vagrant/internal/server/proto/vagrant_server"