Use maps.Clone more

There is a slight functional change here that may not be safe:
 - before this patch, if the source map is nil, the destination map
   will be empty (but non-nil);
 - after this patch, the destination map is nil if the source one is.

Practically, it may or may not matter, as reading from the nil map
is ok, and only changing it is not (will result in panic).

Signed-off-by: Kir Kolyshkin <[email protected]>

Author: kolyshkin

libpod/container.go

@@ -7,6 +7,7 @@ import (
 	"errors"
 	"fmt"
 	"io"
+	"maps"
 	"net"
 	"os"
 	"strings"
@@ -624,13 +625,9 @@ func (c *Container) Stdin() bool {
 	return c.config.Stdin
 }
 
-// Labels returns the container's labels
+// Labels returns the container's labels.
 func (c *Container) Labels() map[string]string {
-	labels := make(map[string]string)
-	for key, value := range c.config.Labels {
-		labels[key] = value
-	}
-	return labels
+	return maps.Clone(c.config.Labels)
 }
 
 // StopSignal is the signal that will be used to stop the container
@@ -1038,13 +1035,7 @@ func (c *Container) BindMounts() (map[string]string, error) {
 		}
 	}
 
-	newMap := make(map[string]string, len(c.state.BindMounts))
-
-	for key, val := range c.state.BindMounts {
-		newMap[key] = val
-	}
-
-	return newMap, nil
+	return maps.Clone(c.state.BindMounts), nil
 }
 
 // StoppedByUser returns whether the container was last stopped by an explicit

libpod/options.go

@@ -694,17 +694,14 @@ func (r *Runtime) WithPod(pod *Pod) CtrCreateOption {
 	}
 }
 
-// WithLabels adds labels to the container.
+// WithLabels sets the container's labels.
 func WithLabels(labels map[string]string) CtrCreateOption {
 	return func(ctr *Container) error {
 		if ctr.valid {
 			return define.ErrCtrFinalized
 		}
 
-		ctr.config.Labels = make(map[string]string)
-		for key, value := range labels {
-			ctr.config.Labels[key] = value
-		}
+		ctr.config.Labels = maps.Clone(labels)
 
 		return nil
 	}
@@ -1619,10 +1616,7 @@ func WithVolumeLabels(labels map[string]string) VolumeCreateOption {
 			return define.ErrVolumeFinalized
 		}
 
-		volume.config.Labels = make(map[string]string)
-		for key, value := range labels {
-			volume.config.Labels[key] = value
-		}
+		volume.config.Labels = maps.Clone(labels)
 
 		return nil
 	}
@@ -1647,10 +1641,7 @@ func WithVolumeOptions(options map[string]string) VolumeCreateOption {
 			return define.ErrVolumeFinalized
 		}
 
-		volume.config.Options = make(map[string]string)
-		for key, value := range options {
-			volume.config.Options[key] = value
-		}
+		volume.config.Options = maps.Clone(options)
 
 		return nil
 	}
@@ -2018,10 +2009,7 @@ func WithPodLabels(labels map[string]string) PodCreateOption {
 			return define.ErrPodFinalized
 		}
 
-		pod.config.Labels = make(map[string]string)
-		for key, value := range labels {
-			pod.config.Labels[key] = value
-		}
+		pod.config.Labels = maps.Clone(labels)
 
 		return nil
 	}

libpod/pod.go

@@ -5,6 +5,7 @@ package libpod
 import (
 	"errors"
 	"fmt"
+	"maps"
 	"sort"
 	"strings"
 	"time"
@@ -285,12 +286,7 @@ func (p *Pod) VolumesFrom() []string {
 
 // Labels returns the pod's labels
 func (p *Pod) Labels() map[string]string {
-	labels := make(map[string]string)
-	for key, value := range p.config.Labels {
-		labels[key] = value
-	}
-
-	return labels
+	return maps.Clone(p.config.Labels)
 }
 
 // CreatedTime gets the time when the pod was created

libpod/volume.go

@@ -5,6 +5,7 @@ package libpod
 import (
 	"fmt"
 	"io"
+	"maps"
 	"time"
 
 	"github.com/containers/podman/v5/libpod/define"
@@ -136,13 +137,9 @@ func (v *Volume) Scope() string {
 	return "local"
 }
 
-// Labels returns the volume's labels
+// Labels returns the volume's labels.
 func (v *Volume) Labels() map[string]string {
-	labels := make(map[string]string)
-	for key, value := range v.config.Labels {
-		labels[key] = value
-	}
-	return labels
+	return maps.Clone(v.config.Labels)
 }
 
 // MountPoint returns the volume's mountpoint on the host
@@ -180,13 +177,9 @@ func (v *Volume) mountPoint() string {
 	return v.config.MountPoint
 }
 
-// Options return the volume's options
+// Options return the volume's options.
 func (v *Volume) Options() map[string]string {
-	options := make(map[string]string)
-	for k, v := range v.config.Options {
-		options[k] = v
-	}
-	return options
+	return maps.Clone(v.config.Options)
 }
 
 // Anonymous returns whether this volume is anonymous. Anonymous volumes were

libpod/volume_inspect.go

@@ -4,6 +4,7 @@ package libpod
 
 import (
 	"fmt"
+	"maps"
 
 	"github.com/containers/podman/v5/libpod/define"
 	pluginapi "github.com/docker/go-plugins-helpers/volume"
@@ -51,15 +52,9 @@ func (v *Volume) Inspect() (*define.InspectVolumeData, error) {
 	data.Name = v.config.Name
 	data.Driver = v.config.Driver
 	data.CreatedAt = v.config.CreatedTime
-	data.Labels = make(map[string]string)
-	for k, v := range v.config.Labels {
-		data.Labels[k] = v
-	}
+	data.Labels = maps.Clone(v.config.Labels)
 	data.Scope = v.Scope()
-	data.Options = make(map[string]string)
-	for k, v := range v.config.Options {
-		data.Options[k] = v
-	}
+	data.Options = maps.Clone(v.config.Options)
 	data.UID = v.uid()
 	data.GID = v.gid()
 	data.Anonymous = v.config.IsAnon

test/testvol/main.go

@@ -153,11 +153,8 @@ func (d *DirDriver) Create(opts *volume.CreateRequest) error {
 	newVol := new(dirVol)
 	newVol.name = opts.Name
 	newVol.mounts = make(map[string]bool)
-	newVol.options = make(map[string]string)
+	newVol.options = maps.Clone(opts.Options)
 	newVol.createTime = time.Now()
-	for k, v := range opts.Options {
-		newVol.options[k] = v
-	}
 
 	volPath := filepath.Join(d.volumesPath, opts.Name)
 	if err := os.Mkdir(volPath, 0755); err != nil {