cmd/cloner: use maps.Clone and ptr.To

Updates #cleanup

Signed-off-by: Maisem Ali <maisem@tailscale.com>

cmd/cloner/cloner.go

@@ -126,8 +126,8 @@ func gen(buf *bytes.Buffer, it *codegen.ImportTracker, typ *types.Named) {
 				writef("for i := range dst.%s {", fname)
 				if ptr, isPtr := ft.Elem().(*types.Pointer); isPtr {
 					if _, isBasic := ptr.Elem().Underlying().(*types.Basic); isBasic {
-						writef("\tx := *src.%s[i]", fname)
+						it.Import("tailscale.com/types/ptr")
-						writef("\tdst.%s[i] = &x", fname)
+						writef("\tdst.%s[i] = ptr.To(*src.%s[i])", fname, fname)
 					} else {
 						writef("\tdst.%s[i] = src.%s[i].Clone()", fname, fname)
 					}
@@ -145,41 +145,41 @@ func gen(buf *bytes.Buffer, it *codegen.ImportTracker, typ *types.Named) {
 				writef("dst.%s = src.%s.Clone()", fname, fname)
 				continue
 			}
-			n := it.QualifiedName(ft.Elem())
+			it.Import("tailscale.com/types/ptr")
 			writef("if dst.%s != nil {", fname)
-			writef("\tdst.%s = new(%s)", fname, n)
+			writef("\tdst.%s = ptr.To(*src.%s)", fname, fname)
-			writef("\t*dst.%s = *src.%s", fname, fname)
 			if codegen.ContainsPointers(ft.Elem()) {
 				writef("\t" + `panic("TODO pointers in pointers")`)
 			}
 			writef("}")
 		case *types.Map:
 			elem := ft.Elem()
-			writef("if dst.%s != nil {", fname)
-			writef("\tdst.%s = map[%s]%s{}", fname, it.QualifiedName(ft.Key()), it.QualifiedName(elem))
 			if sliceType, isSlice := elem.(*types.Slice); isSlice {
 				n := it.QualifiedName(sliceType.Elem())
+				writef("if dst.%s != nil {", fname)
+				writef("\tdst.%s = map[%s]%s{}", fname, it.QualifiedName(ft.Key()), it.QualifiedName(elem))
 				writef("\tfor k := range src.%s {", fname)
 				// use zero-length slice instead of nil to ensure
 				// the key is always copied.
 				writef("\t\tdst.%s[k] = append([]%s{}, src.%s[k]...)", fname, n, fname)
 				writef("\t}")
+				writef("}")
 			} else if codegen.ContainsPointers(elem) {
+				writef("if dst.%s != nil {", fname)
+				writef("\tdst.%s = map[%s]%s{}", fname, it.QualifiedName(ft.Key()), it.QualifiedName(elem))
 				writef("\tfor k, v := range src.%s {", fname)
 				switch elem.(type) {
 				case *types.Pointer:
 					writef("\t\tdst.%s[k] = v.Clone()", fname)
 				default:
-					writef("\t\tv2 := v.Clone()")
+					writef("\t\tdst.%s[k] = *(v.Clone())", fname)
-					writef("\t\tdst.%s[k] = *v2", fname)
 				}
 				writef("\t}")
+				writef("}")
 			} else {
-				writef("\tfor k, v := range src.%s {", fname)
+				it.Import("maps")
-				writef("\t\tdst.%s[k] = v", fname)
+				writef("\tdst.%s = maps.Clone(src.%s)", fname, fname)
-				writef("\t}")
 			}
-			writef("}")
 		default:
 			writef(`panic("TODO: %s (%T)")`, fname, ft)
 		}

cmd/derper/depaware.txt

@@ -240,7 +240,7 @@ tailscale.com/cmd/derper dependencies: (generated by github.com/tailscale/depawa
         io/ioutil                                                    from github.com/mitchellh/go-ps+
         log                                                          from expvar+
         log/internal                                                 from log
-        maps                                                         from tailscale.com/types/views
+        maps                                                         from tailscale.com/types/views+
         math                                                         from compress/flate+
         math/big                                                     from crypto/dsa+
         math/bits                                                    from compress/flate+

cmd/tailscale/depaware.txt

@@ -256,7 +256,7 @@ tailscale.com/cmd/tailscale dependencies: (generated by github.com/tailscale/dep
         io/ioutil                                                    from golang.org/x/sys/cpu+
         log                                                          from expvar+
         log/internal                                                 from log
-        maps                                                         from tailscale.com/types/views
+        maps                                                         from tailscale.com/types/views+
         math                                                         from compress/flate+
         math/big                                                     from crypto/dsa+
         math/bits                                                    from compress/flate+

cmd/tailscaled/depaware.txt

@@ -466,7 +466,7 @@ tailscale.com/cmd/tailscaled dependencies: (generated by github.com/tailscale/de
         log                                                          from expvar+
         log/internal                                                 from log
   LD    log/syslog                                                   from tailscale.com/ssh/tailssh
-        maps                                                         from tailscale.com/types/views
+        maps                                                         from tailscale.com/types/views+
         math                                                         from compress/flate+
         math/big                                                     from crypto/dsa+
         math/bits                                                    from compress/flate+

cmd/viewer/tests/tests_clone.go

@@ -6,7 +6,10 @@
 package tests
 
 import (
+	"maps"
 	"net/netip"
+
+	"tailscale.com/types/ptr"
 )
 
 // Clone makes a deep copy of StructWithPtrs.
@@ -18,12 +21,10 @@ func (src *StructWithPtrs) Clone() *StructWithPtrs {
 	dst := new(StructWithPtrs)
 	*dst = *src
 	if dst.Value != nil {
-		dst.Value = new(StructWithoutPtrs)
+		dst.Value = ptr.To(*src.Value)
-		*dst.Value = *src.Value
 	}
 	if dst.Int != nil {
-		dst.Int = new(int)
+		dst.Int = ptr.To(*src.Int)
-		*dst.Int = *src.Int
 	}
 	return dst
 }
@@ -60,12 +61,7 @@ func (src *Map) Clone() *Map {
 	}
 	dst := new(Map)
 	*dst = *src
-	if dst.Int != nil {
+	dst.Int = maps.Clone(src.Int)
-		dst.Int = map[string]int{}
-		for k, v := range src.Int {
-			dst.Int[k] = v
-		}
-	}
 	if dst.SliceInt != nil {
 		dst.SliceInt = map[string][]int{}
 		for k := range src.SliceInt {
@@ -84,12 +80,7 @@ func (src *Map) Clone() *Map {
 			dst.StructPtrWithoutPtr[k] = v.Clone()
 		}
 	}
-	if dst.StructWithoutPtr != nil {
+	dst.StructWithoutPtr = maps.Clone(src.StructWithoutPtr)
-		dst.StructWithoutPtr = map[string]StructWithoutPtrs{}
-		for k, v := range src.StructWithoutPtr {
-			dst.StructWithoutPtr[k] = v
-		}
-	}
 	if dst.SlicesWithPtrs != nil {
 		dst.SlicesWithPtrs = map[string][]*StructWithPtrs{}
 		for k := range src.SlicesWithPtrs {
@@ -102,35 +93,19 @@ func (src *Map) Clone() *Map {
 			dst.SlicesWithoutPtrs[k] = append([]*StructWithoutPtrs{}, src.SlicesWithoutPtrs[k]...)
 		}
 	}
-	if dst.StructWithoutPtrKey != nil {
+	dst.StructWithoutPtrKey = maps.Clone(src.StructWithoutPtrKey)
-		dst.StructWithoutPtrKey = map[StructWithoutPtrs]int{}
-		for k, v := range src.StructWithoutPtrKey {
-			dst.StructWithoutPtrKey[k] = v
-		}
-	}
 	if dst.SliceIntPtr != nil {
 		dst.SliceIntPtr = map[string][]*int{}
 		for k := range src.SliceIntPtr {
 			dst.SliceIntPtr[k] = append([]*int{}, src.SliceIntPtr[k]...)
 		}
 	}
-	if dst.PointerKey != nil {
+	dst.PointerKey = maps.Clone(src.PointerKey)
-		dst.PointerKey = map[*string]int{}
+	dst.StructWithPtrKey = maps.Clone(src.StructWithPtrKey)
-		for k, v := range src.PointerKey {
-			dst.PointerKey[k] = v
-		}
-	}
-	if dst.StructWithPtrKey != nil {
-		dst.StructWithPtrKey = map[StructWithPtrs]int{}
-		for k, v := range src.StructWithPtrKey {
-			dst.StructWithPtrKey[k] = v
-		}
-	}
 	if dst.StructWithPtr != nil {
 		dst.StructWithPtr = map[string]StructWithPtrs{}
 		for k, v := range src.StructWithPtr {
-			v2 := v.Clone()
+			dst.StructWithPtr[k] = *(v.Clone())
-			dst.StructWithPtr[k] = *v2
 		}
 	}
 	return dst
@@ -175,8 +150,7 @@ func (src *StructWithSlices) Clone() *StructWithSlices {
 	}
 	dst.Ints = make([]*int, len(src.Ints))
 	for i := range dst.Ints {
-		x := *src.Ints[i]
+		dst.Ints[i] = ptr.To(*src.Ints[i])
-		dst.Ints[i] = &x
 	}
 	dst.Slice = append(src.Slice[:0:0], src.Slice...)
 	dst.Prefixes = append(src.Prefixes[:0:0], src.Prefixes...)

ipn/ipn_clone.go

@@ -6,6 +6,7 @@
 package ipn
 
 import (
+	"maps"
 	"net/netip"
 
 	"tailscale.com/tailcfg"
@@ -73,12 +74,7 @@ func (src *ServeConfig) Clone() *ServeConfig {
 			dst.Web[k] = v.Clone()
 		}
 	}
-	if dst.AllowFunnel != nil {
+	dst.AllowFunnel = maps.Clone(src.AllowFunnel)
-		dst.AllowFunnel = map[HostPort]bool{}
-		for k, v := range src.AllowFunnel {
-			dst.AllowFunnel[k] = v
-		}
-	}
 	return dst
 }
 

tailcfg/tailcfg_clone.go

@@ -6,12 +6,14 @@
 package tailcfg
 
 import (
+	"maps"
 	"net/netip"
 	"time"
 
 	"tailscale.com/types/dnstype"
 	"tailscale.com/types/key"
 	"tailscale.com/types/opt"
+	"tailscale.com/types/ptr"
 	"tailscale.com/types/structs"
 	"tailscale.com/types/tkatype"
 )
@@ -54,17 +56,14 @@ func (src *Node) Clone() *Node {
 	dst.Tags = append(src.Tags[:0:0], src.Tags...)
 	dst.PrimaryRoutes = append(src.PrimaryRoutes[:0:0], src.PrimaryRoutes...)
 	if dst.LastSeen != nil {
-		dst.LastSeen = new(time.Time)
+		dst.LastSeen = ptr.To(*src.LastSeen)
-		*dst.LastSeen = *src.LastSeen
 	}
 	if dst.Online != nil {
-		dst.Online = new(bool)
+		dst.Online = ptr.To(*src.Online)
-		*dst.Online = *src.Online
 	}
 	dst.Capabilities = append(src.Capabilities[:0:0], src.Capabilities...)
 	if dst.SelfNodeV4MasqAddrForThisPeer != nil {
-		dst.SelfNodeV4MasqAddrForThisPeer = new(netip.Addr)
+		dst.SelfNodeV4MasqAddrForThisPeer = ptr.To(*src.SelfNodeV4MasqAddrForThisPeer)
-		*dst.SelfNodeV4MasqAddrForThisPeer = *src.SelfNodeV4MasqAddrForThisPeer
 	}
 	return dst
 }
@@ -118,8 +117,7 @@ func (src *Hostinfo) Clone() *Hostinfo {
 	dst.NetInfo = src.NetInfo.Clone()
 	dst.SSH_HostKeys = append(src.SSH_HostKeys[:0:0], src.SSH_HostKeys...)
 	if dst.Location != nil {
-		dst.Location = new(Location)
+		dst.Location = ptr.To(*src.Location)
-		*dst.Location = *src.Location
 	}
 	return dst
 }
@@ -170,12 +168,7 @@ func (src *NetInfo) Clone() *NetInfo {
 	}
 	dst := new(NetInfo)
 	*dst = *src
-	if dst.DERPLatency != nil {
+	dst.DERPLatency = maps.Clone(src.DERPLatency)
-		dst.DERPLatency = map[string]float64{}
-		for k, v := range src.DERPLatency {
-			dst.DERPLatency[k] = v
-		}
-	}
 	return dst
 }
 
@@ -295,8 +288,7 @@ func (src *RegisterResponseAuth) Clone() *RegisterResponseAuth {
 	dst := new(RegisterResponseAuth)
 	*dst = *src
 	if dst.Oauth2Token != nil {
-		dst.Oauth2Token = new(Oauth2Token)
+		dst.Oauth2Token = ptr.To(*src.Oauth2Token)
-		*dst.Oauth2Token = *src.Oauth2Token
 	}
 	return dst
 }
@@ -322,8 +314,7 @@ func (src *RegisterRequest) Clone() *RegisterRequest {
 	dst.Hostinfo = src.Hostinfo.Clone()
 	dst.NodeKeySignature = append(src.NodeKeySignature[:0:0], src.NodeKeySignature...)
 	if dst.Timestamp != nil {
-		dst.Timestamp = new(time.Time)
+		dst.Timestamp = ptr.To(*src.Timestamp)
-		*dst.Timestamp = *src.Timestamp
 	}
 	dst.DeviceCert = append(src.DeviceCert[:0:0], src.DeviceCert...)
 	dst.Signature = append(src.Signature[:0:0], src.Signature...)
@@ -357,12 +348,7 @@ func (src *DERPHomeParams) Clone() *DERPHomeParams {
 	}
 	dst := new(DERPHomeParams)
 	*dst = *src
-	if dst.RegionScore != nil {
+	dst.RegionScore = maps.Clone(src.RegionScore)
-		dst.RegionScore = map[int]float64{}
-		for k, v := range src.RegionScore {
-			dst.RegionScore[k] = v
-		}
-	}
 	return dst
 }
 
@@ -456,19 +442,13 @@ func (src *SSHRule) Clone() *SSHRule {
 	dst := new(SSHRule)
 	*dst = *src
 	if dst.RuleExpires != nil {
-		dst.RuleExpires = new(time.Time)
+		dst.RuleExpires = ptr.To(*src.RuleExpires)
-		*dst.RuleExpires = *src.RuleExpires
 	}
 	dst.Principals = make([]*SSHPrincipal, len(src.Principals))
 	for i := range dst.Principals {
 		dst.Principals[i] = src.Principals[i].Clone()
 	}
-	if dst.SSHUsers != nil {
+	dst.SSHUsers = maps.Clone(src.SSHUsers)
-		dst.SSHUsers = map[string]string{}
-		for k, v := range src.SSHUsers {
-			dst.SSHUsers[k] = v
-		}
-	}
 	dst.Action = src.Action.Clone()
 	return dst
 }
@@ -491,8 +471,7 @@ func (src *SSHAction) Clone() *SSHAction {
 	*dst = *src
 	dst.Recorders = append(src.Recorders[:0:0], src.Recorders...)
 	if dst.OnRecordingFailure != nil {
-		dst.OnRecordingFailure = new(SSHRecorderFailureAction)
+		dst.OnRecordingFailure = ptr.To(*src.OnRecordingFailure)
-		*dst.OnRecordingFailure = *src.OnRecordingFailure
 	}
 	return dst
 }

wgengine/wgcfg/wgcfg_clone.go

@@ -11,6 +11,7 @@ import (
 	"tailscale.com/tailcfg"
 	"tailscale.com/types/key"
 	"tailscale.com/types/logid"
+	"tailscale.com/types/ptr"
 )
 
 // Clone makes a deep copy of Config.
@@ -55,8 +56,7 @@ func (src *Peer) Clone() *Peer {
 	*dst = *src
 	dst.AllowedIPs = append(src.AllowedIPs[:0:0], src.AllowedIPs...)
 	if dst.V4MasqAddr != nil {
-		dst.V4MasqAddr = new(netip.Addr)
+		dst.V4MasqAddr = ptr.To(*src.V4MasqAddr)
-		*dst.V4MasqAddr = *src.V4MasqAddr
 	}
 	return dst
 }