From 9af27ba8295e91262fea12dd39c90d077c0a741c Mon Sep 17 00:00:00 2001 From: Joe Tsai Date: Thu, 14 Oct 2021 12:51:28 -0700 Subject: [PATCH] cmd/cloner: mangle "go:generate" in cloner.go The "go generate" command blindly looks for "//go:generate" anywhere in the file regardless of whether it is truly a comment. Prevent this false positive in cloner.go by mangling the string to look less like "//go:generate". Signed-off-by: Joe Tsai --- cmd/cloner/cloner.go | 2 +- ipn/prefs_clone.go | 4 ++-- net/dnsfallback/dns-fallback-servers.json | 8 ++++---- tailcfg/tailcfg_clone.go | 4 ++-- types/dnstype/dnstype_clone.go | 4 ++-- types/persist/persist_clone.go | 4 ++-- wgengine/filter/match_clone.go | 4 ++-- wgengine/wgcfg/clone.go | 4 ++-- 8 files changed, 17 insertions(+), 17 deletions(-) diff --git a/cmd/cloner/cloner.go b/cmd/cloner/cloner.go index 91ed22582..f913c5cde 100644 --- a/cmd/cloner/cloner.go +++ b/cmd/cloner/cloner.go @@ -131,7 +131,7 @@ const header = `// Copyright (c) 2020 Tailscale Inc & AUTHORS All rights reserve // license that can be found in the LICENSE file. // Code generated by tailscale.com/cmd/cloner; DO NOT EDIT. -//go:generate go run tailscale.com/cmd/cloner %s +//` + `go:generate` + ` go run tailscale.com/cmd/cloner %s package %s diff --git a/ipn/prefs_clone.go b/ipn/prefs_clone.go index e8a5dd8e7..ef6d5f462 100644 --- a/ipn/prefs_clone.go +++ b/ipn/prefs_clone.go @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. -// Code generated by the following command; DO NOT EDIT. -// tailscale.com/cmd/cloner -type Prefs +// Code generated by tailscale.com/cmd/cloner; DO NOT EDIT. +//go:generate go run tailscale.com/cmd/cloner -type=Prefs -output=prefs_clone.go package ipn diff --git a/net/dnsfallback/dns-fallback-servers.json b/net/dnsfallback/dns-fallback-servers.json index be63154c7..f4a904c0a 100644 --- a/net/dnsfallback/dns-fallback-servers.json +++ b/net/dnsfallback/dns-fallback-servers.json @@ -41,11 +41,11 @@ "RegionName": "r11", "Nodes": [ { - "Name": "11b", + "Name": "11a", "RegionID": 11, - "HostName": "derp11b.tailscale.com", - "IPv4": "15.228.50.175", - "IPv6": "2600:1f1e:26e:2f01:fca6:2392:ea86:c768" + "HostName": "derp11.tailscale.com", + "IPv4": "18.230.97.74", + "IPv6": "2600:1f1e:ee4:5611:ec5c:1736:d43b:a454" } ] }, diff --git a/tailcfg/tailcfg_clone.go b/tailcfg/tailcfg_clone.go index d906a6dff..ad5758afb 100644 --- a/tailcfg/tailcfg_clone.go +++ b/tailcfg/tailcfg_clone.go @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. -// Code generated by the following command; DO NOT EDIT. -// tailscale.com/cmd/cloner -type User,Node,Hostinfo,NetInfo,Login,DNSConfig,RegisterResponse,DERPRegion,DERPMap,DERPNode +// Code generated by tailscale.com/cmd/cloner; DO NOT EDIT. +//go:generate go run tailscale.com/cmd/cloner -type=User,Node,Hostinfo,NetInfo,Login,DNSConfig,RegisterResponse,DERPRegion,DERPMap,DERPNode -output=tailcfg_clone.go -clonefunc package tailcfg diff --git a/types/dnstype/dnstype_clone.go b/types/dnstype/dnstype_clone.go index 2c0b45a85..c155edb04 100644 --- a/types/dnstype/dnstype_clone.go +++ b/types/dnstype/dnstype_clone.go @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. -// Code generated by the following command; DO NOT EDIT. -// tailscale.com/cmd/cloner -type Resolver +// Code generated by tailscale.com/cmd/cloner; DO NOT EDIT. +//go:generate go run tailscale.com/cmd/cloner -type=Resolver -output=dnstype_clone.go -clonefunc package dnstype diff --git a/types/persist/persist_clone.go b/types/persist/persist_clone.go index 62b34d125..440dacf0a 100644 --- a/types/persist/persist_clone.go +++ b/types/persist/persist_clone.go @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. -// Code generated by the following command; DO NOT EDIT. -// tailscale.com/cmd/cloner -type Persist +// Code generated by tailscale.com/cmd/cloner; DO NOT EDIT. +//go:generate go run tailscale.com/cmd/cloner -type=Persist -output=persist_clone.go package persist diff --git a/wgengine/filter/match_clone.go b/wgengine/filter/match_clone.go index ea5a70254..f47761264 100644 --- a/wgengine/filter/match_clone.go +++ b/wgengine/filter/match_clone.go @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. -// Code generated by the following command; DO NOT EDIT. -// tailscale.com/cmd/cloner -type Match +// Code generated by tailscale.com/cmd/cloner; DO NOT EDIT. +//go:generate go run tailscale.com/cmd/cloner -type=Match -output=match_clone.go package filter diff --git a/wgengine/wgcfg/clone.go b/wgengine/wgcfg/clone.go index ffd5726a1..8cdab2b22 100644 --- a/wgengine/wgcfg/clone.go +++ b/wgengine/wgcfg/clone.go @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. -// Code generated by the following command; DO NOT EDIT. -// tailscale.com/cmd/cloner -type Config,Peer +// Code generated by tailscale.com/cmd/cloner; DO NOT EDIT. +//go:generate go run tailscale.com/cmd/cloner -type=Config,Peer -output=clone.go package wgcfg