run gofumpt cleanup across code-base (#14015)

internal/config/cache/config.go

@@ -53,7 +53,7 @@ type Config struct {
 // json entries for CacheConfig.
 func (cfg *Config) UnmarshalJSON(data []byte) (err error) {
 	type Alias Config
-	var _cfg = &struct {
+	_cfg := &struct {
 		*Alias
 	}{
 		Alias: (*Alias)(cfg),

internal/config/config.go

@@ -252,7 +252,7 @@ func (kvs KVS) GetWithDefault(key string, defaultKVS KVS) string {
 
 // Keys returns the list of keys for the current KVS
 func (kvs KVS) Keys() []string {
-	var keys = make([]string, len(kvs))
+	keys := make([]string, len(kvs))
 	var foundComment bool
 	for i := range kvs {
 		if kvs[i].Key == madmin.CommentKey {
@@ -817,7 +817,7 @@ func (c Config) SetKVS(s string, defaultKVS map[string]KVS) (dynamic bool, err e
 		return false, Errorf("sub-system '%s' cannot have empty keys", subSys)
 	}
 
-	var kvs = KVS{}
+	kvs := KVS{}
 	var prevK string
 	for _, v := range fields {
 		kv := strings.SplitN(v, KvSeparator, 2)

internal/config/crypto.go

@@ -62,7 +62,7 @@ func DecryptBytes(KMS kms.KMS, ciphertext []byte, context kms.Context) ([]byte,
 // The same context must be provided when decrypting the
 // ciphertext.
 func Encrypt(KMS kms.KMS, plaintext io.Reader, context kms.Context) (io.Reader, error) {
-	var algorithm = sio.AES_256_GCM
+	algorithm := sio.AES_256_GCM
 	if !fips.Enabled && !sioutil.NativeAES() {
 		algorithm = sio.ChaCha20Poly1305
 	}
@@ -88,7 +88,7 @@ func Encrypt(KMS kms.KMS, plaintext io.Reader, context kms.Context) (io.Reader,
 		header [5]byte
 		buffer bytes.Buffer
 	)
-	var json = jsoniter.ConfigCompatibleWithStandardLibrary
+	json := jsoniter.ConfigCompatibleWithStandardLibrary
 	metadata, err := json.Marshal(encryptedObject{
 		KeyID:     key.KeyID,
 		KMSKey:    key.Ciphertext,
@@ -140,7 +140,7 @@ func Decrypt(KMS kms.KMS, ciphertext io.Reader, context kms.Context) (io.Reader,
 	if _, err := io.ReadFull(ciphertext, metadataBuffer); err != nil {
 		return nil, err
 	}
-	var json = jsoniter.ConfigCompatibleWithStandardLibrary
+	json := jsoniter.ConfigCompatibleWithStandardLibrary
 	if err := json.Unmarshal(metadataBuffer, &metadata); err != nil {
 		return nil, err
 	}

internal/config/dns/etcd_dns.go

@@ -58,7 +58,7 @@ func (c *CoreDNS) Close() error {
 
 // List - Retrieves list of DNS entries for the domain.
 func (c *CoreDNS) List() (map[string][]SrvRecord, error) {
-	var srvRecords = map[string][]SrvRecord{}
+	srvRecords := map[string][]SrvRecord{}
 	for _, domainName := range c.domainNames {
 		key := msg.Path(fmt.Sprintf("%s.", domainName), c.prefixPath)
 		records, err := c.list(key+etcdPathSeparator, true)

internal/config/errors-utils.go

@@ -120,7 +120,6 @@ func ErrorToErr(err error) Err {
 // FmtError converts a fatal error message to a more clear error
 // using some colors
 func FmtError(introMsg string, err error, jsonFlag bool) string {
-
 	renderedTxt := ""
 	uiErr := ErrorToErr(err)
 	// JSON print

internal/config/etcd/etcd_test.go

@@ -38,9 +38,13 @@ func TestParseEndpoints(t *testing.T) {
 		{"http://localhost:2379000", nil, false, false},
 
 		// Valid inputs
-		{"https://localhost:2379,https://localhost:2380", []string{
-			"https://localhost:2379", "https://localhost:2380"},
-			true, true},
+		{
+			"https://localhost:2379,https://localhost:2380",
+			[]string{
+				"https://localhost:2379", "https://localhost:2380",
+			},
+			true, true,
+		},
 		{"http://localhost:2379", []string{"http://localhost:2379"}, false, true},
 	}
 

internal/config/identity/openid/jwks_test.go

@@ -92,18 +92,23 @@ func TestPublicKey(t *testing.T) {
 		t.Fatalf("Expected RSA key[1], got %T", keys[1])
 	} else if key0.Curve != elliptic.P256() {
 		t.Fatal("Key[0] is not using P-256 curve")
-	} else if !bytes.Equal(key0.X.Bytes(), []byte{0x30, 0xa0, 0x42, 0x4c, 0xd2,
+	} else if !bytes.Equal(key0.X.Bytes(), []byte{
+		0x30, 0xa0, 0x42, 0x4c, 0xd2,
 		0x1c, 0x29, 0x44, 0x83, 0x8a, 0x2d, 0x75, 0xc9, 0x2b, 0x37, 0xe7, 0x6e, 0xa2,
-		0xd, 0x9f, 0x0, 0x89, 0x3a, 0x3b, 0x4e, 0xee, 0x8a, 0x3c, 0xa, 0xaf, 0xec, 0x3e}) {
+		0xd, 0x9f, 0x0, 0x89, 0x3a, 0x3b, 0x4e, 0xee, 0x8a, 0x3c, 0xa, 0xaf, 0xec, 0x3e,
+	}) {
 		t.Fatalf("Bad key[0].X, got %v", key0.X.Bytes())
-	} else if !bytes.Equal(key0.Y.Bytes(), []byte{0xe0, 0x4b, 0x65, 0xe9, 0x24,
+	} else if !bytes.Equal(key0.Y.Bytes(), []byte{
+		0xe0, 0x4b, 0x65, 0xe9, 0x24,
 		0x56, 0xd9, 0x88, 0x8b, 0x52, 0xb3, 0x79, 0xbd, 0xfb, 0xd5, 0x1e, 0xe8,
 		0x69, 0xef, 0x1f, 0xf, 0xc6, 0x5b, 0x66, 0x59, 0x69, 0x5b, 0x6c, 0xce,
-		0x8, 0x17, 0x23}) {
+		0x8, 0x17, 0x23,
+	}) {
 		t.Fatalf("Bad key[0].Y, got %v", key0.Y.Bytes())
 	} else if key1.E != 0x10001 {
 		t.Fatalf("Bad key[1].E: %d", key1.E)
-	} else if !bytes.Equal(key1.N.Bytes(), []byte{0xd2, 0xfc, 0x7b, 0x6a, 0xa, 0x1e,
+	} else if !bytes.Equal(key1.N.Bytes(), []byte{
+		0xd2, 0xfc, 0x7b, 0x6a, 0xa, 0x1e,
 		0x6c, 0x67, 0x10, 0x4a, 0xeb, 0x8f, 0x88, 0xb2, 0x57, 0x66, 0x9b, 0x4d, 0xf6,
 		0x79, 0xdd, 0xad, 0x9, 0x9b, 0x5c, 0x4a, 0x6c, 0xd9, 0xa8, 0x80, 0x15, 0xb5,
 		0xa1, 0x33, 0xbf, 0xb, 0x85, 0x6c, 0x78, 0x71, 0xb6, 0xdf, 0x0, 0xb, 0x55,
@@ -122,7 +127,8 @@ func TestPublicKey(t *testing.T) {
 		0xa5, 0x9e, 0x66, 0xed, 0x1f, 0x33, 0x89, 0x45, 0x77, 0x63, 0x5c, 0x47, 0xa,
 		0xf7, 0x5c, 0xf9, 0x2c, 0x20, 0xd1, 0xda, 0x43, 0xe1, 0xbf, 0xc4, 0x19, 0xe2,
 		0x22, 0xa6, 0xf0, 0xd0, 0xbb, 0x35, 0x8c, 0x5e, 0x38, 0xf9, 0xcb, 0x5, 0xa, 0xea,
-		0xfe, 0x90, 0x48, 0x14, 0xf1, 0xac, 0x1a, 0xa4, 0x9c, 0xca, 0x9e, 0xa0, 0xca, 0x83}) {
+		0xfe, 0x90, 0x48, 0x14, 0xf1, 0xac, 0x1a, 0xa4, 0x9c, 0xca, 0x9e, 0xa0, 0xca, 0x83,
+	}) {
 		t.Fatalf("Bad key[1].N, got %v", key1.N.Bytes())
 	}
 }

internal/config/identity/openid/jwt.go

@@ -112,7 +112,7 @@ func (r *Config) UserInfo(accessToken string) (map[string]interface{}, error) {
 	}
 
 	dec := json.NewDecoder(resp.Body)
-	var claims = map[string]interface{}{}
+	claims := map[string]interface{}{}
 
 	if err = dec.Decode(&claims); err != nil {
 		// uncomment this for debugging when needed.

internal/config/storageclass/storage-class_test.go

@@ -29,24 +29,48 @@ func TestParseStorageClass(t *testing.T) {
 		wantSc          StorageClass
 		expectedError   error
 	}{
-		{"EC:3", StorageClass{
-			Parity: 3},
-			nil},
-		{"EC:4", StorageClass{
-			Parity: 4},
-			nil},
-		{"AB:4", StorageClass{
-			Parity: 4},
-			errors.New("Unsupported scheme AB. Supported scheme is EC")},
-		{"EC:4:5", StorageClass{
-			Parity: 4},
-			errors.New("Too many sections in EC:4:5")},
-		{"EC:A", StorageClass{
-			Parity: 4},
-			errors.New(`strconv.Atoi: parsing "A": invalid syntax`)},
-		{"AB", StorageClass{
-			Parity: 4},
-			errors.New("Too few sections in AB")},
+		{
+			"EC:3",
+			StorageClass{
+				Parity: 3,
+			},
+			nil,
+		},
+		{
+			"EC:4",
+			StorageClass{
+				Parity: 4,
+			},
+			nil,
+		},
+		{
+			"AB:4",
+			StorageClass{
+				Parity: 4,
+			},
+			errors.New("Unsupported scheme AB. Supported scheme is EC"),
+		},
+		{
+			"EC:4:5",
+			StorageClass{
+				Parity: 4,
+			},
+			errors.New("Too many sections in EC:4:5"),
+		},
+		{
+			"EC:A",
+			StorageClass{
+				Parity: 4,
+			},
+			errors.New(`strconv.Atoi: parsing "A": invalid syntax`),
+		},
+		{
+			"AB",
+			StorageClass{
+				Parity: 4,
+			},
+			errors.New("Too few sections in AB"),
+		},
 	}
 	for i, tt := range tests {
 		gotSc, err := parseStorageClass(tt.storageClassEnv)