run modernize command on src

Author: syeleti-msft

cmd/health-monitor_stop.go

@@ -78,8 +78,8 @@ func getPid(blobfuse2Pid string) (string, error) {
 	if err != nil {
 		return "", err
 	}
-	processes := strings.Split(string(out), "\n")
-	for _, process := range processes {
+	processes := strings.SplitSeq(string(out), "\n")
+	for process := range processes {
 		if strings.Contains(process, "bfusemon") && strings.Contains(process, fmt.Sprintf("--pid=%s", blobfuse2Pid)) {
 			re := regexp.MustCompile(`[-]?\d[\d,]*[\.]?[\d{2}]*`)
 			pids := re.FindAllString(process, 1)

cmd/mount.go

@@ -46,6 +46,7 @@ import (
 	"runtime"
 	"runtime/debug"
 	"runtime/pprof"
+	"slices"
 	"strconv"
 	"strings"
 	"syscall"
@@ -450,11 +451,8 @@ var mountCmd = &cobra.Command{
 		common.EnableMonitoring = options.MonitorOpt.EnableMon
 
 		// check if blobfuse stats monitor is added in the disable list
-		for _, mon := range options.MonitorOpt.DisableList {
-			if mon == common.BfuseStats {
-				common.BfsDisabled = true
-				break
-			}
+		if slices.Contains(options.MonitorOpt.DisableList, common.BfuseStats) {
+			common.BfsDisabled = true
 		}
 
 		config.Set("mount-path", options.MountPath)

cmd/mountgen1.go

@@ -150,7 +150,7 @@ var gen1Cmd = &cobra.Command{
 
 // code to generate json file for rustfuse
 func generateAdlsGenOneJson() error {
-	rustFuseMap := make(map[string]interface{})
+	rustFuseMap := make(map[string]any)
 	if strings.ToLower(azStorageOpt.AuthMode) == "spn" {
 		// adlsgen1fuse will be reading secret from env variable (ADL_CLIENT_SECRET) hence no reason to include this.
 		// rustFuseMap["clientsecret"] = azStorageOpt.ClientSecret

cmd/root.go

@@ -40,6 +40,7 @@ import (
 	"io"
 	"net/http"
 	"os"
+	"slices"
 	"strings"
 	"time"
 
@@ -124,8 +125,8 @@ func getRemoteVersion(req string) (string, error) {
 }
 
 // beginDetectNewVersion : Get latest release version and compare if user needs an upgrade or not
-func beginDetectNewVersion() chan interface{} {
-	completed := make(chan interface{})
+func beginDetectNewVersion() chan any {
+	completed := make(chan any)
 	stderr := os.Stderr
 	go func() {
 		defer close(completed)
@@ -206,10 +207,8 @@ func VersionCheck() error {
 func ignoreCommand(cmdArgs []string) bool {
 	ignoreCmds := []string{"completion", "help"}
 	if len(cmdArgs) > 0 {
-		for _, c := range ignoreCmds {
-			if c == cmdArgs[0] {
-				return true
-			}
+		if slices.Contains(ignoreCmds, cmdArgs[0]) {
+			return true
 		}
 	}
 	return false
@@ -246,8 +245,8 @@ func parseArgs(cmdArgs []string) []string {
 				lfuseArgs := make([]string, 0)
 
 				// Check if ',' exists in arguments or not. If so we assume it might be coming from /etc/fstab
-				opts := strings.Split(cmdArgs[i], ",")
-				for _, o := range opts {
+				opts := strings.SplitSeq(cmdArgs[i], ",")
+				for o := range opts {
 					// If we got comma separated list then all blobfuse specific options needs to be extracted out
 					//  as those shall not be part of -o list which for us means libfuse options
 					if strings.HasPrefix(o, "--") {

common/config/config_parser.go

@@ -71,7 +71,7 @@ func (handler ConfigChangeEventHandlerFunc) OnConfigChange() {
 	handler()
 }
 
-type KeysTree map[string]interface{}
+type KeysTree map[string]any
 
 type options struct {
 	path              string
@@ -226,12 +226,12 @@ func BindPFlag(key string, flag *pflag.Flag) {
 //		name: value
 //
 // the key parameter should take on the value "auth.key"
-func UnmarshalKey(key string, obj interface{}) error {
+func UnmarshalKey(key string, obj any) error {
 	err := viper.UnmarshalKey(key, obj, func(decodeConfig *mapstructure.DecoderConfig) { decodeConfig.TagName = STRUCT_TAG })
 	if err != nil {
 		return fmt.Errorf("config error: unmarshalling [%v]", err)
 	}
-	userOptions.envTree.MergeWithKey(key, obj, func(val interface{}) (interface{}, bool) {
+	userOptions.envTree.MergeWithKey(key, obj, func(val any) (any, bool) {
 		envVar := val.(string)
 		res, ok := os.LookupEnv(envVar)
 		if ok {
@@ -240,7 +240,7 @@ func UnmarshalKey(key string, obj interface{}) error {
 			return "", false
 		}
 	})
-	userOptions.flagTree.MergeWithKey(key, obj, func(val interface{}) (interface{}, bool) {
+	userOptions.flagTree.MergeWithKey(key, obj, func(val any) (any, bool) {
 		flag := val.(*pflag.Flag)
 		if flag.Changed {
 			return flag.Value.String(), true
@@ -253,12 +253,12 @@ func UnmarshalKey(key string, obj interface{}) error {
 
 // Unmarshal populates the passed object and all the exported fields.
 // use lower case attribute names to ignore a particular field
-func Unmarshal(obj interface{}) error {
+func Unmarshal(obj any) error {
 	err := viper.Unmarshal(obj, func(decodeConfig *mapstructure.DecoderConfig) { decodeConfig.TagName = STRUCT_TAG })
 	if err != nil {
 		return fmt.Errorf("config error: unmarshalling [%v]", err)
 	}
-	userOptions.envTree.Merge(obj, func(val interface{}) (interface{}, bool) {
+	userOptions.envTree.Merge(obj, func(val any) (any, bool) {
 		envVar := val.(string)
 		res, ok := os.LookupEnv(envVar)
 		if ok {
@@ -267,7 +267,7 @@ func Unmarshal(obj interface{}) error {
 			return "", false
 		}
 	})
-	userOptions.flagTree.Merge(obj, func(val interface{}) (interface{}, bool) {
+	userOptions.flagTree.Merge(obj, func(val any) (any, bool) {
 		flag := val.(*pflag.Flag)
 		if flag.Changed {
 			return flag.Value.String(), true

common/config/keys_tree.go

@@ -44,7 +44,7 @@ const STRUCT_TAG = "config"
 
 type TreeNode struct {
 	children map[string]*TreeNode
-	value    interface{}
+	value    any
 	name     string
 }
 
@@ -70,7 +70,7 @@ func NewTreeNode(name string) *TreeNode {
 // Insert function is used to insert a new object into the tree
 // The key is specified as a dot separated hierarchical value
 // For eg. root.child1.child2
-func (tree *Tree) Insert(key string, value interface{}) {
+func (tree *Tree) Insert(key string, value any) {
 	subKeys := strings.Split(key, ".")
 	curNode := tree.head
 	for _, idx := range subKeys {
@@ -118,7 +118,7 @@ func (tree *Tree) GetSubTree(key string) *TreeNode {
 }
 
 // parseValue is a utility function that accepts a val and returns the parsed value of that type.
-func parseValue(val string, toType reflect.Kind) interface{} {
+func parseValue(val string, toType reflect.Kind) any {
 	switch toType {
 	case reflect.Bool:
 		parsed, err := strconv.ParseBool(val)
@@ -220,7 +220,7 @@ func parseValue(val string, toType reflect.Kind) interface{} {
 // MergeWithKey is used to merge the contained tree with the object (obj) that is passed in as parameter.
 // getValue parameter is a function that accepts the value stored in a TreeNode and performs any business logic and returns the value that has to be placed in the obj parameter
 // it must also return true|false based on which the value will be set in the obj parameter.
-func (tree *Tree) MergeWithKey(key string, obj interface{}, getValue func(val interface{}) (res interface{}, ok bool)) {
+func (tree *Tree) MergeWithKey(key string, obj any, getValue func(val any) (res any, ok bool)) {
 	subTree := tree.GetSubTree(key)
 	if subTree == nil {
 		return
@@ -257,7 +257,7 @@ func (tree *Tree) MergeWithKey(key string, obj interface{}, getValue func(val in
 }
 
 // Merge performs the same function as MergeWithKey but at the root level
-func (tree *Tree) Merge(obj interface{}, getValue func(val interface{}) (res interface{}, ok bool)) {
+func (tree *Tree) Merge(obj any, getValue func(val any) (res any, ok bool)) {
 	subTree := tree.head
 	if subTree == nil {
 		return
@@ -334,7 +334,7 @@ func isPrimitiveType(kind reflect.Kind) bool {
 }
 
 // assignToField is utility function to set the val to the passed field based on it's state
-func assignToField(field reflect.Value, val interface{}) {
+func assignToField(field reflect.Value, val any) {
 	if field.CanSet() {
 		if reflect.TypeOf(val).Kind() == reflect.String {
 			parseVal := parseValue(val.(string), field.Kind())

common/config/keys_tree_test.go

@@ -57,7 +57,7 @@ func TestKeysTree(t *testing.T) {
 type parseVal struct {
 	val    string
 	toType reflect.Kind
-	result interface{}
+	result any
 }
 
 func (suite *keysTreeTestSuite) TestParseValue() {

common/log/base_logger.go

@@ -89,37 +89,37 @@ func (l *BaseLogger) GetLogLevel() common.LogLevel {
 	return l.fileConfig.LogLevel
 }
 
-func (l *BaseLogger) Debug(format string, args ...interface{}) {
+func (l *BaseLogger) Debug(format string, args ...any) {
 	if l.fileConfig.LogLevel >= common.ELogLevel.LOG_DEBUG() {
 		l.logEvent(common.ELogLevel.LOG_DEBUG().String(), format, args...)
 	}
 }
 
-func (l *BaseLogger) Trace(format string, args ...interface{}) {
+func (l *BaseLogger) Trace(format string, args ...any) {
 	if l.fileConfig.LogLevel >= common.ELogLevel.LOG_TRACE() {
 		l.logEvent(common.ELogLevel.LOG_TRACE().String(), format, args...)
 	}
 }
 
-func (l *BaseLogger) Info(format string, args ...interface{}) {
+func (l *BaseLogger) Info(format string, args ...any) {
 	if l.fileConfig.LogLevel >= common.ELogLevel.LOG_INFO() {
 		l.logEvent(common.ELogLevel.LOG_INFO().String(), format, args...)
 	}
 }
 
-func (l *BaseLogger) Warn(format string, args ...interface{}) {
+func (l *BaseLogger) Warn(format string, args ...any) {
 	if l.fileConfig.LogLevel >= common.ELogLevel.LOG_WARNING() {
 		l.logEvent(common.ELogLevel.LOG_WARNING().String(), format, args...)
 	}
 }
 
-func (l *BaseLogger) Err(format string, args ...interface{}) {
+func (l *BaseLogger) Err(format string, args ...any) {
 	if l.fileConfig.LogLevel >= common.ELogLevel.LOG_ERR() {
 		l.logEvent(common.ELogLevel.LOG_ERR().String(), format, args...)
 	}
 }
 
-func (l *BaseLogger) Crit(format string, args ...interface{}) {
+func (l *BaseLogger) Crit(format string, args ...any) {
 	if l.fileConfig.LogLevel >= common.ELogLevel.LOG_CRIT() {
 		l.logEvent(common.ELogLevel.LOG_CRIT().String(), format, args...)
 	}
@@ -215,7 +215,7 @@ func (l *BaseLogger) Destroy() error {
 }
 
 // logEvent : Enqueue the log to the channel
-func (l *BaseLogger) logEvent(lvl string, format string, args ...interface{}) {
+func (l *BaseLogger) logEvent(lvl string, format string, args ...any) {
 	// Only log if the log level matches the log request
 	_, fn, ln, _ := runtime.Caller(3)
 	msg := fmt.Sprintf(format, args...)

common/log/logger.go

@@ -55,12 +55,12 @@ type Logger interface {
 
 	GetType() string
 	GetLogLevel() common.LogLevel
-	Debug(format string, args ...interface{})
-	Trace(format string, args ...interface{})
-	Info(format string, args ...interface{})
-	Warn(format string, args ...interface{})
-	Err(format string, args ...interface{})
-	Crit(format string, args ...interface{})
+	Debug(format string, args ...any)
+	Trace(format string, args ...any)
+	Info(format string, args ...any)
+	Warn(format string, args ...any)
+	Err(format string, args ...any)
+	Crit(format string, args ...any)
 	LogRotate() error
 }
 
@@ -191,32 +191,32 @@ func Destroy() error {
 // ------------------ Public methods for logging events ------------------
 
 // Debug : Debug message logging
-func Debug(msg string, args ...interface{}) {
+func Debug(msg string, args ...any) {
 	logObj.Debug(msg, args...)
 }
 
 // Trace : Trace message logging
-func Trace(msg string, args ...interface{}) {
+func Trace(msg string, args ...any) {
 	logObj.Trace(msg, args...)
 }
 
 // Info : Info message logging
-func Info(msg string, args ...interface{}) {
+func Info(msg string, args ...any) {
 	logObj.Info(msg, args...)
 }
 
 // Warn : Warning message logging
-func Warn(msg string, args ...interface{}) {
+func Warn(msg string, args ...any) {
 	logObj.Warn(msg, args...)
 }
 
 // Err : Error message logging
-func Err(msg string, args ...interface{}) {
+func Err(msg string, args ...any) {
 	logObj.Err(msg, args...)
 }
 
 // Crit : Critical message logging
-func Crit(msg string, args ...interface{}) {
+func Crit(msg string, args ...any) {
 	logObj.Crit(msg, args...)
 }
 

common/log/logger_test.go

@@ -61,7 +61,7 @@ func fastTestCrit(lts *LoggerTestSuite) {
 
 func simpleTest(lts *LoggerTestSuite) {
 	Crit("Running Simple Test")
-	for l := 0; l < 3; l++ {
+	for l := range 3 {
 		switch l {
 		case 0:
 			SetLogLevel(common.ELogLevel.LOG_DEBUG())