WIPpercy/movelocalapi

Signed-off-by: Percy Wegmann <percy@tailscale.com>

8 files changed, 20 insertions, 12 deletions

diff --git a/client/systray/systray.go b/client/systray/systray.go
index de2a37d8d..9e7765833 100644
--- a/client/systray/systray.go
+++ b/client/systray/systray.go
@@ -26,9 +26,9 @@ import (
 	"github.com/atotto/clipboard"
 	dbus "github.com/godbus/dbus/v5"
 	"github.com/toqueteos/webbrowser"
-	"tailscale.com/client/tailscale"
 	"tailscale.com/ipn"
 	"tailscale.com/ipn/ipnstate"
+	"tailscale.com/localclient/tailscale"
 	"tailscale.com/tailcfg"
 	"tailscale.com/util/slicesx"
 	"tailscale.com/util/stringsx"
diff --git a/client/tailscale/dns.go b/client/tailscale/dns.go
index f198742b3..950d122db 100644
--- a/client/tailscale/dns.go
+++ b/client/tailscale/dns.go
@@ -12,7 +12,7 @@ import (
 	"fmt"
 	"net/http"
 
-	"tailscale.com/client/tailscale/apitype"
+	"tailscale.com/localclient/tailscale/apitype"
 )
 
 // DNSNameServers is returned when retrieving the list of nameservers.
diff --git a/client/tailscale/example/servetls/servetls.go b/client/tailscale/example/servetls/servetls.go
index f48e90d16..4793be5d7 100644
--- a/client/tailscale/example/servetls/servetls.go
+++ b/client/tailscale/example/servetls/servetls.go
@@ -11,7 +11,7 @@ import (
 	"log"
 	"net/http"
 
-	"tailscale.com/client/tailscale"
+	"tailscale.com/localclient/tailscale"
 )
 
 func main() {
diff --git a/client/tailscale/localclient_stub.go b/client/tailscale/localclient_stub.go
new file mode 100644
index 000000000..61f6a30b0
--- /dev/null
+++ b/client/tailscale/localclient_stub.go
@@ -0,0 +1,7 @@
+// Copyright (c) Tailscale Inc & AUTHORS
+// SPDX-License-Identifier: BSD-3-Clause
+
+package tailscale
+
+// LocalClient has moved to tailscale.com/localclient/tailscale.
+type LocalClient struct{}
diff --git a/client/tailscale/tailscale.go b/client/tailscale/tailscale.go
index 8533b4712..b9c54da5b 100644
--- a/client/tailscale/tailscale.go
+++ b/client/tailscale/tailscale.go
@@ -3,11 +3,10 @@
 
 //go:build go1.19
 
-// Package tailscale contains Go clients for the Tailscale LocalAPI and
-// Tailscale control plane API.
+// Package tailscale contains a Go client for the Tailscale control plane API.
 //
-// Warning: this package is in development and makes no API compatibility
-// promises as of 2022-04-29. It is subject to change at any time.
+// Deprecated: This package is no longer maintained. Use
+// tailscale.com/client/tailscale/v2 instead.
 package tailscale
 
 import (
@@ -36,6 +35,8 @@ const maxReadSize = 10 << 20
 //
 // Use NewClient to instantiate one. Exported fields should be set before
 // the client is used and not changed thereafter.
+//
+// Deprecated: use tailscale.com/client/tailscale/v2 instead.
 type Client struct {
 	// tailnet is the globally unique identifier for a Tailscale network, such
 	// as "example.com" or "user@gmail.com".
diff --git a/client/web/auth.go b/client/web/auth.go
index 8b195a417..728961d40 100644
--- a/client/web/auth.go
+++ b/client/web/auth.go
@@ -15,8 +15,8 @@ import (
 	"strings"
 	"time"
 
-	"tailscale.com/client/tailscale/apitype"
 	"tailscale.com/ipn/ipnstate"
+	"tailscale.com/localclient/tailscale/apitype"
 	"tailscale.com/tailcfg"
 )
 
diff --git a/client/web/web.go b/client/web/web.go
index 3a7feea40..a245e24ca 100644
--- a/client/web/web.go
+++ b/client/web/web.go
@@ -22,8 +22,6 @@ import (
 	"time"
 
 	"github.com/gorilla/csrf"
-	"tailscale.com/client/tailscale"
-	"tailscale.com/client/tailscale/apitype"
 	"tailscale.com/clientupdate"
 	"tailscale.com/envknob"
 	"tailscale.com/envknob/featureknob"
@@ -31,6 +29,8 @@ import (
 	"tailscale.com/ipn"
 	"tailscale.com/ipn/ipnstate"
 	"tailscale.com/licenses"
+	"tailscale.com/localclient/tailscale"
+	"tailscale.com/localclient/tailscale/apitype"
 	"tailscale.com/net/netutil"
 	"tailscale.com/net/tsaddr"
 	"tailscale.com/tailcfg"
diff --git a/client/web/web_test.go b/client/web/web_test.go
index 3c5543c12..217c449da 100644
--- a/client/web/web_test.go
+++ b/client/web/web_test.go
@@ -20,10 +20,10 @@ import (
 	"time"
 
 	"github.com/google/go-cmp/cmp"
-	"tailscale.com/client/tailscale"
-	"tailscale.com/client/tailscale/apitype"
 	"tailscale.com/ipn"
 	"tailscale.com/ipn/ipnstate"
+	"tailscale.com/localclient/tailscale"
+	"tailscale.com/localclient/tailscale/apitype"
 	"tailscale.com/net/memnet"
 	"tailscale.com/tailcfg"
 	"tailscale.com/types/views"