From 9744ad47e3d517604255c95963816cc6cd5b2913 Mon Sep 17 00:00:00 2001 From: Chris Palmer Date: Mon, 29 Jan 2024 14:18:49 -0800 Subject: [PATCH] cmd/hello: avoid deprecated apis (#10957) Updates #cleanup Signed-off-by: Chris Palmer --- cmd/hello/hello.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/cmd/hello/hello.go b/cmd/hello/hello.go index de864878e..e4b0ca827 100644 --- a/cmd/hello/hello.go +++ b/cmd/hello/hello.go @@ -31,10 +31,12 @@ var ( //go:embed hello.tmpl.html var embeddedTemplate string +var localClient tailscale.LocalClient + func main() { flag.Parse() if *testIP != "" { - res, err := tailscale.WhoIs(context.Background(), *testIP) + res, err := localClient.WhoIs(context.Background(), *testIP) if err != nil { log.Fatal(err) } @@ -76,7 +78,7 @@ func main() { GetCertificate: func(hi *tls.ClientHelloInfo) (*tls.Certificate, error) { switch hi.ServerName { case "hello.ts.net": - return tailscale.GetCertificate(hi) + return localClient.GetCertificate(hi) case "hello.ipn.dev": c, err := tls.LoadX509KeyPair( "/etc/hello/hello.ipn.dev.crt", @@ -170,7 +172,7 @@ func root(w http.ResponseWriter, r *http.Request) { return } - who, err := tailscale.WhoIs(r.Context(), r.RemoteAddr) + who, err := localClient.WhoIs(r.Context(), r.RemoteAddr) var data tmplData if err != nil { if devMode() {