Skip to content

Commit

Permalink
Run goimports (#8251)
Browse files Browse the repository at this point in the history
  • Loading branch information
Jim Kalafut authored Jan 28, 2020
1 parent 443404e commit 060775d
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 10 deletions.
2 changes: 1 addition & 1 deletion command/server/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package server
import (
"errors"
"fmt"
"github.com/hashicorp/vault/sdk/helper/jsonutil"
"io"
"io/ioutil"
"os"
Expand All @@ -16,6 +15,7 @@ import (
"github.com/hashicorp/go-multierror"
"github.com/hashicorp/hcl"
"github.com/hashicorp/hcl/hcl/ast"
"github.com/hashicorp/vault/sdk/helper/jsonutil"
"github.com/hashicorp/vault/sdk/helper/parseutil"
)

Expand Down
2 changes: 1 addition & 1 deletion http/sys_raft.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ import (
"context"
"crypto/tls"
"errors"
"github.com/hashicorp/vault/physical/raft"
"io"
"net/http"

"github.com/hashicorp/vault/physical/raft"
"github.com/hashicorp/vault/sdk/helper/tlsutil"
"github.com/hashicorp/vault/vault"
)
Expand Down
7 changes: 3 additions & 4 deletions physical/raft/raft.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ import (
"crypto/tls"
"errors"
"fmt"
"github.com/hashicorp/vault/sdk/helper/jsonutil"
"github.com/hashicorp/vault/sdk/helper/tlsutil"
"io"
"io/ioutil"
"os"
Expand All @@ -26,11 +24,12 @@ import (
snapshot "github.com/hashicorp/raft-snapshot"
raftboltdb "github.com/hashicorp/vault/physical/raft/logstore"
"github.com/hashicorp/vault/sdk/helper/consts"
"github.com/hashicorp/vault/sdk/helper/jsonutil"
"github.com/hashicorp/vault/sdk/helper/tlsutil"
"github.com/hashicorp/vault/sdk/logical"
"github.com/hashicorp/vault/sdk/physical"
"github.com/hashicorp/vault/vault/cluster"
"github.com/hashicorp/vault/vault/seal"

"github.com/hashicorp/vault/sdk/physical"
)

// EnvVaultRaftNodeID is used to fetch the Raft node ID from the environment.
Expand Down
2 changes: 1 addition & 1 deletion plugins/database/mongodb/connection_producer.go
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ func (c *mongoDBConnectionProducer) Close() error {
defer c.Unlock()

if c.client != nil {
ctx, cancel := context.WithTimeout(context.Background(), 1 * time.Minute)
ctx, cancel := context.WithTimeout(context.Background(), 1*time.Minute)
defer cancel()
if err := c.client.Disconnect(ctx); err != nil {
return err
Expand Down
2 changes: 1 addition & 1 deletion vault/external_tests/raft/raft_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import (
"context"
"crypto/md5"
"fmt"
"github.com/hashicorp/vault/helper/namespace"
"io/ioutil"
"net/http"
"strings"
Expand All @@ -16,6 +15,7 @@ import (
"github.com/hashicorp/go-cleanhttp"
uuid "github.com/hashicorp/go-uuid"
"github.com/hashicorp/vault/api"
"github.com/hashicorp/vault/helper/namespace"
"github.com/hashicorp/vault/helper/testhelpers"
"github.com/hashicorp/vault/helper/testhelpers/teststorage"
vaulthttp "github.com/hashicorp/vault/http"
Expand Down
3 changes: 1 addition & 2 deletions vault/raft.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import (
"encoding/base64"
"errors"
"fmt"
"github.com/hashicorp/vault/sdk/helper/tlsutil"
"math"
"net/http"
"net/url"
Expand All @@ -16,13 +15,13 @@ import (

"github.com/golang/protobuf/proto"
"github.com/hashicorp/errwrap"

cleanhttp "github.com/hashicorp/go-cleanhttp"
wrapping "github.com/hashicorp/go-kms-wrapping"
uuid "github.com/hashicorp/go-uuid"
"github.com/hashicorp/vault/api"
"github.com/hashicorp/vault/physical/raft"
"github.com/hashicorp/vault/sdk/helper/jsonutil"
"github.com/hashicorp/vault/sdk/helper/tlsutil"
"github.com/hashicorp/vault/sdk/logical"
"github.com/hashicorp/vault/vault/seal"
"github.com/mitchellh/mapstructure"
Expand Down

0 comments on commit 060775d

Please sign in to comment.