make code more idiomatic

Author: dbriemann

cf_cli_java_plugin.go

@@ -539,7 +539,7 @@ func (c *JavaPlugin) execute(commandExecutor cmd.CommandExecutor, uuidGenerator
 	verbose := commandFlags.IsSet("verbose")
 
 	// Helper function for verbose logging with format strings
-	logVerbose := func(format string, args ...interface{}) {
+	logVerbose := func(format string, args ...any) {
 		if verbose {
 			fmt.Printf("[VERBOSE] "+format+"\n", args...)
 		}

utils/cf_java_plugin_util.go

@@ -43,7 +43,7 @@ func FuzzySearch(needle string, words []string, max int) []string {
 	}
 
 	results := make([]string, 0, max)
-	for i := 0; i < max; i++ {
+	for i := range max {
 		results = append(results, matches[i].word)
 	}
 

utils/cfutils.go

@@ -10,35 +10,32 @@ import (
 	"strings"
 )
 
-type CfJavaPluginUtilImpl struct {
-}
+type CfJavaPluginUtilImpl struct{}
 
 type CFAppEnv struct {
 	EnvironmentVariables struct {
 		JbpConfigSpringAutoReconfiguration string `json:"JBP_CONFIG_SPRING_AUTO_RECONFIGURATION"`
 		JbpConfigOpenJdkJre                string `json:"JBP_CONFIG_OPEN_JDK_JRE"`
 		JbpConfigComponents                string `json:"JBP_CONFIG_COMPONENTS"`
 	} `json:"environment_variables"`
-	StagingEnvJSON struct {
-	} `json:"staging_env_json"`
+	StagingEnvJSON struct{} `json:"staging_env_json"`
 	RunningEnvJSON struct {
 		CredhubAPI string `json:"CREDHUB_API"`
 	} `json:"running_env_json"`
 	SystemEnvJSON struct {
 		VcapServices struct {
 			FsStorage []struct {
-				Label        string      `json:"label"`
-				Provider     interface{} `json:"provider"`
-				Plan         string      `json:"plan"`
-				Name         string      `json:"name"`
-				Tags         []string    `json:"tags"`
-				InstanceGUID string      `json:"instance_guid"`
-				InstanceName string      `json:"instance_name"`
-				BindingGUID  string      `json:"binding_guid"`
-				BindingName  interface{} `json:"binding_name"`
-				Credentials  struct {
-				} `json:"credentials"`
-				SyslogDrainURL interface{} `json:"syslog_drain_url"`
+				Label          string   `json:"label"`
+				Provider       any      `json:"provider"`
+				Plan           string   `json:"plan"`
+				Name           string   `json:"name"`
+				Tags           []string `json:"tags"`
+				InstanceGUID   string   `json:"instance_guid"`
+				InstanceName   string   `json:"instance_name"`
+				BindingGUID    string   `json:"binding_guid"`
+				BindingName    any      `json:"binding_name"`
+				Credentials    struct{} `json:"credentials"`
+				SyslogDrainURL any      `json:"syslog_drain_url"`
 				VolumeMounts   []struct {
 					ContainerDir string `json:"container_dir"`
 					Mode         string `json:"mode"`
@@ -53,16 +50,16 @@ type CFAppEnv struct {
 			Limits struct {
 				Fds int `json:"fds"`
 			} `json:"limits"`
-			ApplicationName  string      `json:"application_name"`
-			ApplicationUris  []string    `json:"application_uris"`
-			Name             string      `json:"name"`
-			SpaceName        string      `json:"space_name"`
-			SpaceID          string      `json:"space_id"`
-			OrganizationID   string      `json:"organization_id"`
-			OrganizationName string      `json:"organization_name"`
-			Uris             []string    `json:"uris"`
-			Users            interface{} `json:"users"`
-			ApplicationID    string      `json:"application_id"`
+			ApplicationName  string   `json:"application_name"`
+			ApplicationUris  []string `json:"application_uris"`
+			Name             string   `json:"name"`
+			SpaceName        string   `json:"space_name"`
+			SpaceID          string   `json:"space_id"`
+			OrganizationID   string   `json:"organization_id"`
+			OrganizationName string   `json:"organization_name"`
+			Uris             []string `json:"uris"`
+			Users            any      `json:"users"`
+			ApplicationID    string   `json:"application_id"`
 		} `json:"VCAP_APPLICATION"`
 	} `json:"application_env_json"`
 }
@@ -78,7 +75,6 @@ func readAppEnv(app string) ([]byte, error) {
 		return nil, err
 	}
 	return env, nil
-
 }
 
 func checkUserPathAvailability(app string, path string) (bool, error) {
@@ -119,6 +115,7 @@ func (checker CfJavaPluginUtilImpl) FindReasonForAccessError(app string) string
 	matches := FuzzySearch(app, appNames, 1)
 	return "Could not find " + app + ". Did you mean " + matches[0] + "?"
 }
+
 func (checker CfJavaPluginUtilImpl) CheckRequiredTools(app string) (bool, error) {
 	guid, err := exec.Command("cf", "app", app, "--guid").Output()
 	if err != nil {
@@ -128,13 +125,13 @@ func (checker CfJavaPluginUtilImpl) CheckRequiredTools(app string) (bool, error)
 	if err != nil {
 		return false, err
 	}
-	var result map[string]interface{}
+	var result map[string]any
 	json.Unmarshal([]byte(output), &result)
 
 	if enabled, ok := result["enabled"].(bool); !ok || !enabled {
 		return false, errors.New("ssh is not enabled for app: '" + app + "', please run below 2 shell commands to enable ssh and try again(please note application should be restarted before take effect):\ncf enable-ssh " + app + "\ncf restart " + app)
 	}
-	
+
 	return true, nil
 }
 
@@ -195,10 +192,8 @@ func (checker CfJavaPluginUtilImpl) CopyOverCat(args []string, src string, dest
 func (checker CfJavaPluginUtilImpl) DeleteRemoteFile(args []string, path string) error {
 	args = append(args, "rm -fr "+path)
 	_, err := exec.Command("cf", args...).Output()
-
 	if err != nil {
 		return errors.New("error occured while removing dump file generated")
-
 	}
 
 	return nil
@@ -217,30 +212,28 @@ func (checker CfJavaPluginUtilImpl) FindFile(args []string, fullpath string, fsp
 
 	args = append(args, cmd)
 	output, err := exec.Command("cf", args...).Output()
-
 	if err != nil {
 		return "", errors.New("error while checking the generated file")
 	}
 
 	return strings.Trim(string(output[:]), "\n"), nil
-
 }
 
 func (checker CfJavaPluginUtilImpl) ListFiles(args []string, path string) ([]string, error) {
 	cmd := "ls " + path
 	args = append(args, cmd)
 	output, err := exec.Command("cf", args...).Output()
-
 	if err != nil {
 		return nil, errors.New("error occured while listing files: " + string(output[:]))
 	}
 	files := strings.Split(strings.Trim(string(output[:]), "\n"), "\n")
 	// filter all empty strings
-	for i := 0; i < len(files); i++ {
-		if len(files[i]) == 0 {
-			files = append(files[:i], files[i+1:]...)
-			i--
+	j := 0
+	for _, s := range files {
+		if s != "" {
+			files[j] = s
+			j++
 		}
 	}
-	return files, nil
+	return files[:j], nil
 }