Skip to content

Commit a546030

Browse files
kalafutbriankassouf
authored andcommitted
Run goimports across the repository (hashicorp#6010)
The result will still pass gofmtcheck and won't trigger additional changes if someone isn't using goimports, but it will avoid the piecemeal imports changes we've been seeing.
1 parent 60be741 commit a546030

File tree

155 files changed

+198
-189
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

155 files changed

+198
-189
lines changed

api/client.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ import (
1616
"unicode"
1717

1818
"github.com/hashicorp/errwrap"
19-
"github.com/hashicorp/go-cleanhttp"
20-
"github.com/hashicorp/go-retryablehttp"
21-
"github.com/hashicorp/go-rootcerts"
19+
cleanhttp "github.com/hashicorp/go-cleanhttp"
20+
retryablehttp "github.com/hashicorp/go-retryablehttp"
21+
rootcerts "github.com/hashicorp/go-rootcerts"
2222
"github.com/hashicorp/vault/helper/consts"
2323
"github.com/hashicorp/vault/helper/parseutil"
2424
"golang.org/x/net/http2"

api/ssh_agent.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ import (
99
"os"
1010

1111
"github.com/hashicorp/errwrap"
12-
"github.com/hashicorp/go-cleanhttp"
13-
"github.com/hashicorp/go-multierror"
14-
"github.com/hashicorp/go-rootcerts"
12+
cleanhttp "github.com/hashicorp/go-cleanhttp"
13+
multierror "github.com/hashicorp/go-multierror"
14+
rootcerts "github.com/hashicorp/go-rootcerts"
1515
"github.com/hashicorp/hcl"
1616
"github.com/hashicorp/hcl/hcl/ast"
1717
"github.com/hashicorp/vault/helper/hclutil"

builtin/audit/syslog/backend.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"strconv"
88
"sync"
99

10-
"github.com/hashicorp/go-syslog"
10+
gsyslog "github.com/hashicorp/go-syslog"
1111
"github.com/hashicorp/vault/audit"
1212
"github.com/hashicorp/vault/helper/salt"
1313
"github.com/hashicorp/vault/logical"

builtin/credential/app-id/cmd/app-id/main.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package main
33
import (
44
"os"
55

6-
"github.com/hashicorp/go-hclog"
7-
"github.com/hashicorp/vault/builtin/credential/app-id"
6+
hclog "github.com/hashicorp/go-hclog"
7+
appId "github.com/hashicorp/vault/builtin/credential/app-id"
88
"github.com/hashicorp/vault/helper/pluginutil"
99
"github.com/hashicorp/vault/logical/plugin"
1010
)

builtin/credential/approle/cmd/approle/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package main
33
import (
44
"os"
55

6-
"github.com/hashicorp/go-hclog"
6+
hclog "github.com/hashicorp/go-hclog"
77
"github.com/hashicorp/vault/builtin/credential/approle"
88
"github.com/hashicorp/vault/helper/pluginutil"
99
"github.com/hashicorp/vault/logical/plugin"

builtin/credential/approle/path_role.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"time"
99

1010
"github.com/hashicorp/errwrap"
11-
"github.com/hashicorp/go-uuid"
11+
uuid "github.com/hashicorp/go-uuid"
1212
"github.com/hashicorp/vault/helper/cidrutil"
1313
"github.com/hashicorp/vault/helper/consts"
1414
"github.com/hashicorp/vault/helper/locksutil"

builtin/credential/approle/validation.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"time"
1010

1111
"github.com/hashicorp/errwrap"
12-
"github.com/hashicorp/go-uuid"
12+
uuid "github.com/hashicorp/go-uuid"
1313
"github.com/hashicorp/vault/helper/cidrutil"
1414
"github.com/hashicorp/vault/helper/locksutil"
1515
"github.com/hashicorp/vault/logical"

builtin/credential/aws/backend.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313
"github.com/hashicorp/vault/helper/consts"
1414
"github.com/hashicorp/vault/logical"
1515
"github.com/hashicorp/vault/logical/framework"
16-
"github.com/patrickmn/go-cache"
16+
cache "github.com/patrickmn/go-cache"
1717
)
1818

1919
func Factory(ctx context.Context, conf *logical.BackendConfig) (logical.Backend, error) {

builtin/credential/aws/client.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"github.com/aws/aws-sdk-go/service/iam"
1212
"github.com/aws/aws-sdk-go/service/sts"
1313
"github.com/hashicorp/errwrap"
14-
"github.com/hashicorp/go-cleanhttp"
14+
cleanhttp "github.com/hashicorp/go-cleanhttp"
1515
"github.com/hashicorp/vault/helper/awsutil"
1616
"github.com/hashicorp/vault/logical"
1717
)

builtin/credential/aws/cmd/aws/main.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package main
33
import (
44
"os"
55

6-
"github.com/hashicorp/go-hclog"
7-
"github.com/hashicorp/vault/builtin/credential/aws"
6+
hclog "github.com/hashicorp/go-hclog"
7+
awsauth "github.com/hashicorp/vault/builtin/credential/aws"
88
"github.com/hashicorp/vault/helper/pluginutil"
99
"github.com/hashicorp/vault/logical/plugin"
1010
)

0 commit comments

Comments
 (0)