fmt

Signed-off-by: Ryan Cragun <[email protected]>
hashicorp · Jan 10, 2025 · 024422a · 024422a
1 parent f9ae8c4
commit 024422a
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 17 deletions.
diff --git a/command/operator_migrate_test.go b/command/operator_migrate_test.go
@@ -18,7 +18,6 @@ import (
 	"time"
 
 	"github.com/go-test/deep"
-
 	log "github.com/hashicorp/go-hclog"
 	"github.com/hashicorp/go-secure-stdlib/base62"
 	"github.com/hashicorp/vault/command/server"

diff --git a/command/server.go b/command/server.go
@@ -26,12 +26,6 @@ import (
 
 	systemd "github.com/coreos/go-systemd/daemon"
 	"github.com/google/go-cmp/cmp"
-	"github.com/posener/complete"
-	"github.com/sasha-s/go-deadlock"
-	"go.uber.org/atomic"
-	"golang.org/x/net/http/httpproxy"
-	"google.golang.org/grpc/grpclog"
-
 	"github.com/hashicorp/cli"
 	"github.com/hashicorp/errwrap"
 	"github.com/hashicorp/go-hclog"
@@ -68,6 +62,11 @@ import (
 	"github.com/hashicorp/vault/vault/plugincatalog"
 	vaultseal "github.com/hashicorp/vault/vault/seal"
 	"github.com/hashicorp/vault/version"
+	"github.com/posener/complete"
+	"github.com/sasha-s/go-deadlock"
+	"go.uber.org/atomic"
+	"golang.org/x/net/http/httpproxy"
+	"google.golang.org/grpc/grpclog"
 )
 
 var (

diff --git a/command/server/config.go b/command/server/config.go
@@ -16,8 +16,6 @@ import (
 	"strings"
 	"time"
 
-	"github.com/mitchellh/mapstructure"
-
 	"github.com/hashicorp/go-multierror"
 	"github.com/hashicorp/go-secure-stdlib/parseutil"
 	"github.com/hashicorp/hcl"
@@ -28,6 +26,7 @@ import (
 	"github.com/hashicorp/vault/sdk/helper/consts"
 	"github.com/hashicorp/vault/sdk/helper/strutil"
 	"github.com/hashicorp/vault/sdk/helper/testcluster"
+	"github.com/mitchellh/mapstructure"
 )
 
 const (

diff --git a/command/server/config_test.go b/command/server/config_test.go
@@ -9,9 +9,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/stretchr/testify/require"
-
 	"github.com/hashicorp/vault/internalshared/configutil"
+	"github.com/stretchr/testify/require"
 )
 
 func TestLoadConfigFile(t *testing.T) {

diff --git a/command/server/config_test_helpers.go b/command/server/config_test_helpers.go
@@ -13,12 +13,11 @@ import (
 	"time"
 
 	"github.com/go-test/deep"
-	"github.com/stretchr/testify/require"
-
 	"github.com/hashicorp/hcl"
 	"github.com/hashicorp/hcl/hcl/ast"
 	"github.com/hashicorp/hcl/hcl/token"
 	"github.com/hashicorp/vault/internalshared/configutil"
+	"github.com/stretchr/testify/require"
 )
 
 var DefaultCustomHeaders = map[string]map[string]string{

diff --git a/internalshared/configutil/kms_test.go b/internalshared/configutil/kms_test.go
@@ -7,9 +7,8 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/stretchr/testify/require"
-
 	"github.com/hashicorp/go-kms-wrapping/wrappers/ocikms/v2"
+	"github.com/stretchr/testify/require"
 )
 
 func Test_getEnvConfig(t *testing.T) {

diff --git a/internalshared/configutil/telemetry.go b/internalshared/configutil/telemetry.go
@@ -16,15 +16,14 @@ import (
 	"github.com/armon/go-metrics/prometheus"
 	stackdriver "github.com/google/go-metrics-stackdriver"
 	stackdrivervault "github.com/google/go-metrics-stackdriver/vault"
-	"google.golang.org/api/option"
-
 	"github.com/hashicorp/cli"
 	"github.com/hashicorp/go-multierror"
 	"github.com/hashicorp/go-secure-stdlib/parseutil"
 	"github.com/hashicorp/hcl"
 	"github.com/hashicorp/hcl/hcl/ast"
 	"github.com/hashicorp/vault/helper/metricsutil"
 	"github.com/hashicorp/vault/sdk/helper/metricregistry"
+	"google.golang.org/api/option"
 )
 
 const (