client: Deep Copy HostVolumeConfig map

hashicorp · Jul 25, 2019 · 5935e7a · 5935e7a
1 parent 56a53d6
commit 5935e7a
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/client/config/config.go b/client/config/config.go
@@ -232,6 +232,7 @@ func (c *Config) Copy() *Config {
 	nc.Node = nc.Node.Copy()
 	nc.Servers = helper.CopySliceString(nc.Servers)
 	nc.Options = helper.CopyMapStringString(nc.Options)
+	nc.HostVolumes = structs.CopyMapStringClientHostVolumeConfig(nc.HostVolumes)
 	nc.ConsulConfig = c.ConsulConfig.Copy()
 	nc.VaultConfig = c.VaultConfig.Copy()
 	return nc

diff --git a/nomad/structs/volumes.go b/nomad/structs/volumes.go
@@ -27,6 +27,19 @@ func (p *ClientHostVolumeConfig) Copy() *ClientHostVolumeConfig {
 	return c
 }
 
+func CopyMapStringClientHostVolumeConfig(m map[string]*ClientHostVolumeConfig) map[string]*ClientHostVolumeConfig {
+	if m == nil {
+		return nil
+	}
+
+	nm := make(map[string]*ClientHostVolumeConfig, len(m))
+	for k, v := range m {
+		nm[k] = v.Copy()
+	}
+
+	return nm
+}
+
 func HostVolumeSliceMerge(a, b []*ClientHostVolumeConfig) []*ClientHostVolumeConfig {
 	n := make([]*ClientHostVolumeConfig, len(a))
 	seenKeys := make(map[string]struct{}, len(a))