Run go fix ./...

Signed-off-by: Ilia Choly <ilia.choly@gmail.com>

Author: icholy

aes/cipher.go

@@ -35,7 +35,7 @@ const nonceSize int = 32
 
 type stashKey struct {
 	additionalData string
-	plaintext      interface{}
+	plaintext      any
 }
 
 // Cipher encrypts and decrypts data keys with AES GCM 256
@@ -77,7 +77,7 @@ func parse(value string) (*encryptedValue, error) {
 }
 
 // Decrypt takes a sops-format value string and a key and returns the decrypted value and a stash value
-func (c Cipher) Decrypt(ciphertext string, key []byte, additionalData string) (plaintext interface{}, err error) {
+func (c Cipher) Decrypt(ciphertext string, key []byte, additionalData string) (plaintext any, err error) {
 	if isEmpty(ciphertext) {
 		return "", nil
 	}
@@ -124,7 +124,7 @@ func (c Cipher) Decrypt(ciphertext string, key []byte, additionalData string) (p
 	return plaintext, err
 }
 
-func isEmpty(value interface{}) bool {
+func isEmpty(value any) bool {
 	switch value := value.(type) {
 	case string:
 		return value == ""
@@ -138,7 +138,7 @@ func isEmpty(value interface{}) bool {
 }
 
 // Encrypt takes one of (string, int, float, bool) and encrypts it with the provided key and additional auth data, returning a sops-format encrypted string.
-func (c Cipher) Encrypt(plaintext interface{}, key []byte, additionalData string) (ciphertext string, err error) {
+func (c Cipher) Encrypt(plaintext any, key []byte, additionalData string) (ciphertext string, err error) {
 	if isEmpty(plaintext) {
 		return "", nil
 	}

age/keysource.go

@@ -227,7 +227,7 @@ func formatError(msg string, err error, errs errSet, unusedLocations []string) e
 		} else if count == 2 {
 			unusedSuffix = fmt.Sprintf("s '%s' and '%s'", unusedLocations[0], unusedLocations[1])
 		} else {
-			unusedSuffix = fmt.Sprintf("s '%s', and '%s'", strings.Join(unusedLocations[:count - 1], "', '"), unusedLocations[count - 1])
+			unusedSuffix = fmt.Sprintf("s '%s', and '%s'", strings.Join(unusedLocations[:count-1], "', '"), unusedLocations[count-1])
 		}
 		unusedSuffix = fmt.Sprintf(". Did not find keys in location%s.", unusedSuffix)
 	}
@@ -282,8 +282,8 @@ func (key *MasterKey) ToString() string {
 }
 
 // ToMap converts the MasterKey to a map for serialization purposes.
-func (key *MasterKey) ToMap() map[string]interface{} {
-	out := make(map[string]interface{})
+func (key *MasterKey) ToMap() map[string]any {
+	out := make(map[string]any)
 	out["recipient"] = key.Recipient
 	out["enc"] = key.EncryptedKey
 	return out

age/keysource_test.go

@@ -356,7 +356,7 @@ func TestMasterKey_ToMap(t *testing.T) {
 		Recipient:    mockRecipient,
 		EncryptedKey: "some-encrypted-key",
 	}
-	assert.Equal(t, map[string]interface{}{
+	assert.Equal(t, map[string]any{
 		"recipient": mockRecipient,
 		"enc":       key.EncryptedKey,
 	}, key.ToMap())

age/tui.go

@@ -7,11 +7,11 @@ import (
 
 var testOnlyAgePassword string
 
-func printf(format string, v ...interface{}) {
+func printf(format string, v ...any) {
 	log.Printf("age: "+format, v...)
 }
 
-func warningf(format string, v ...interface{}) {
+func warningf(format string, v ...any) {
 	log.Printf("age: warning: "+format, v...)
 }
 
@@ -27,7 +27,7 @@ var pluginTerminalUI = &plugin.ClientUI{
 		if testing.Testing() && testOnlyAgePassword != "" {
 			return testOnlyAgePassword, nil
 		}
-		return pluginTerminalUIImpl.RequestValue(name, message, isSecret);
+		return pluginTerminalUIImpl.RequestValue(name, message, isSecret)
 	},
 	Confirm: func(name, message, yes, no string) (choseYes bool, err error) {
 		return pluginTerminalUIImpl.Confirm(name, message, yes, no)

audit/audit.go

@@ -70,7 +70,7 @@ type config struct {
 var auditors []Auditor
 
 // SubmitEvent handles an event for all auditors
-func SubmitEvent(event interface{}) {
+func SubmitEvent(event any) {
 	for _, auditor := range auditors {
 		auditor.Handle(event)
 	}
@@ -87,7 +87,7 @@ type Auditor interface {
 	// Handle() takes an audit event and attempts to persists it;
 	// how it is persisted and how errors are handled is up to the
 	// implementation of this interface.
-	Handle(event interface{})
+	Handle(event any)
 }
 
 // DecryptEvent contains fields relevant to a decryption event
@@ -133,7 +133,7 @@ func NewPostgresAuditor(connStr string) (*PostgresAuditor, error) {
 
 // Handle persists the audit event by writing a row to the
 // 'audit_event' postgres table
-func (p *PostgresAuditor) Handle(event interface{}) {
+func (p *PostgresAuditor) Handle(event any) {
 	u, err := user.Current()
 	if err != nil {
 		log.Fatalf("Error getting current user for auditing: %s", err)

azkv/keysource.go

@@ -119,7 +119,7 @@ func MasterKeysFromURLs(urls string) ([]*MasterKey, error) {
 	if urls == "" {
 		return keys, nil
 	}
-	for _, s := range strings.Split(urls, ",") {
+	for s := range strings.SplitSeq(urls, ",") {
 		k, err := NewMasterKeyFromURL(s)
 		if err != nil {
 			return nil, err
@@ -171,7 +171,7 @@ func (key *MasterKey) Encrypt(dataKey []byte) error {
 }
 
 func (key *MasterKey) ensureKeyHasVersion(ctx context.Context) error {
-	if (key.Version != "") {
+	if key.Version != "" {
 		// Nothing to do
 		return nil
 	}
@@ -301,8 +301,8 @@ func (key *MasterKey) ToString() string {
 }
 
 // ToMap converts the MasterKey to a map for serialization purposes.
-func (key MasterKey) ToMap() map[string]interface{} {
-	out := make(map[string]interface{})
+func (key MasterKey) ToMap() map[string]any {
+	out := make(map[string]any)
 	out["vaultUrl"] = key.VaultURL
 	out["key"] = key.Name
 	out["version"] = key.Version

azkv/keysource_test.go

@@ -201,7 +201,7 @@ func TestMasterKey_ToMap(t *testing.T) {
 		Version:      "1",
 		EncryptedKey: "this is encrypted",
 	}
-	assert.Equal(t, map[string]interface{}{
+	assert.Equal(t, map[string]any{
 		"vaultUrl":   key.VaultURL,
 		"key":        key.Name,
 		"version":    key.Version,

cmd/sops/common/common.go

@@ -162,7 +162,7 @@ func LoadEncryptedFile(loader sops.EncryptedFileLoader, inputPath string) (*sops
 
 // NewExitError returns a cli.ExitError given an error (wrapped in a generic interface{})
 // and an exit code to represent the failure
-func NewExitError(i interface{}, exitCode int) *cli.ExitError {
+func NewExitError(i any, exitCode int) *cli.ExitError {
 	if userErr, ok := i.(sops.UserError); ok {
 		return NewExitError(userErr.UserError(), exitCode)
 	}
@@ -365,7 +365,7 @@ func RecoverDataKeyFromBuggyKMS(opts GenericDecryptOpts, tree *sops.Tree) []byte
 
 	keyToEdit := *originalKey
 
-	encCtxVals := map[string]interface{}{}
+	encCtxVals := map[string]any{}
 	for _, v := range keyToEdit.EncryptionContext {
 		encCtxVals[*v] = ""
 	}
@@ -406,13 +406,6 @@ type Diff struct {
 	Removed []keys.MasterKey
 }
 
-func max(a, b int) int {
-	if a > b {
-		return a
-	}
-	return b
-}
-
 // DiffKeyGroups returns the list of diffs found in two sops.keyGroup slices
 func DiffKeyGroups(ours, theirs []sops.KeyGroup) []Diff {
 	var diffs []Diff

cmd/sops/decrypt.go

@@ -21,7 +21,7 @@ type decryptOpts struct {
 	InputPath       string
 	ReadFromStdin   bool
 	IgnoreMAC       bool
-	Extract         []interface{}
+	Extract         []any
 	KeyServices     []keyservice.KeyServiceClient
 	DecryptionOrder []string
 }
@@ -72,7 +72,7 @@ func decrypt(opts decryptOpts) (decryptedFile []byte, err error) {
 	return decryptedFile, err
 }
 
-func extract(tree *sops.Tree, path []interface{}, outputStore sops.Store) (output []byte, err error) {
+func extract(tree *sops.Tree, path []any, outputStore sops.Store) (output []byte, err error) {
 	v, err := tree.Branches[0].Truncate(path)
 	if err != nil {
 		return nil, fmt.Errorf("error truncating tree: %s", err)

cmd/sops/main.go

@@ -869,7 +869,7 @@ func main() {
 					return toExitError(err)
 				}
 
-				var extract []interface{}
+				var extract []any
 				extract, err = parseTreePath(c.String("extract"))
 				if err != nil {
 					return common.NewExitError(fmt.Errorf("error parsing --extract path: %s", err), codes.InvalidTreePathFormat)
@@ -1988,7 +1988,7 @@ func main() {
 		}
 
 		if isDecryptMode {
-			var extract []interface{}
+			var extract []any
 			extract, err = parseTreePath(c.String("extract"))
 			if err != nil {
 				return common.NewExitError(fmt.Errorf("error parsing --extract path: %s", err), codes.InvalidTreePathFormat)
@@ -2019,8 +2019,8 @@ func main() {
 		}
 
 		if isSetMode {
-			var path []interface{}
-			var value interface{}
+			var path []any
+			var value any
 			path, value, err = extractSetArguments(c.String("set"))
 			if err != nil {
 				return toExitError(err)
@@ -2398,10 +2398,10 @@ func outputStore(context *cli.Context, path string) (common.Store, error) {
 	return common.DefaultStoreForPathOrFormat(storesConf, path, context.String("output-type")), nil
 }
 
-func parseTreePath(arg string) ([]interface{}, error) {
-	var path []interface{}
-	components := strings.Split(arg, "[")
-	for _, component := range components {
+func parseTreePath(arg string) ([]any, error) {
+	var path []any
+	components := strings.SplitSeq(arg, "[")
+	for component := range components {
 		if component == "" {
 			continue
 		}
@@ -2554,8 +2554,8 @@ func shamirThreshold(c *cli.Context, file string, optionalConfig *config.Config)
 	return conf.ShamirThreshold, nil
 }
 
-func jsonValueToTreeInsertableValue(jsonValue string) (interface{}, error) {
-	var valueToInsert interface{}
+func jsonValueToTreeInsertableValue(jsonValue string) (any, error) {
+	var valueToInsert any
 	err := encodingjson.Unmarshal([]byte(jsonValue), &valueToInsert)
 	if err != nil {
 		return nil, common.NewExitError("Value for --set is not valid JSON", codes.ErrorInvalidSetFormat)
@@ -2581,7 +2581,7 @@ func jsonValueToTreeInsertableValue(jsonValue string) (interface{}, error) {
 	return values[0], nil
 }
 
-func extractSetArguments(set string) (path []interface{}, valueToInsert interface{}, err error) {
+func extractSetArguments(set string) (path []any, valueToInsert any, err error) {
 	// Set is a string with the format "python-dict-index json-value"
 	// Since python-dict-index has to end with ], we split at "] " to get the two parts
 	pathValuePair := strings.SplitAfterN(set, "] ", 2)