Transit BYOK formatting fixes.

hashicorp · May 13, 2022 · e05a5fb · e05a5fb
1 parent 41d6bc5
commit e05a5fb
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 11 deletions.
diff --git a/builtin/logical/transit/path_import.go b/builtin/logical/transit/path_import.go
@@ -10,11 +10,10 @@ import (
 	"errors"
 	"fmt"
 	"hash"
+	"strconv"
 	"strings"
 	"time"
 
-	"strconv"
-
 	"github.com/google/tink/go/kwp/subtle"
 	"github.com/hashicorp/vault/sdk/framework"
 	"github.com/hashicorp/vault/sdk/helper/keysutil"
@@ -27,7 +26,7 @@ func (b *backend) pathImport() *framework.Path {
 	return &framework.Path{
 		Pattern: "keys/" + framework.GenericNameRegex("name") + "/import",
 		Fields: map[string]*framework.FieldSchema{
-			"name": &framework.FieldSchema{
+			"name": {
 				Type:        framework.TypeString,
 				Description: "The name of the key",
 			},
@@ -120,7 +119,7 @@ func (b *backend) pathImportVersion() *framework.Path {
 	return &framework.Path{
 		Pattern: "keys/" + framework.GenericNameRegex("name") + "/import_version",
 		Fields: map[string]*framework.FieldSchema{
-			"name": &framework.FieldSchema{
+			"name": {
 				Type:        framework.TypeString,
 				Description: "The name of the key",
 			},
@@ -350,10 +349,12 @@ func parseHashFn(hashFn string) (hash.Hash, error) {
 	}
 }
 
-const pathImportWriteSyn = "Imports an externally-generated key into a new transit key"
-const pathImportWriteDesc = "This path is used to import an externally-generated " +
-	"key into Vault. The import operation creates a new key and cannot be used to " +
-	"replace an existing key."
+const (
+	pathImportWriteSyn  = "Imports an externally-generated key into a new transit key"
+	pathImportWriteDesc = "This path is used to import an externally-generated " +
+		"key into Vault. The import operation creates a new key and cannot be used to " +
+		"replace an existing key."
+)
 
 const pathImportVersionWriteSyn = "Imports an externally-generated key into an " +
 	"existing imported key"

diff --git a/builtin/logical/transit/path_import_test.go b/builtin/logical/transit/path_import_test.go
@@ -40,8 +40,10 @@ var hashFns = []string{
 	"SHA512",
 }
 
-var keysLock sync.RWMutex
-var keys = map[string]interface{}{}
+var (
+	keysLock sync.RWMutex
+	keys     = map[string]interface{}{}
+)
 
 func generateKeys(t *testing.T) {
 	t.Helper()

diff --git a/sdk/helper/keysutil/policy_test.go b/sdk/helper/keysutil/policy_test.go
@@ -8,13 +8,14 @@ import (
 	"crypto/rand"
 	"crypto/rsa"
 	"crypto/x509"
-	"golang.org/x/crypto/ed25519"
 	"reflect"
 	"strconv"
 	"sync"
 	"testing"
 	"time"
 
+	"golang.org/x/crypto/ed25519"
+
 	"github.com/hashicorp/vault/sdk/helper/jsonutil"
 	"github.com/hashicorp/vault/sdk/logical"
 	"github.com/mitchellh/copystructure"