Skip to content
This repository has been archived by the owner on Jan 8, 2024. It is now read-only.

Upgrade bolt to bbolt #1631

Merged
merged 4 commits into from
Jun 9, 2021
Merged

Upgrade bolt to bbolt #1631

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
28f5228
Upgrade bolt to bbolt
izaaklauer Jun 9, 2021
aff9cf4
Changelog
izaaklauer Jun 9, 2021
3047e41
go fmt
izaaklauer Jun 9, 2021
f1c4dde
Revert "Changelog"
izaaklauer Jun 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Expand Down Expand Up @@ -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=
Expand Down
2 changes: 1 addition & 1 deletion internal/cli/server_run.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@ import (
"strings"
"time"

"github.com/boltdb/bolt"
"github.com/hashicorp/go-hclog"
hznhub "github.com/hashicorp/horizon/pkg/hub"
hzntest "github.com/hashicorp/horizon/pkg/testutils/central"
wphzn "github.com/hashicorp/waypoint-hzn/pkg/server"
"github.com/mitchellh/go-testing-interface"
"github.com/posener/complete"
"github.com/stretchr/testify/require"
bolt "go.etcd.io/bbolt"

"github.com/hashicorp/waypoint-plugin-sdk/terminal"
"github.com/hashicorp/waypoint/internal/pkg/flag"
Expand Down
2 changes: 1 addition & 1 deletion internal/client/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"path/filepath"
"time"

"github.com/boltdb/bolt"
"github.com/golang/protobuf/ptypes/empty"
bolt "go.etcd.io/bbolt"
"google.golang.org/grpc"

"github.com/hashicorp/waypoint/internal/protocolversion"
Expand Down
2 changes: 1 addition & 1 deletion internal/server/singleprocess/service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"context"
"sync"

"github.com/boltdb/bolt"
"github.com/hashicorp/go-hclog"
wphznpb "github.com/hashicorp/waypoint-hzn/pkg/pb"
bolt "go.etcd.io/bbolt"

"github.com/hashicorp/waypoint/internal/server"
pb "github.com/hashicorp/waypoint/internal/server/gen"
Expand Down
2 changes: 1 addition & 1 deletion internal/server/singleprocess/state/app_operation.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion internal/server/singleprocess/state/application.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"

Expand Down
2 changes: 1 addition & 1 deletion internal/server/singleprocess/state/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion internal/server/singleprocess/state/config_source.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion internal/server/singleprocess/state/db.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion internal/server/singleprocess/state/hmac.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion internal/server/singleprocess/state/job.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion internal/server/singleprocess/state/project.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion internal/server/singleprocess/state/server_config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion internal/server/singleprocess/state/server_id.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package state

import (
"github.com/boltdb/bolt"
bolt "go.etcd.io/bbolt"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion internal/server/singleprocess/state/server_urltoken.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package state

import (
"github.com/boltdb/bolt"
bolt "go.etcd.io/bbolt"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion internal/server/singleprocess/state/snapshot.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion internal/server/singleprocess/state/state.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import (
"reflect"
"sync"

"github.com/boltdb/bolt"
"github.com/hashicorp/go-hclog"
"github.com/hashicorp/go-memdb"
bolt "go.etcd.io/bbolt"
)

// The global variables below can be set by init() functions of other
Expand Down
2 changes: 1 addition & 1 deletion internal/server/singleprocess/state/testing.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ import (
"os"
"path/filepath"

"github.com/boltdb/bolt"
"github.com/hashicorp/go-hclog"
"github.com/mitchellh/go-testing-interface"
"github.com/stretchr/testify/require"
bolt "go.etcd.io/bbolt"
)

// TestState returns an initialized State for testing.
Expand Down
2 changes: 1 addition & 1 deletion internal/server/singleprocess/state/workspace.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ import (
"strings"
"time"

"github.com/boltdb/bolt"
"github.com/golang/protobuf/proto"
"github.com/golang/protobuf/ptypes"
"github.com/hashicorp/go-memdb"
bolt "go.etcd.io/bbolt"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"

Expand Down
2 changes: 1 addition & 1 deletion internal/server/singleprocess/testing.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import (
"os"
"path/filepath"

"github.com/boltdb/bolt"
"github.com/hashicorp/go-hclog"
hznhub "github.com/hashicorp/horizon/pkg/hub"
hznpb "github.com/hashicorp/horizon/pkg/pb"
Expand All @@ -19,6 +18,7 @@ import (
"github.com/imdario/mergo"
"github.com/mitchellh/go-testing-interface"
"github.com/stretchr/testify/require"
bolt "go.etcd.io/bbolt"

"github.com/hashicorp/waypoint/internal/server"
pb "github.com/hashicorp/waypoint/internal/server/gen"
Expand Down