luxolus
/
open-vault
2
0
Fork 0
Code Issues 1 Pull Requests Releases Activity

Run goimports (#8251)

This commit is contained in:
Jim Kalafut 2020-01-27 21:11:00 -08:00 committed by GitHub
parent 0ebf3c3e40
commit f17fc4e5c1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
command/server/config.go
View File

@ -3,7 +3,6 @@ package server
import ( import (
"errors" "errors"
"fmt" "fmt"
"github.com/hashicorp/vault/sdk/helper/jsonutil"
"io" "io"
"io/ioutil" "io/ioutil"
"os" "os"
@ -16,6 +15,7 @@ import (
"github.com/hashicorp/go-multierror" "github.com/hashicorp/go-multierror"
"github.com/hashicorp/hcl" "github.com/hashicorp/hcl"
"github.com/hashicorp/hcl/hcl/ast" "github.com/hashicorp/hcl/hcl/ast"
"github.com/hashicorp/vault/sdk/helper/jsonutil"
"github.com/hashicorp/vault/sdk/helper/parseutil" "github.com/hashicorp/vault/sdk/helper/parseutil"
) )

2
http/sys_raft.go
View File

@ -4,10 +4,10 @@ import (
"context" "context"
"crypto/tls" "crypto/tls"
"errors" "errors"
"github.com/hashicorp/vault/physical/raft"
"io" "io"
"net/http" "net/http"
"github.com/hashicorp/vault/physical/raft"
"github.com/hashicorp/vault/sdk/helper/tlsutil" "github.com/hashicorp/vault/sdk/helper/tlsutil"
"github.com/hashicorp/vault/vault" "github.com/hashicorp/vault/vault"
) )

7
physical/raft/raft.go
View File

@ -5,8 +5,6 @@ import (
"crypto/tls" "crypto/tls"
"errors" "errors"
"fmt" "fmt"
"github.com/hashicorp/vault/sdk/helper/jsonutil"
"github.com/hashicorp/vault/sdk/helper/tlsutil"
"io" "io"
"io/ioutil" "io/ioutil"
"os" "os"
@ -26,11 +24,12 @@ import (
snapshot "github.com/hashicorp/raft-snapshot" snapshot "github.com/hashicorp/raft-snapshot"
raftboltdb "github.com/hashicorp/vault/physical/raft/logstore" raftboltdb "github.com/hashicorp/vault/physical/raft/logstore"
"github.com/hashicorp/vault/sdk/helper/consts" "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/logical"
"github.com/hashicorp/vault/sdk/physical"
"github.com/hashicorp/vault/vault/cluster" "github.com/hashicorp/vault/vault/cluster"
"github.com/hashicorp/vault/vault/seal" "github.com/hashicorp/vault/vault/seal"
"github.com/hashicorp/vault/sdk/physical"
) )
// EnvVaultRaftNodeID is used to fetch the Raft node ID from the environment. // EnvVaultRaftNodeID is used to fetch the Raft node ID from the environment.

2
plugins/database/mongodb/connection_producer.go
View File

@ -170,7 +170,7 @@ func (c *mongoDBConnectionProducer) Close() error {
defer c.Unlock() defer c.Unlock()
if c.client != nil { if c.client != nil {
ctx, cancel := context.WithTimeout(context.Background(), 1 * time.Minute) ctx, cancel := context.WithTimeout(context.Background(), 1*time.Minute)
defer cancel() defer cancel()
if err := c.client.Disconnect(ctx); err != nil { if err := c.client.Disconnect(ctx); err != nil {
return err return err

2
vault/external_tests/raft/raft_test.go
View File

@ -5,7 +5,6 @@ import (
"context" "context"
"crypto/md5" "crypto/md5"
"fmt" "fmt"
"github.com/hashicorp/vault/helper/namespace"
"io/ioutil" "io/ioutil"
"net/http" "net/http"
"strings" "strings"
@ -16,6 +15,7 @@ import (
"github.com/hashicorp/go-cleanhttp" "github.com/hashicorp/go-cleanhttp"
uuid "github.com/hashicorp/go-uuid" uuid "github.com/hashicorp/go-uuid"
"github.com/hashicorp/vault/api" "github.com/hashicorp/vault/api"
"github.com/hashicorp/vault/helper/namespace"
"github.com/hashicorp/vault/helper/testhelpers" "github.com/hashicorp/vault/helper/testhelpers"
"github.com/hashicorp/vault/helper/testhelpers/teststorage" "github.com/hashicorp/vault/helper/testhelpers/teststorage"
vaulthttp "github.com/hashicorp/vault/http" vaulthttp "github.com/hashicorp/vault/http"

3
vault/raft.go
View File

@ -5,7 +5,6 @@ import (
"encoding/base64" "encoding/base64"
"errors" "errors"
"fmt" "fmt"
"github.com/hashicorp/vault/sdk/helper/tlsutil"
"math" "math"
"net/http" "net/http"
"net/url" "net/url"
@ -16,13 +15,13 @@ import (
"github.com/golang/protobuf/proto" "github.com/golang/protobuf/proto"
"github.com/hashicorp/errwrap" "github.com/hashicorp/errwrap"
cleanhttp "github.com/hashicorp/go-cleanhttp" cleanhttp "github.com/hashicorp/go-cleanhttp"
wrapping "github.com/hashicorp/go-kms-wrapping" wrapping "github.com/hashicorp/go-kms-wrapping"
uuid "github.com/hashicorp/go-uuid" uuid "github.com/hashicorp/go-uuid"
"github.com/hashicorp/vault/api" "github.com/hashicorp/vault/api"
"github.com/hashicorp/vault/physical/raft" "github.com/hashicorp/vault/physical/raft"
"github.com/hashicorp/vault/sdk/helper/jsonutil" "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/logical"
"github.com/hashicorp/vault/vault/seal" "github.com/hashicorp/vault/vault/seal"
"github.com/mitchellh/mapstructure" "github.com/mitchellh/mapstructure"