Merge pull request #27017 from Luap99/go-1.24

Update to go 1.24

Author: openshift-merge-bot[bot]

cmd/podman/common/build.go

@@ -4,6 +4,7 @@ import (
 	"errors"
 	"fmt"
 	"io"
+	"maps"
 	"os"
 	"path/filepath"
 	"strconv"
@@ -337,9 +338,7 @@ func buildFlagsWrapperToOptions(c *cobra.Command, contextDir string, flags *Buil
 			if err != nil {
 				return nil, err
 			}
-			for name, val := range fargs {
-				args[name] = val
-			}
+			maps.Copy(args, fargs)
 		}
 	}
 	if c.Flag("build-arg").Changed {

cmd/podman/common/completion.go

@@ -1365,7 +1365,7 @@ func convertFormatSuggestions(suggestions []formatSuggestion) []string {
 // This function will only work for pointer to structs other types are not supported.
 // When "{{." is typed the field and method names of the given struct will be completed.
 // This also works recursive for nested structs.
-func AutocompleteFormat(o interface{}) func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
+func AutocompleteFormat(o any) func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
 	// this function provides shell completion for go templates
 	return func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
 		// autocomplete json when nothing or json is typed
@@ -1454,7 +1454,7 @@ func AutocompleteFormat(o interface{}) func(cmd *cobra.Command, args []string, t
 	}
 }
 
-func getEntityType(cmd *cobra.Command, args []string, o interface{}) interface{} {
+func getEntityType(cmd *cobra.Command, args []string, o any) any {
 	// container logic
 	if containers, _ := getContainers(cmd, args[0], completeDefault); len(containers) > 0 {
 		return &define.InspectContainerData{}

cmd/podman/containers/port.go

@@ -125,8 +125,7 @@ func port(_ *cobra.Command, args []string) error {
 			if hostIP == "" {
 				hostIP = "0.0.0.0"
 			}
-			protocols := strings.Split(v.Protocol, ",")
-			for _, protocol := range protocols {
+			for protocol := range strings.SplitSeq(v.Protocol, ",") {
 				// If not searching by port or port/proto, then dump what we see
 				if port == "" {
 					for i := uint16(0); i < v.Range; i++ {

cmd/podman/images/search.go

@@ -212,7 +212,7 @@ func imageSearch(cmd *cobra.Command, args []string) error {
 	return rpt.Execute(searchReport)
 }
 
-func printArbitraryJSON(v interface{}) error {
+func printArbitraryJSON(v any) error {
 	prettyJSON, err := json.MarshalIndent(v, "", "    ")
 	if err != nil {
 		return err

cmd/podman/inspect/inspect.go

@@ -76,7 +76,7 @@ func newInspector(options entities.InspectOptions) (*inspector, error) {
 // inspect inspects the specified container/image names or IDs.
 func (i *inspector) inspect(namesOrIDs []string) error {
 	// data - dumping place for inspection results.
-	var data []interface{}
+	var data []any
 	var errs []error
 	ctx := context.Background()
 
@@ -157,7 +157,7 @@ func (i *inspector) inspect(namesOrIDs []string) error {
 	}
 	// Always print an empty array
 	if data == nil {
-		data = []interface{}{}
+		data = []any{}
 	}
 
 	var err error
@@ -191,8 +191,8 @@ func (i *inspector) inspect(namesOrIDs []string) error {
 	return nil
 }
 
-func (i *inspector) inspectAll(ctx context.Context, namesOrIDs []string) ([]interface{}, []error, error) {
-	var data []interface{}
+func (i *inspector) inspectAll(ctx context.Context, namesOrIDs []string) ([]any, []error, error) {
+	var data []any
 	allErrs := []error{}
 	for _, name := range namesOrIDs {
 		ctrData, errs, err := i.containerEngine.ContainerInspect(ctx, []string{name}, i.options)

cmd/podman/machine/client9p.go

@@ -76,7 +76,7 @@ func client9p(portNum uint32, mountPath string) error {
 		conn    *vsock.Conn
 		retries = 20
 	)
-	for i := 0; i < retries; i++ {
+	for range retries {
 		// Host connects to non-hypervisor processes on the host running the VM.
 		conn, err = vsock.Dial(vsock.Host, portNum, nil)
 		// If errors.Is worked on this error, we could detect non-timeout errors.

cmd/podman/machine/os/manager.go

@@ -89,11 +89,11 @@ func GetDistribution() Distribution {
 
 	l := bufio.NewScanner(f)
 	for l.Scan() {
-		if strings.HasPrefix(l.Text(), "ID=") {
-			dist.Name = strings.TrimPrefix(l.Text(), "ID=")
+		if after, ok := strings.CutPrefix(l.Text(), "ID="); ok {
+			dist.Name = after
 		}
-		if strings.HasPrefix(l.Text(), "VARIANT_ID=") {
-			dist.Variant = strings.Trim(strings.TrimPrefix(l.Text(), "VARIANT_ID="), "\"")
+		if after, ok := strings.CutPrefix(l.Text(), "VARIANT_ID="); ok {
+			dist.Variant = strings.Trim(after, "\"")
 		}
 	}
 	return dist

cmd/podman/main.go

@@ -38,10 +38,10 @@ import (
 
 type logrusLogger struct{}
 
-func (l logrusLogger) Errorf(format string, args ...interface{}) {
+func (l logrusLogger) Errorf(format string, args ...any) {
 	logrus.Errorf(format, args...)
 }
-func (l logrusLogger) Debugf(format string, args ...interface{}) {
+func (l logrusLogger) Debugf(format string, args ...any) {
 	logrus.Debugf(format, args...)
 }
 

cmd/podman/parse/net.go

@@ -39,8 +39,7 @@ func ValidateExtraHost(val string) (string, error) {
 	}
 
 	// Split the hostnames by semicolon and validate each one
-	nameList := strings.Split(names, ";")
-	for _, name := range nameList {
+	for name := range strings.SplitSeq(names, ";") {
 		if len(name) == 0 {
 			return "", fmt.Errorf("hostname in add-host %q is empty", val)
 		}

cmd/podman/quadlet/quadlet.go

@@ -11,11 +11,11 @@ import (
 // logrusLogger implements the logiface.Logger interface using logrus
 type logrusLogger struct{}
 
-func (l logrusLogger) Errorf(format string, args ...interface{}) {
+func (l logrusLogger) Errorf(format string, args ...any) {
 	logrus.Errorf(format, args...)
 }
 
-func (l logrusLogger) Debugf(format string, args ...interface{}) {
+func (l logrusLogger) Debugf(format string, args ...any) {
 	logrus.Debugf(format, args...)
 }