diff --git a/go.mod b/go.mod index c63bef21abf..1691f5b7514 100644 --- a/go.mod +++ b/go.mod @@ -12,7 +12,6 @@ require ( github.com/armon/circbuf v0.0.0-20190214190532-5111143e8da2 github.com/aws/aws-sdk-go v1.36.31 github.com/bmatcuk/doublestar v1.1.5 - github.com/boltdb/bolt v1.3.1 github.com/buildpacks/pack v0.18.1 github.com/cenkalti/backoff/v4 v4.0.2 github.com/certifi/gocertifi v0.0.0-20200922220541-2c3bb06c6054 @@ -98,6 +97,7 @@ require ( github.com/vektra/mockery v1.1.2 github.com/zclconf/go-cty v1.8.2 github.com/zclconf/go-cty-yaml v1.0.2 + go.etcd.io/bbolt v1.3.3 go.uber.org/goleak v1.1.10 golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897 golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d diff --git a/go.sum b/go.sum index d5be47c461e..ba2cfe2f0e4 100644 --- a/go.sum +++ b/go.sum @@ -205,8 +205,6 @@ github.com/blang/semver v3.5.0+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnweb github.com/bmatcuk/doublestar v1.1.5 h1:2bNwBOmhyFEFcoB3tGvTD5xanq+4kyOZlB8wFYbMjkk= github.com/bmatcuk/doublestar v1.1.5/go.mod h1:wiQtGV+rzVYxB7WIlirSN++5HPtPlXEo9MEoZQC/PmE= github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod h1:Ekp36dRnpXw/yCqJaO+ZrUyxD+3VXMFFr56k5XYrpB4= -github.com/boltdb/bolt v1.3.1 h1:JQmyP4ZBrce+ZQu0dY660FMfatumYDLun9hBCUVIkF4= -github.com/boltdb/bolt v1.3.1/go.mod h1:clJnj/oiGkjum5o1McbSZDSLxVThjynRyGBgiAx27Ps= github.com/briandowns/spinner v1.11.1 h1:OixPqDEcX3juo5AjQZAnFPbeUA0jvkp2qzB5gOZJ/L0= github.com/briandowns/spinner v1.11.1/go.mod h1:QOuQk7x+EaDASo80FEXwlwiA+j/PPIcX3FScO+3/ZPQ= github.com/buildpacks/imgutil v0.0.0-20201211223552-8581300fe2b2/go.mod h1:NC93OGDehA2ksqgTzugeQcPqmTpilMPYRO+XaFsDyts= @@ -1202,6 +1200,7 @@ github.com/zclconf/go-cty-yaml v1.0.2/go.mod h1:IP3Ylp0wQpYm50IHK8OZWKMu6sPJIUgK github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q= gitlab.com/nyarla/go-crypt v0.0.0-20160106005555-d9a5dc2b789b/go.mod h1:T3BPAOm2cqquPa0MKWeNkmOM5RQsRhkrwMWonFMN7fE= 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/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod h1:dnLIgRNXwCJa5e+c6mIZCrds/GIG4ncV9HhK5PX7jPg= go.mongodb.org/mongo-driver v1.1.0/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM= diff --git a/internal/cli/server_run.go b/internal/cli/server_run.go index da40fd96390..c54b2ae4efc 100644 --- a/internal/cli/server_run.go +++ b/internal/cli/server_run.go @@ -17,7 +17,7 @@ import ( "strings" "time" - "github.com/boltdb/bolt" + bolt "go.etcd.io/bbolt" "github.com/hashicorp/go-hclog" hznhub "github.com/hashicorp/horizon/pkg/hub" hzntest "github.com/hashicorp/horizon/pkg/testutils/central" diff --git a/internal/client/server.go b/internal/client/server.go index 7f9fbed49f2..b38ca9a58a1 100644 --- a/internal/client/server.go +++ b/internal/client/server.go @@ -7,7 +7,7 @@ import ( "path/filepath" "time" - "github.com/boltdb/bolt" + bolt "go.etcd.io/bbolt" "github.com/golang/protobuf/ptypes/empty" "google.golang.org/grpc" diff --git a/internal/server/singleprocess/service.go b/internal/server/singleprocess/service.go index 95a2f738dca..819220b1dca 100644 --- a/internal/server/singleprocess/service.go +++ b/internal/server/singleprocess/service.go @@ -4,7 +4,7 @@ import ( "context" "sync" - "github.com/boltdb/bolt" + bolt "go.etcd.io/bbolt" "github.com/hashicorp/go-hclog" wphznpb "github.com/hashicorp/waypoint-hzn/pkg/pb" diff --git a/internal/server/singleprocess/state/app_operation.go b/internal/server/singleprocess/state/app_operation.go index 71a881bf851..7bb69fcbcca 100644 --- a/internal/server/singleprocess/state/app_operation.go +++ b/internal/server/singleprocess/state/app_operation.go @@ -8,12 +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" "github.com/stretchr/testify/require" + bolt "go.etcd.io/bbolt" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/internal/server/singleprocess/state/application.go b/internal/server/singleprocess/state/application.go index aa2ecd1da48..a621c5a87a1 100644 --- a/internal/server/singleprocess/state/application.go +++ b/internal/server/singleprocess/state/application.go @@ -1,8 +1,8 @@ package state import ( - "github.com/boltdb/bolt" "github.com/hashicorp/go-memdb" + bolt "go.etcd.io/bbolt" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/internal/server/singleprocess/state/config.go b/internal/server/singleprocess/state/config.go index e8c687ffe12..b9274c5e1a0 100644 --- a/internal/server/singleprocess/state/config.go +++ b/internal/server/singleprocess/state/config.go @@ -4,9 +4,9 @@ import ( "fmt" "sort" - "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" diff --git a/internal/server/singleprocess/state/config_source.go b/internal/server/singleprocess/state/config_source.go index f6bae41aead..1df058a11d8 100644 --- a/internal/server/singleprocess/state/config_source.go +++ b/internal/server/singleprocess/state/config_source.go @@ -3,10 +3,10 @@ package state import ( "strings" - "github.com/boltdb/bolt" "github.com/golang/protobuf/proto" "github.com/hashicorp/go-memdb" "github.com/mitchellh/hashstructure/v2" + bolt "go.etcd.io/bbolt" pb "github.com/hashicorp/waypoint/internal/server/gen" ) diff --git a/internal/server/singleprocess/state/db.go b/internal/server/singleprocess/state/db.go index 45ffc2fd40f..4a8af902ecc 100644 --- a/internal/server/singleprocess/state/db.go +++ b/internal/server/singleprocess/state/db.go @@ -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" ) diff --git a/internal/server/singleprocess/state/hmac.go b/internal/server/singleprocess/state/hmac.go index 202dc8eac55..605cdcf0a8c 100644 --- a/internal/server/singleprocess/state/hmac.go +++ b/internal/server/singleprocess/state/hmac.go @@ -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" pb "github.com/hashicorp/waypoint/internal/server/gen" ) diff --git a/internal/server/singleprocess/state/job.go b/internal/server/singleprocess/state/job.go index 68a376ac628..57f2c7a82a2 100644 --- a/internal/server/singleprocess/state/job.go +++ b/internal/server/singleprocess/state/job.go @@ -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" diff --git a/internal/server/singleprocess/state/project.go b/internal/server/singleprocess/state/project.go index 3b918442542..f77e207c785 100644 --- a/internal/server/singleprocess/state/project.go +++ b/internal/server/singleprocess/state/project.go @@ -4,9 +4,9 @@ import ( "strings" "time" - "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" diff --git a/internal/server/singleprocess/state/server_config.go b/internal/server/singleprocess/state/server_config.go index bd612928f6c..36ae3e87264 100644 --- a/internal/server/singleprocess/state/server_config.go +++ b/internal/server/singleprocess/state/server_config.go @@ -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" pb "github.com/hashicorp/waypoint/internal/server/gen" ) diff --git a/internal/server/singleprocess/state/server_id.go b/internal/server/singleprocess/state/server_id.go index d4c54451acb..232bd0aefa0 100644 --- a/internal/server/singleprocess/state/server_id.go +++ b/internal/server/singleprocess/state/server_id.go @@ -1,7 +1,7 @@ package state import ( - "github.com/boltdb/bolt" + bolt "go.etcd.io/bbolt" ) var ( diff --git a/internal/server/singleprocess/state/server_urltoken.go b/internal/server/singleprocess/state/server_urltoken.go index a71714a3977..1b28a4f46b4 100644 --- a/internal/server/singleprocess/state/server_urltoken.go +++ b/internal/server/singleprocess/state/server_urltoken.go @@ -1,7 +1,7 @@ package state import ( - "github.com/boltdb/bolt" + bolt "go.etcd.io/bbolt" ) var ( diff --git a/internal/server/singleprocess/state/snapshot.go b/internal/server/singleprocess/state/snapshot.go index c31dacc7830..b8cb376b2fc 100644 --- a/internal/server/singleprocess/state/snapshot.go +++ b/internal/server/singleprocess/state/snapshot.go @@ -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" diff --git a/internal/server/singleprocess/state/state.go b/internal/server/singleprocess/state/state.go index 3b750556f9d..e33b6b379a4 100644 --- a/internal/server/singleprocess/state/state.go +++ b/internal/server/singleprocess/state/state.go @@ -7,7 +7,7 @@ import ( "reflect" "sync" - "github.com/boltdb/bolt" + bolt "go.etcd.io/bbolt" "github.com/hashicorp/go-hclog" "github.com/hashicorp/go-memdb" ) diff --git a/internal/server/singleprocess/state/testing.go b/internal/server/singleprocess/state/testing.go index ef2eb21d424..f942ab1b2da 100644 --- a/internal/server/singleprocess/state/testing.go +++ b/internal/server/singleprocess/state/testing.go @@ -5,7 +5,7 @@ import ( "os" "path/filepath" - "github.com/boltdb/bolt" + bolt "go.etcd.io/bbolt" "github.com/hashicorp/go-hclog" "github.com/mitchellh/go-testing-interface" "github.com/stretchr/testify/require" diff --git a/internal/server/singleprocess/state/workspace.go b/internal/server/singleprocess/state/workspace.go index cd11274833f..f8cb676379f 100644 --- a/internal/server/singleprocess/state/workspace.go +++ b/internal/server/singleprocess/state/workspace.go @@ -4,7 +4,7 @@ import ( "strings" "time" - "github.com/boltdb/bolt" + bolt "go.etcd.io/bbolt" "github.com/golang/protobuf/proto" "github.com/golang/protobuf/ptypes" "github.com/hashicorp/go-memdb" diff --git a/internal/server/singleprocess/testing.go b/internal/server/singleprocess/testing.go index 14e5b8452b4..ca6349ae54e 100644 --- a/internal/server/singleprocess/testing.go +++ b/internal/server/singleprocess/testing.go @@ -8,7 +8,7 @@ import ( "os" "path/filepath" - "github.com/boltdb/bolt" + bolt "go.etcd.io/bbolt" "github.com/hashicorp/go-hclog" hznhub "github.com/hashicorp/horizon/pkg/hub" hznpb "github.com/hashicorp/horizon/pkg/pb"