diff options
57 files changed, 148 insertions, 126 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" diff --git a/cmd/containerboot/metrics.go b/cmd/containerboot/metrics.go index a8b9222a5..3fff1ca14 100644 --- a/cmd/containerboot/metrics.go +++ b/cmd/containerboot/metrics.go @@ -10,8 +10,8 @@ import ( "io" "net/http" - "tailscale.com/client/tailscale" - "tailscale.com/client/tailscale/apitype" + "tailscale.com/localclient/tailscale" + "tailscale.com/localclient/tailscale/apitype" ) // metrics is a simple metrics HTTP server, if enabled it forwards requests to diff --git a/cmd/containerboot/serve.go b/cmd/containerboot/serve.go index aad22820b..0e974a37e 100644 --- a/cmd/containerboot/serve.go +++ b/cmd/containerboot/serve.go @@ -17,9 +17,9 @@ import ( "time" "github.com/fsnotify/fsnotify" - "tailscale.com/client/tailscale" "tailscale.com/ipn" "tailscale.com/kube/kubetypes" + "tailscale.com/localclient/tailscale" "tailscale.com/types/netmap" ) diff --git a/cmd/containerboot/serve_test.go b/cmd/containerboot/serve_test.go index 4563c52fc..a157d5651 100644 --- a/cmd/containerboot/serve_test.go +++ b/cmd/containerboot/serve_test.go @@ -12,9 +12,9 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "tailscale.com/client/tailscale" "tailscale.com/ipn" "tailscale.com/kube/kubetypes" + "tailscale.com/localclient/tailscale" ) func TestUpdateServeConfig(t *testing.T) { diff --git a/cmd/containerboot/services.go b/cmd/containerboot/services.go index 177cb2d50..8e9c5ed5b 100644 --- a/cmd/containerboot/services.go +++ b/cmd/containerboot/services.go @@ -21,11 +21,11 @@ import ( "time" "github.com/fsnotify/fsnotify" - "tailscale.com/client/tailscale" "tailscale.com/ipn" "tailscale.com/kube/egressservices" "tailscale.com/kube/kubeclient" "tailscale.com/kube/kubetypes" + "tailscale.com/localclient/tailscale" "tailscale.com/syncs" "tailscale.com/tailcfg" "tailscale.com/util/httpm" diff --git a/cmd/containerboot/tailscaled.go b/cmd/containerboot/tailscaled.go index 1ff068b97..35e96a9fd 100644 --- a/cmd/containerboot/tailscaled.go +++ b/cmd/containerboot/tailscaled.go @@ -20,7 +20,7 @@ import ( "time" "github.com/fsnotify/fsnotify" - "tailscale.com/client/tailscale" + "tailscale.com/localclient/tailscale" ) func startTailscaled(ctx context.Context, cfg *settings) (*tailscale.LocalClient, *os.Process, error) { diff --git a/cmd/derper/depaware.txt b/cmd/derper/depaware.txt index 5a39c110e..6c1efd635 100644 --- a/cmd/derper/depaware.txt +++ b/cmd/derper/depaware.txt @@ -53,7 +53,7 @@ tailscale.com/cmd/derper dependencies: (generated by github.com/tailscale/depawa L 💣 github.com/tailscale/netlink/nl from github.com/tailscale/netlink L github.com/vishvananda/netns from github.com/tailscale/netlink+ github.com/x448/float16 from github.com/fxamacker/cbor/v2 - 💣 go4.org/mem from tailscale.com/client/tailscale+ + 💣 go4.org/mem from tailscale.com/derp+ go4.org/netipx from tailscale.com/net/tsaddr W 💣 golang.zx2c4.com/wireguard/windows/tunnel/winipcfg from tailscale.com/net/netmon+ google.golang.org/protobuf/encoding/protodelim from github.com/prometheus/common/expfmt @@ -86,18 +86,18 @@ tailscale.com/cmd/derper dependencies: (generated by github.com/tailscale/depawa google.golang.org/protobuf/types/known/timestamppb from github.com/prometheus/client_golang/prometheus+ tailscale.com from tailscale.com/version 💣 tailscale.com/atomicfile from tailscale.com/cmd/derper+ - tailscale.com/client/tailscale from tailscale.com/derp - tailscale.com/client/tailscale/apitype from tailscale.com/client/tailscale tailscale.com/derp from tailscale.com/cmd/derper+ tailscale.com/derp/derphttp from tailscale.com/cmd/derper tailscale.com/disco from tailscale.com/derp - tailscale.com/drive from tailscale.com/client/tailscale+ - tailscale.com/envknob from tailscale.com/client/tailscale+ + tailscale.com/drive from tailscale.com/ipn+ + tailscale.com/envknob from tailscale.com/derp+ tailscale.com/health from tailscale.com/net/tlsdial+ tailscale.com/hostinfo from tailscale.com/net/netmon+ - tailscale.com/ipn from tailscale.com/client/tailscale - tailscale.com/ipn/ipnstate from tailscale.com/client/tailscale+ + tailscale.com/ipn from tailscale.com/localclient/tailscale + tailscale.com/ipn/ipnstate from tailscale.com/ipn+ tailscale.com/kube/kubetypes from tailscale.com/envknob + tailscale.com/localclient/tailscale from tailscale.com/derp + tailscale.com/localclient/tailscale/apitype from tailscale.com/localclient/tailscale tailscale.com/metrics from tailscale.com/cmd/derper+ tailscale.com/net/bakedroots from tailscale.com/net/tlsdial tailscale.com/net/dnscache from tailscale.com/derp/derphttp @@ -106,7 +106,7 @@ tailscale.com/cmd/derper dependencies: (generated by github.com/tailscale/depawa tailscale.com/net/netknob from tailscale.com/net/netns 💣 tailscale.com/net/netmon from tailscale.com/derp/derphttp+ 💣 tailscale.com/net/netns from tailscale.com/derp/derphttp - tailscale.com/net/netutil from tailscale.com/client/tailscale + tailscale.com/net/netutil from tailscale.com/localclient/tailscale tailscale.com/net/sockstats from tailscale.com/derp/derphttp tailscale.com/net/stun from tailscale.com/net/stunserver tailscale.com/net/stunserver from tailscale.com/cmd/derper @@ -116,11 +116,11 @@ tailscale.com/cmd/derper dependencies: (generated by github.com/tailscale/depawa tailscale.com/net/tsaddr from tailscale.com/ipn+ 💣 tailscale.com/net/tshttpproxy from tailscale.com/derp/derphttp+ tailscale.com/net/wsconn from tailscale.com/cmd/derper - tailscale.com/paths from tailscale.com/client/tailscale - 💣 tailscale.com/safesocket from tailscale.com/client/tailscale + tailscale.com/paths from tailscale.com/localclient/tailscale + 💣 tailscale.com/safesocket from tailscale.com/localclient/tailscale tailscale.com/syncs from tailscale.com/cmd/derper+ - tailscale.com/tailcfg from tailscale.com/client/tailscale+ - tailscale.com/tka from tailscale.com/client/tailscale+ + tailscale.com/tailcfg from tailscale.com/derp+ + tailscale.com/tka from tailscale.com/ipn/ipnstate+ W tailscale.com/tsconst from tailscale.com/net/netmon+ tailscale.com/tstime from tailscale.com/derp+ tailscale.com/tstime/mono from tailscale.com/tstime/rate @@ -131,17 +131,17 @@ tailscale.com/cmd/derper dependencies: (generated by github.com/tailscale/depawa tailscale.com/types/dnstype from tailscale.com/tailcfg+ tailscale.com/types/empty from tailscale.com/ipn tailscale.com/types/ipproto from tailscale.com/tailcfg+ - tailscale.com/types/key from tailscale.com/client/tailscale+ + tailscale.com/types/key from tailscale.com/cmd/derper+ tailscale.com/types/lazy from tailscale.com/version+ tailscale.com/types/logger from tailscale.com/cmd/derper+ tailscale.com/types/netmap from tailscale.com/ipn - tailscale.com/types/opt from tailscale.com/client/tailscale+ + tailscale.com/types/opt from tailscale.com/envknob+ tailscale.com/types/persist from tailscale.com/ipn tailscale.com/types/preftype from tailscale.com/ipn tailscale.com/types/ptr from tailscale.com/hostinfo+ tailscale.com/types/result from tailscale.com/util/lineiter tailscale.com/types/structs from tailscale.com/ipn+ - tailscale.com/types/tkatype from tailscale.com/client/tailscale+ + tailscale.com/types/tkatype from tailscale.com/localclient/tailscale+ tailscale.com/types/views from tailscale.com/ipn+ tailscale.com/util/cibuild from tailscale.com/health tailscale.com/util/clientmetric from tailscale.com/net/netmon+ @@ -152,7 +152,6 @@ tailscale.com/cmd/derper dependencies: (generated by github.com/tailscale/depawa L 💣 tailscale.com/util/dirwalk from tailscale.com/metrics tailscale.com/util/dnsname from tailscale.com/hostinfo+ 💣 tailscale.com/util/hashx from tailscale.com/util/deephash - tailscale.com/util/httpm from tailscale.com/client/tailscale tailscale.com/util/lineiter from tailscale.com/hostinfo+ L tailscale.com/util/linuxfw from tailscale.com/net/netns tailscale.com/util/mak from tailscale.com/health+ diff --git a/cmd/hello/hello.go b/cmd/hello/hello.go index e4b0ca827..2aa77f8f7 100644 --- a/cmd/hello/hello.go +++ b/cmd/hello/hello.go @@ -18,8 +18,8 @@ import ( "strings" "time" - "tailscale.com/client/tailscale" - "tailscale.com/client/tailscale/apitype" + "tailscale.com/localclient/tailscale" + "tailscale.com/localclient/tailscale/apitype" ) var ( diff --git a/cmd/k8s-operator/depaware.txt b/cmd/k8s-operator/depaware.txt index 972dbfc2c..b3144b821 100644 --- a/cmd/k8s-operator/depaware.txt +++ b/cmd/k8s-operator/depaware.txt @@ -232,7 +232,7 @@ tailscale.com/cmd/k8s-operator dependencies: (generated by github.com/tailscale/ go.uber.org/zap/internal/pool from go.uber.org/zap+ go.uber.org/zap/internal/stacktrace from go.uber.org/zap go.uber.org/zap/zapcore from github.com/go-logr/zapr+ - 💣 go4.org/mem from tailscale.com/client/tailscale+ + 💣 go4.org/mem from tailscale.com/control/controlbase+ go4.org/netipx from tailscale.com/ipn/ipnlocal+ W 💣 golang.zx2c4.com/wintun from github.com/tailscale/wireguard-go/tun W 💣 golang.zx2c4.com/wireguard/windows/tunnel/winipcfg from tailscale.com/net/dns+ @@ -777,8 +777,7 @@ tailscale.com/cmd/k8s-operator dependencies: (generated by github.com/tailscale/ tailscale.com from tailscale.com/version tailscale.com/appc from tailscale.com/ipn/ipnlocal 💣 tailscale.com/atomicfile from tailscale.com/ipn+ - tailscale.com/client/tailscale from tailscale.com/client/web+ - tailscale.com/client/tailscale/apitype from tailscale.com/client/tailscale+ + tailscale.com/client/tailscale from tailscale.com/cmd/k8s-operator+ tailscale.com/client/web from tailscale.com/ipn/ipnlocal tailscale.com/clientupdate from tailscale.com/client/web+ LW tailscale.com/clientupdate/distsign from tailscale.com/clientupdate @@ -794,8 +793,8 @@ tailscale.com/cmd/k8s-operator dependencies: (generated by github.com/tailscale/ tailscale.com/doctor/ethtool from tailscale.com/ipn/ipnlocal 💣 tailscale.com/doctor/permissions from tailscale.com/ipn/ipnlocal tailscale.com/doctor/routetable from tailscale.com/ipn/ipnlocal - tailscale.com/drive from tailscale.com/client/tailscale+ - tailscale.com/envknob from tailscale.com/client/tailscale+ + tailscale.com/drive from tailscale.com/ipn+ + tailscale.com/envknob from tailscale.com/client/web+ tailscale.com/envknob/featureknob from tailscale.com/client/web+ tailscale.com/feature from tailscale.com/feature/wakeonlan+ tailscale.com/feature/capture from tailscale.com/feature/condregister @@ -806,11 +805,11 @@ tailscale.com/cmd/k8s-operator dependencies: (generated by github.com/tailscale/ tailscale.com/health/healthmsg from tailscale.com/ipn/ipnlocal tailscale.com/hostinfo from tailscale.com/client/web+ tailscale.com/internal/noiseconn from tailscale.com/control/controlclient - tailscale.com/ipn from tailscale.com/client/tailscale+ + tailscale.com/ipn from tailscale.com/client/web+ tailscale.com/ipn/conffile from tailscale.com/ipn/ipnlocal+ 💣 tailscale.com/ipn/ipnauth from tailscale.com/ipn/ipnlocal+ tailscale.com/ipn/ipnlocal from tailscale.com/ipn/localapi+ - tailscale.com/ipn/ipnstate from tailscale.com/client/tailscale+ + tailscale.com/ipn/ipnstate from tailscale.com/client/web+ tailscale.com/ipn/localapi from tailscale.com/tsnet+ tailscale.com/ipn/policy from tailscale.com/ipn/ipnlocal tailscale.com/ipn/store from tailscale.com/ipn/ipnlocal+ @@ -829,6 +828,8 @@ tailscale.com/cmd/k8s-operator dependencies: (generated by github.com/tailscale/ tailscale.com/kube/kubeclient from tailscale.com/ipn/store/kubestore tailscale.com/kube/kubetypes from tailscale.com/cmd/k8s-operator+ tailscale.com/licenses from tailscale.com/client/web + tailscale.com/localclient/tailscale from tailscale.com/client/web+ + tailscale.com/localclient/tailscale/apitype from tailscale.com/client/tailscale+ tailscale.com/log/filelogger from tailscale.com/logpolicy tailscale.com/log/sockstatlog from tailscale.com/ipn/ipnlocal tailscale.com/logpolicy from tailscale.com/ipn/ipnlocal+ @@ -857,7 +858,7 @@ tailscale.com/cmd/k8s-operator dependencies: (generated by github.com/tailscale/ 💣 tailscale.com/net/netmon from tailscale.com/control/controlclient+ 💣 tailscale.com/net/netns from tailscale.com/derp/derphttp+ W 💣 tailscale.com/net/netstat from tailscale.com/portlist - tailscale.com/net/netutil from tailscale.com/client/tailscale+ + tailscale.com/net/netutil from tailscale.com/client/web+ tailscale.com/net/packet from tailscale.com/net/connstats+ tailscale.com/net/packet/checksum from tailscale.com/net/tstun tailscale.com/net/ping from tailscale.com/net/netcheck+ @@ -875,19 +876,19 @@ tailscale.com/cmd/k8s-operator dependencies: (generated by github.com/tailscale/ 💣 tailscale.com/net/tshttpproxy from tailscale.com/clientupdate/distsign+ tailscale.com/net/tstun from tailscale.com/tsd+ tailscale.com/omit from tailscale.com/ipn/conffile - tailscale.com/paths from tailscale.com/client/tailscale+ + tailscale.com/paths from tailscale.com/ipn/ipnlocal+ 💣 tailscale.com/portlist from tailscale.com/ipn/ipnlocal tailscale.com/posture from tailscale.com/ipn/ipnlocal tailscale.com/proxymap from tailscale.com/tsd+ - 💣 tailscale.com/safesocket from tailscale.com/client/tailscale+ + 💣 tailscale.com/safesocket from tailscale.com/ipn/ipnauth+ tailscale.com/sessionrecording from tailscale.com/k8s-operator/sessionrecording+ tailscale.com/syncs from tailscale.com/control/controlknobs+ - tailscale.com/tailcfg from tailscale.com/client/tailscale+ + tailscale.com/tailcfg from tailscale.com/client/web+ tailscale.com/taildrop from tailscale.com/ipn/ipnlocal+ tailscale.com/tempfork/acme from tailscale.com/ipn/ipnlocal tailscale.com/tempfork/heap from tailscale.com/wgengine/magicsock tailscale.com/tempfork/httprec from tailscale.com/control/controlclient - tailscale.com/tka from tailscale.com/client/tailscale+ + tailscale.com/tka from tailscale.com/control/controlclient+ tailscale.com/tsconst from tailscale.com/net/netmon+ tailscale.com/tsd from tailscale.com/ipn/ipnlocal+ tailscale.com/tsnet from tailscale.com/cmd/k8s-operator+ @@ -899,7 +900,7 @@ tailscale.com/cmd/k8s-operator dependencies: (generated by github.com/tailscale/ tailscale.com/types/dnstype from tailscale.com/ipn/ipnlocal+ tailscale.com/types/empty from tailscale.com/ipn+ tailscale.com/types/ipproto from tailscale.com/net/flowtrack+ - tailscale.com/types/key from tailscale.com/client/tailscale+ + tailscale.com/types/key from tailscale.com/control/controlbase+ tailscale.com/types/lazy from tailscale.com/ipn/ipnlocal+ tailscale.com/types/logger from tailscale.com/appc+ tailscale.com/types/logid from tailscale.com/ipn/ipnlocal+ @@ -912,7 +913,7 @@ tailscale.com/cmd/k8s-operator dependencies: (generated by github.com/tailscale/ tailscale.com/types/ptr from tailscale.com/cmd/k8s-operator+ tailscale.com/types/result from tailscale.com/util/lineiter tailscale.com/types/structs from tailscale.com/control/controlclient+ - tailscale.com/types/tkatype from tailscale.com/client/tailscale+ + tailscale.com/types/tkatype from tailscale.com/control/controlclient+ tailscale.com/types/views from tailscale.com/appc+ tailscale.com/util/cibuild from tailscale.com/health tailscale.com/util/clientmetric from tailscale.com/cmd/k8s-operator+ diff --git a/cmd/k8s-operator/operator.go b/cmd/k8s-operator/operator.go index 37e37a96e..6df1386ec 100644 --- a/cmd/k8s-operator/operator.go +++ b/cmd/k8s-operator/operator.go @@ -39,12 +39,13 @@ import ( "sigs.k8s.io/controller-runtime/pkg/manager" "sigs.k8s.io/controller-runtime/pkg/manager/signals" "sigs.k8s.io/controller-runtime/pkg/reconcile" - "tailscale.com/client/tailscale" + remoteclient "tailscale.com/client/tailscale" "tailscale.com/hostinfo" "tailscale.com/ipn" "tailscale.com/ipn/store/kubestore" tsapi "tailscale.com/k8s-operator/apis/v1alpha1" "tailscale.com/kube/kubetypes" + "tailscale.com/localclient/tailscale" "tailscale.com/tsnet" "tailscale.com/tstime" "tailscale.com/types/logger" @@ -189,9 +190,9 @@ waitOnline: if loginDone { break } - caps := tailscale.KeyCapabilities{ - Devices: tailscale.KeyDeviceCapabilities{ - Create: tailscale.KeyDeviceCreateCapabilities{ + caps := remoteclient.KeyCapabilities{ + Devices: remoteclient.KeyDeviceCapabilities{ + Create: remoteclient.KeyDeviceCreateCapabilities{ Reusable: false, Preauthorized: true, Tags: strings.Split(operatorTags, ","), diff --git a/cmd/k8s-operator/proxy.go b/cmd/k8s-operator/proxy.go index 4509c0dd8..c05fba4f6 100644 --- a/cmd/k8s-operator/proxy.go +++ b/cmd/k8s-operator/proxy.go @@ -20,10 +20,10 @@ import ( "go.uber.org/zap" "k8s.io/client-go/rest" "k8s.io/client-go/transport" - "tailscale.com/client/tailscale" - "tailscale.com/client/tailscale/apitype" ksr "tailscale.com/k8s-operator/sessionrecording" "tailscale.com/kube/kubetypes" + "tailscale.com/localclient/tailscale" + "tailscale.com/localclient/tailscale/apitype" "tailscale.com/tailcfg" "tailscale.com/tsnet" "tailscale.com/util/clientmetric" diff --git a/cmd/k8s-operator/proxy_test.go b/cmd/k8s-operator/proxy_test.go index d1d5733e7..1f0f795eb 100644 --- a/cmd/k8s-operator/proxy_test.go +++ b/cmd/k8s-operator/proxy_test.go @@ -13,7 +13,7 @@ import ( "github.com/google/go-cmp/cmp" "go.uber.org/zap" - "tailscale.com/client/tailscale/apitype" + "tailscale.com/localclient/tailscale/apitype" "tailscale.com/tailcfg" "tailscale.com/util/must" ) diff --git a/cmd/natc/natc.go b/cmd/natc/natc.go index 069eabefd..ef54772e0 100644 --- a/cmd/natc/natc.go +++ b/cmd/natc/natc.go @@ -29,10 +29,10 @@ import ( "golang.org/x/net/dns/dnsmessage" "gvisor.dev/gvisor/pkg/tcpip" "gvisor.dev/gvisor/pkg/tcpip/transport/tcp" - "tailscale.com/client/tailscale" "tailscale.com/envknob" "tailscale.com/hostinfo" "tailscale.com/ipn" + "tailscale.com/localclient/tailscale" "tailscale.com/net/netutil" "tailscale.com/syncs" "tailscale.com/tailcfg" diff --git a/cmd/nginx-auth/nginx-auth.go b/cmd/nginx-auth/nginx-auth.go index 09da74da1..d878f0882 100644 --- a/cmd/nginx-auth/nginx-auth.go +++ b/cmd/nginx-auth/nginx-auth.go @@ -21,7 +21,7 @@ import ( "strings" "github.com/coreos/go-systemd/activation" - "tailscale.com/client/tailscale" + "tailscale.com/localclient/tailscale" ) var ( diff --git a/cmd/pgproxy/pgproxy.go b/cmd/pgproxy/pgproxy.go index 468649ee2..a3f0dd636 100644 --- a/cmd/pgproxy/pgproxy.go +++ b/cmd/pgproxy/pgproxy.go @@ -24,7 +24,7 @@ import ( "strings" "time" - "tailscale.com/client/tailscale" + "tailscale.com/localclient/tailscale" "tailscale.com/metrics" "tailscale.com/tsnet" "tailscale.com/tsweb" diff --git a/cmd/proxy-to-grafana/proxy-to-grafana.go b/cmd/proxy-to-grafana/proxy-to-grafana.go index f1c67bad5..12e326277 100644 --- a/cmd/proxy-to-grafana/proxy-to-grafana.go +++ b/cmd/proxy-to-grafana/proxy-to-grafana.go @@ -36,7 +36,7 @@ import ( "strings" "time" - "tailscale.com/client/tailscale" + "tailscale.com/localclient/tailscale" "tailscale.com/tailcfg" "tailscale.com/tsnet" ) diff --git a/cmd/sniproxy/sniproxy.go b/cmd/sniproxy/sniproxy.go index c1af977f6..d9d57c44d 100644 --- a/cmd/sniproxy/sniproxy.go +++ b/cmd/sniproxy/sniproxy.go @@ -22,9 +22,9 @@ import ( "strings" "github.com/peterbourgon/ff/v3" - "tailscale.com/client/tailscale" "tailscale.com/hostinfo" "tailscale.com/ipn" + "tailscale.com/localclient/tailscale" "tailscale.com/tailcfg" "tailscale.com/tsnet" "tailscale.com/tsweb" diff --git a/cmd/tailscale/cli/bugreport.go b/cmd/tailscale/cli/bugreport.go index d671f3df6..b99d4d260 100644 --- a/cmd/tailscale/cli/bugreport.go +++ b/cmd/tailscale/cli/bugreport.go @@ -10,7 +10,7 @@ import ( "fmt" "github.com/peterbourgon/ff/v3/ffcli" - "tailscale.com/client/tailscale" + "tailscale.com/localclient/tailscale" ) var bugReportCmd = &ffcli.Command{ diff --git a/cmd/tailscale/cli/cli.go b/cmd/tailscale/cli/cli.go index d80d0c02f..269f515e0 100644 --- a/cmd/tailscale/cli/cli.go +++ b/cmd/tailscale/cli/cli.go @@ -21,9 +21,9 @@ import ( "github.com/mattn/go-colorable" "github.com/mattn/go-isatty" "github.com/peterbourgon/ff/v3/ffcli" - "tailscale.com/client/tailscale" "tailscale.com/cmd/tailscale/cli/ffcomplete" "tailscale.com/envknob" + "tailscale.com/localclient/tailscale" "tailscale.com/paths" "tailscale.com/util/slicesx" "tailscale.com/version/distro" diff --git a/cmd/tailscale/cli/debug.go b/cmd/tailscale/cli/debug.go index ce5edd8d3..b4e230ec5 100644 --- a/cmd/tailscale/cli/debug.go +++ b/cmd/tailscale/cli/debug.go @@ -29,12 +29,12 @@ import ( "github.com/peterbourgon/ff/v3/ffcli" "golang.org/x/net/http/httpproxy" "golang.org/x/net/http2" - "tailscale.com/client/tailscale" - "tailscale.com/client/tailscale/apitype" "tailscale.com/control/controlhttp" "tailscale.com/hostinfo" "tailscale.com/internal/noiseconn" "tailscale.com/ipn" + "tailscale.com/localclient/tailscale" + "tailscale.com/localclient/tailscale/apitype" "tailscale.com/net/netmon" "tailscale.com/net/tsaddr" "tailscale.com/net/tshttpproxy" diff --git a/cmd/tailscale/cli/down.go b/cmd/tailscale/cli/down.go index 224198a98..49d41ccbc 100644 --- a/cmd/tailscale/cli/down.go +++ b/cmd/tailscale/cli/down.go @@ -9,8 +9,8 @@ import ( "fmt" "github.com/peterbourgon/ff/v3/ffcli" - "tailscale.com/client/tailscale/apitype" "tailscale.com/ipn" + "tailscale.com/localclient/tailscale/apitype" ) var downCmd = &ffcli.Command{ diff --git a/cmd/tailscale/cli/file.go b/cmd/tailscale/cli/file.go index cd7762446..4e86ba226 100644 --- a/cmd/tailscale/cli/file.go +++ b/cmd/tailscale/cli/file.go @@ -25,9 +25,9 @@ import ( "github.com/mattn/go-isatty" "github.com/peterbourgon/ff/v3/ffcli" "golang.org/x/time/rate" - "tailscale.com/client/tailscale/apitype" "tailscale.com/cmd/tailscale/cli/ffcomplete" "tailscale.com/envknob" + "tailscale.com/localclient/tailscale/apitype" "tailscale.com/net/tsaddr" "tailscale.com/syncs" "tailscale.com/tailcfg" diff --git a/cmd/tailscale/cli/ping.go b/cmd/tailscale/cli/ping.go index 3a909f30d..edbc3904d 100644 --- a/cmd/tailscale/cli/ping.go +++ b/cmd/tailscale/cli/ping.go @@ -16,9 +16,9 @@ import ( "time" "github.com/peterbourgon/ff/v3/ffcli" - "tailscale.com/client/tailscale" "tailscale.com/cmd/tailscale/cli/ffcomplete" "tailscale.com/ipn/ipnstate" + "tailscale.com/localclient/tailscale" "tailscale.com/tailcfg" ) diff --git a/cmd/tailscale/cli/serve_legacy.go b/cmd/tailscale/cli/serve_legacy.go index 5f55b1da6..48abbe94e 100644 --- a/cmd/tailscale/cli/serve_legacy.go +++ b/cmd/tailscale/cli/serve_legacy.go @@ -23,9 +23,9 @@ import ( "strings" "github.com/peterbourgon/ff/v3/ffcli" - "tailscale.com/client/tailscale" "tailscale.com/ipn" "tailscale.com/ipn/ipnstate" + "tailscale.com/localclient/tailscale" "tailscale.com/tailcfg" "tailscale.com/util/slicesx" "tailscale.com/version" diff --git a/cmd/tailscale/cli/serve_legacy_test.go b/cmd/tailscale/cli/serve_legacy_test.go index 2eb982ca0..1ca48a7eb 100644 --- a/cmd/tailscale/cli/serve_legacy_test.go +++ b/cmd/tailscale/cli/serve_legacy_test.go @@ -18,9 +18,9 @@ import ( "testing" "github.com/peterbourgon/ff/v3/ffcli" - "tailscale.com/client/tailscale" "tailscale.com/ipn" "tailscale.com/ipn/ipnstate" + "tailscale.com/localclient/tailscale" "tailscale.com/tailcfg" "tailscale.com/tstest" "tailscale.com/types/logger" diff --git a/cmd/tailscale/cli/serve_v2.go b/cmd/tailscale/cli/serve_v2.go index 3e173ce28..25139eafa 100644 --- a/cmd/tailscale/cli/serve_v2.go +++ b/cmd/tailscale/cli/serve_v2.go @@ -23,9 +23,9 @@ import ( "strings" "github.com/peterbourgon/ff/v3/ffcli" - "tailscale.com/client/tailscale" "tailscale.com/ipn" "tailscale.com/ipn/ipnstate" + "tailscale.com/localclient/tailscale" "tailscale.com/tailcfg" "tailscale.com/util/mak" "tailscale.com/util/slicesx" diff --git a/cmd/tailscale/depaware.txt b/cmd/tailscale/depaware.txt index 6d1fcfd03..cf7619d80 100644 --- a/cmd/tailscale/depaware.txt +++ b/cmd/tailscale/depaware.txt @@ -60,7 +60,7 @@ tailscale.com/cmd/tailscale dependencies: (generated by github.com/tailscale/dep github.com/toqueteos/webbrowser from tailscale.com/cmd/tailscale/cli L github.com/vishvananda/netns from github.com/tailscale/netlink+ github.com/x448/float16 from github.com/fxamacker/cbor/v2 - 💣 go4.org/mem from tailscale.com/client/tailscale+ + 💣 go4.org/mem from tailscale.com/control/controlbase+ go4.org/netipx from tailscale.com/net/tsaddr W 💣 golang.zx2c4.com/wireguard/windows/tunnel/winipcfg from tailscale.com/net/netmon+ k8s.io/client-go/util/homedir from tailscale.com/cmd/tailscale/cli @@ -70,8 +70,7 @@ tailscale.com/cmd/tailscale dependencies: (generated by github.com/tailscale/dep software.sslmate.com/src/go-pkcs12/internal/rc2 from software.sslmate.com/src/go-pkcs12 tailscale.com from tailscale.com/version 💣 tailscale.com/atomicfile from tailscale.com/cmd/tailscale/cli+ - tailscale.com/client/tailscale from tailscale.com/client/web+ - tailscale.com/client/tailscale/apitype from tailscale.com/client/tailscale+ + tailscale.com/client/tailscale from tailscale.com/cmd/tailscale/cli tailscale.com/client/web from tailscale.com/cmd/tailscale/cli tailscale.com/clientupdate from tailscale.com/client/web+ LW tailscale.com/clientupdate/distsign from tailscale.com/clientupdate @@ -85,18 +84,20 @@ tailscale.com/cmd/tailscale dependencies: (generated by github.com/tailscale/dep tailscale.com/derp from tailscale.com/derp/derphttp tailscale.com/derp/derphttp from tailscale.com/net/netcheck tailscale.com/disco from tailscale.com/derp - tailscale.com/drive from tailscale.com/client/tailscale+ - tailscale.com/envknob from tailscale.com/client/tailscale+ + tailscale.com/drive from tailscale.com/cmd/tailscale/cli+ + tailscale.com/envknob from tailscale.com/client/web+ tailscale.com/envknob/featureknob from tailscale.com/client/web tailscale.com/feature/capture/dissector from tailscale.com/cmd/tailscale/cli tailscale.com/health from tailscale.com/net/tlsdial+ tailscale.com/health/healthmsg from tailscale.com/cmd/tailscale/cli tailscale.com/hostinfo from tailscale.com/client/web+ tailscale.com/internal/noiseconn from tailscale.com/cmd/tailscale/cli - tailscale.com/ipn from tailscale.com/client/tailscale+ - tailscale.com/ipn/ipnstate from tailscale.com/client/tailscale+ + tailscale.com/ipn from tailscale.com/client/web+ + tailscale.com/ipn/ipnstate from tailscale.com/client/web+ tailscale.com/kube/kubetypes from tailscale.com/envknob tailscale.com/licenses from tailscale.com/client/web+ + tailscale.com/localclient/tailscale from tailscale.com/client/web+ + tailscale.com/localclient/tailscale/apitype from tailscale.com/client/tailscale+ tailscale.com/metrics from tailscale.com/derp+ tailscale.com/net/bakedroots from tailscale.com/net/tlsdial tailscale.com/net/captivedetection from tailscale.com/net/netcheck @@ -109,7 +110,7 @@ tailscale.com/cmd/tailscale dependencies: (generated by github.com/tailscale/dep tailscale.com/net/netknob from tailscale.com/net/netns 💣 tailscale.com/net/netmon from tailscale.com/cmd/tailscale/cli+ 💣 tailscale.com/net/netns from tailscale.com/derp/derphttp+ - tailscale.com/net/netutil from tailscale.com/client/tailscale+ + tailscale.com/net/netutil from tailscale.com/client/web+ tailscale.com/net/ping from tailscale.com/net/netcheck tailscale.com/net/portmapper from tailscale.com/cmd/tailscale/cli+ tailscale.com/net/sockstats from tailscale.com/control/controlhttp+ @@ -119,12 +120,12 @@ tailscale.com/cmd/tailscale dependencies: (generated by github.com/tailscale/dep tailscale.com/net/tlsdial/blockblame from tailscale.com/net/tlsdial tailscale.com/net/tsaddr from tailscale.com/client/web+ 💣 tailscale.com/net/tshttpproxy from tailscale.com/clientupdate/distsign+ - tailscale.com/paths from tailscale.com/client/tailscale+ - 💣 tailscale.com/safesocket from tailscale.com/client/tailscale+ + tailscale.com/paths from tailscale.com/cmd/tailscale/cli+ + 💣 tailscale.com/safesocket from tailscale.com/cmd/tailscale/cli+ tailscale.com/syncs from tailscale.com/cmd/tailscale/cli+ - tailscale.com/tailcfg from tailscale.com/client/tailscale+ + tailscale.com/tailcfg from tailscale.com/client/web+ tailscale.com/tempfork/spf13/cobra from tailscale.com/cmd/tailscale/cli/ffcomplete+ - tailscale.com/tka from tailscale.com/client/tailscale+ + tailscale.com/tka from tailscale.com/cmd/tailscale/cli+ tailscale.com/tsconst from tailscale.com/net/netmon+ tailscale.com/tstime from tailscale.com/control/controlhttp+ tailscale.com/tstime/mono from tailscale.com/tstime/rate @@ -133,7 +134,7 @@ tailscale.com/cmd/tailscale dependencies: (generated by github.com/tailscale/dep tailscale.com/types/dnstype from tailscale.com/tailcfg+ tailscale.com/types/empty from tailscale.com/ipn tailscale.com/types/ipproto from tailscale.com/ipn+ - tailscale.com/types/key from tailscale.com/client/tailscale+ + tailscale.com/types/key from tailscale.com/cmd/tailscale/cli+ tailscale.com/types/lazy from tailscale.com/util/testenv+ tailscale.com/types/logger from tailscale.com/client/web+ tailscale.com/types/netmap from tailscale.com/ipn+ diff --git a/cmd/tailscaled/depaware.txt b/cmd/tailscaled/depaware.txt index a6fae54ff..353cede8a 100644 --- a/cmd/tailscaled/depaware.txt +++ b/cmd/tailscaled/depaware.txt @@ -181,7 +181,7 @@ tailscale.com/cmd/tailscaled dependencies: (generated by github.com/tailscale/de L github.com/u-root/uio/uio from github.com/insomniacslk/dhcp/dhcpv4+ L github.com/vishvananda/netns from github.com/tailscale/netlink+ github.com/x448/float16 from github.com/fxamacker/cbor/v2 - 💣 go4.org/mem from tailscale.com/client/tailscale+ + 💣 go4.org/mem from tailscale.com/control/controlbase+ go4.org/netipx from github.com/tailscale/wf+ W 💣 golang.zx2c4.com/wintun from github.com/tailscale/wireguard-go/tun+ W 💣 golang.zx2c4.com/wireguard/windows/tunnel/winipcfg from tailscale.com/cmd/tailscaled+ @@ -230,8 +230,6 @@ tailscale.com/cmd/tailscaled dependencies: (generated by github.com/tailscale/de tailscale.com/appc from tailscale.com/ipn/ipnlocal 💣 tailscale.com/atomicfile from tailscale.com/ipn+ LD tailscale.com/chirp from tailscale.com/cmd/tailscaled - tailscale.com/client/tailscale from tailscale.com/client/web+ - tailscale.com/client/tailscale/apitype from tailscale.com/client/tailscale+ tailscale.com/client/web from tailscale.com/ipn/ipnlocal tailscale.com/clientupdate from tailscale.com/client/web+ LW tailscale.com/clientupdate/distsign from tailscale.com/clientupdate @@ -248,12 +246,12 @@ tailscale.com/cmd/tailscaled dependencies: (generated by github.com/tailscale/de tailscale.com/doctor/ethtool from tailscale.com/ipn/ipnlocal 💣 tailscale.com/doctor/permissions from tailscale.com/ipn/ipnlocal tailscale.com/doctor/routetable from tailscale.com/ipn/ipnlocal - tailscale.com/drive from tailscale.com/client/tailscale+ + tailscale.com/drive from tailscale.com/drive/driveimpl+ tailscale.com/drive/driveimpl from tailscale.com/cmd/tailscaled tailscale.com/drive/driveimpl/compositedav from tailscale.com/drive/driveimpl tailscale.com/drive/driveimpl/dirfs from tailscale.com/drive/driveimpl+ tailscale.com/drive/driveimpl/shared from tailscale.com/drive/driveimpl+ - tailscale.com/envknob from tailscale.com/client/tailscale+ + tailscale.com/envknob from tailscale.com/client/web+ tailscale.com/envknob/featureknob from tailscale.com/client/web+ tailscale.com/feature from tailscale.com/feature/wakeonlan+ tailscale.com/feature/capture from tailscale.com/feature/condregister @@ -264,12 +262,12 @@ tailscale.com/cmd/tailscaled dependencies: (generated by github.com/tailscale/de tailscale.com/health/healthmsg from tailscale.com/ipn/ipnlocal tailscale.com/hostinfo from tailscale.com/client/web+ tailscale.com/internal/noiseconn from tailscale.com/control/controlclient - tailscale.com/ipn from tailscale.com/client/tailscale+ + tailscale.com/ipn from tailscale.com/client/web+ tailscale.com/ipn/conffile from tailscale.com/cmd/tailscaled+ 💣 tailscale.com/ipn/ipnauth from tailscale.com/ipn/ipnlocal+ tailscale.com/ipn/ipnlocal from tailscale.com/cmd/tailscaled+ tailscale.com/ipn/ipnserver from tailscale.com/cmd/tailscaled - tailscale.com/ipn/ipnstate from tailscale.com/client/tailscale+ + tailscale.com/ipn/ipnstate from tailscale.com/client/web+ tailscale.com/ipn/localapi from tailscale.com/ipn/ipnserver+ tailscale.com/ipn/policy from tailscale.com/ipn/ipnlocal tailscale.com/ipn/store from tailscale.com/cmd/tailscaled+ @@ -280,6 +278,8 @@ tailscale.com/cmd/tailscaled dependencies: (generated by github.com/tailscale/de L tailscale.com/kube/kubeclient from tailscale.com/ipn/store/kubestore tailscale.com/kube/kubetypes from tailscale.com/envknob tailscale.com/licenses from tailscale.com/client/web + tailscale.com/localclient/tailscale from tailscale.com/client/web+ + tailscale.com/localclient/tailscale/apitype from tailscale.com/client/web+ tailscale.com/log/filelogger from tailscale.com/logpolicy tailscale.com/log/sockstatlog from tailscale.com/ipn/ipnlocal tailscale.com/logpolicy from tailscale.com/cmd/tailscaled+ @@ -307,7 +307,7 @@ tailscale.com/cmd/tailscaled dependencies: (generated by github.com/tailscale/de 💣 tailscale.com/net/netmon from tailscale.com/cmd/tailscaled+ 💣 tailscale.com/net/netns from tailscale.com/cmd/tailscaled+ W 💣 tailscale.com/net/netstat from tailscale.com/portlist - tailscale.com/net/netutil from tailscale.com/client/tailscale+ + tailscale.com/net/netutil from tailscale.com/client/web+ tailscale.com/net/packet from tailscale.com/net/connstats+ tailscale.com/net/packet/checksum from tailscale.com/net/tstun tailscale.com/net/ping from tailscale.com/net/netcheck+ @@ -325,21 +325,21 @@ tailscale.com/cmd/tailscaled dependencies: (generated by github.com/tailscale/de 💣 tailscale.com/net/tshttpproxy from tailscale.com/clientupdate/distsign+ tailscale.com/net/tstun from tailscale.com/cmd/tailscaled+ tailscale.com/omit from tailscale.com/ipn/conffile - tailscale.com/paths from tailscale.com/client/tailscale+ + tailscale.com/paths from tailscale.com/cmd/tailscaled+ 💣 tailscale.com/portlist from tailscale.com/ipn/ipnlocal tailscale.com/posture from tailscale.com/ipn/ipnlocal tailscale.com/proxymap from tailscale.com/tsd+ - 💣 tailscale.com/safesocket from tailscale.com/client/tailscale+ + 💣 tailscale.com/safesocket from tailscale.com/cmd/tailscaled+ LD tailscale.com/sessionrecording from tailscale.com/ssh/tailssh LD 💣 tailscale.com/ssh/tailssh from tailscale.com/cmd/tailscaled tailscale.com/syncs from tailscale.com/cmd/tailscaled+ - tailscale.com/tailcfg from tailscale.com/client/tailscale+ + tailscale.com/tailcfg from tailscale.com/client/web+ tailscale.com/taildrop from tailscale.com/ipn/ipnlocal+ tailscale.com/tempfork/acme from tailscale.com/ipn/ipnlocal LD tailscale.com/tempfork/gliderlabs/ssh from tailscale.com/ssh/tailssh tailscale.com/tempfork/heap from tailscale.com/wgengine/magicsock tailscale.com/tempfork/httprec from tailscale.com/control/controlclient - tailscale.com/tka from tailscale.com/client/tailscale+ + tailscale.com/tka from tailscale.com/control/controlclient+ tailscale.com/tsconst from tailscale.com/net/netmon+ tailscale.com/tsd from tailscale.com/cmd/tailscaled+ tailscale.com/tstime from tailscale.com/control/controlclient+ @@ -351,14 +351,14 @@ tailscale.com/cmd/tailscaled dependencies: (generated by github.com/tailscale/de tailscale.com/types/empty from tailscale.com/ipn+ tailscale.com/types/flagtype from tailscale.com/cmd/tailscaled tailscale.com/types/ipproto from tailscale.com/net/flowtrack+ - tailscale.com/types/key from tailscale.com/client/tailscale+ + tailscale.com/types/key from tailscale.com/cmd/tailscaled+ tailscale.com/types/lazy from tailscale.com/ipn/ipnlocal+ tailscale.com/types/logger from tailscale.com/appc+ tailscale.com/types/logid from tailscale.com/cmd/tailscaled+ tailscale.com/types/netlogtype from tailscale.com/net/connstats+ tailscale.com/types/netmap from tailscale.com/control/controlclient+ tailscale.com/types/nettype from tailscale.com/ipn/localapi+ - tailscale.com/types/opt from tailscale.com/client/tailscale+ + tailscale.com/types/opt from tailscale.com/control/controlknobs+ tailscale.com/types/persist from tailscale.com/control/controlclient+ tailscale.com/types/preftype from tailscale.com/ipn+ tailscale.com/types/ptr from tailscale.com/control/controlclient+ @@ -379,7 +379,7 @@ tailscale.com/cmd/tailscaled dependencies: (generated by github.com/tailscale/de tailscale.com/util/groupmember from tailscale.com/client/web+ 💣 tailscale.com/util/hashx from tailscale.com/util/deephash tailscale.com/util/httphdr from tailscale.com/ipn/ipnlocal+ - tailscale.com/util/httpm from tailscale.com/client/tailscale+ + tailscale.com/util/httpm from tailscale.com/client/web+ tailscale.com/util/lineiter from tailscale.com/hostinfo+ L tailscale.com/util/linuxfw from tailscale.com/net/netns+ tailscale.com/util/mak from tailscale.com/control/controlclient+ diff --git a/cmd/tailscaled/tailscaled.go b/cmd/tailscaled/tailscaled.go index bab3bc75a..fd91339dd 100644 --- a/cmd/tailscaled/tailscaled.go +++ b/cmd/tailscaled/tailscaled.go @@ -30,7 +30,6 @@ import ( "syscall" "time" - "tailscale.com/client/tailscale" "tailscale.com/cmd/tailscaled/childproc" "tailscale.com/control/controlclient" "tailscale.com/drive/driveimpl" @@ -42,6 +41,7 @@ import ( "tailscale.com/ipn/ipnlocal" "tailscale.com/ipn/ipnserver" "tailscale.com/ipn/store" + "tailscale.com/localclient/tailscale" "tailscale.com/logpolicy" "tailscale.com/logtail" "tailscale.com/net/dns" diff --git a/cmd/tl-longchain/tl-longchain.go b/cmd/tl-longchain/tl-longchain.go index c92714505..c1cef73df 100644 --- a/cmd/tl-longchain/tl-longchain.go +++ b/cmd/tl-longchain/tl-longchain.go @@ -22,8 +22,8 @@ import ( "log" "time" - "tailscale.com/client/tailscale" "tailscale.com/ipn/ipnstate" + "tailscale.com/localclient/tailscale" "tailscale.com/tka" "tailscale.com/types/key" ) diff --git a/cmd/tsidp/tsidp.go b/cmd/tsidp/tsidp.go index 1bdca8919..4d632a40e 100644 --- a/cmd/tsidp/tsidp.go +++ b/cmd/tsidp/tsidp.go @@ -35,11 +35,11 @@ import ( "gopkg.in/square/go-jose.v2" "gopkg.in/square/go-jose.v2/jwt" - "tailscale.com/client/tailscale" - "tailscale.com/client/tailscale/apitype" "tailscale.com/envknob" "tailscale.com/ipn" "tailscale.com/ipn/ipnstate" + "tailscale.com/localclient/tailscale" + "tailscale.com/localclient/tailscale/apitype" "tailscale.com/tailcfg" "tailscale.com/tsnet" "tailscale.com/types/key" diff --git a/cmd/tta/tta.go b/cmd/tta/tta.go index 4a4c4a6be..559dbc3d8 100644 --- a/cmd/tta/tta.go +++ b/cmd/tta/tta.go @@ -30,8 +30,8 @@ import ( "time" "tailscale.com/atomicfile" - "tailscale.com/client/tailscale" "tailscale.com/hostinfo" + "tailscale.com/localclient/tailscale" "tailscale.com/util/mak" "tailscale.com/util/must" "tailscale.com/util/set" diff --git a/derp/derp_server.go b/derp/derp_server.go index 15fc0dfb8..02398a2ac 100644 --- a/derp/derp_server.go +++ b/derp/derp_server.go @@ -36,9 +36,9 @@ import ( "go4.org/mem" "golang.org/x/sync/errgroup" - "tailscale.com/client/tailscale" "tailscale.com/disco" "tailscale.com/envknob" + "tailscale.com/localclient/tailscale" "tailscale.com/metrics" "tailscale.com/syncs" "tailscale.com/tailcfg" diff --git a/ipn/ipnlocal/local.go b/ipn/ipnlocal/local.go index 38bcfaaa2..c26cd151e 100644 --- a/ipn/ipnlocal/local.go +++ b/ipn/ipnlocal/local.go @@ -42,7 +42,6 @@ import ( "golang.org/x/net/dns/dnsmessage" "gvisor.dev/gvisor/pkg/tcpip" "tailscale.com/appc" - "tailscale.com/client/tailscale/apitype" "tailscale.com/clientupdate" "tailscale.com/control/controlclient" "tailscale.com/control/controlknobs" @@ -61,6 +60,7 @@ import ( "tailscale.com/ipn/ipnauth" "tailscale.com/ipn/ipnstate" "tailscale.com/ipn/policy" + "tailscale.com/localclient/tailscale/apitype" "tailscale.com/log/sockstatlog" "tailscale.com/logpolicy" "tailscale.com/net/captivedetection" diff --git a/ipn/ipnlocal/peerapi_test.go b/ipn/ipnlocal/peerapi_test.go index ff9b62769..d4f13f3f7 100644 --- a/ipn/ipnlocal/peerapi_test.go +++ b/ipn/ipnlocal/peerapi_test.go @@ -25,10 +25,10 @@ import ( "golang.org/x/net/dns/dnsmessage" "tailscale.com/appc" "tailscale.com/appc/appctest" - "tailscale.com/client/tailscale/apitype" "tailscale.com/health" "tailscale.com/ipn" "tailscale.com/ipn/store/mem" + "tailscale.com/localclient/tailscale/apitype" "tailscale.com/tailcfg" "tailscale.com/taildrop" "tailscale.com/tstest" diff --git a/ipn/ipnlocal/web_client.go b/ipn/ipnlocal/web_client.go index 37fc31819..b855ff0fc 100644 --- a/ipn/ipnlocal/web_client.go +++ b/ipn/ipnlocal/web_client.go @@ -17,8 +17,8 @@ import ( "sync" "time" - "tailscale.com/client/tailscale" "tailscale.com/client/web" + "tailscale.com/localclient/tailscale" "tailscale.com/logtail/backoff" "tailscale.com/net/netutil" "tailscale.com/tailcfg" diff --git a/ipn/ipnlocal/web_client_stub.go b/ipn/ipnlocal/web_client_stub.go index 1dfc8c27c..a97571e92 100644 --- a/ipn/ipnlocal/web_client_stub.go +++ b/ipn/ipnlocal/web_client_stub.go @@ -9,7 +9,7 @@ import ( "errors" "net" - "tailscale.com/client/tailscale" + "tailscale.com/localclient/tailscale" ) const webClientPort = 5252 diff --git a/ipn/ipnserver/server.go b/ipn/ipnserver/server.go index a08643667..f622e358d 100644 --- a/ipn/ipnserver/server.go +++ b/ipn/ipnserver/server.go @@ -21,11 +21,11 @@ import ( "sync/atomic" "unicode" - "tailscale.com/client/tailscale/apitype" "tailscale.com/envknob" "tailscale.com/ipn/ipnauth" "tailscale.com/ipn/ipnlocal" "tailscale.com/ipn/localapi" + "tailscale.com/localclient/tailscale/apitype" "tailscale.com/net/netmon" "tailscale.com/types/logger" "tailscale.com/types/logid" diff --git a/ipn/ipnserver/server_test.go b/ipn/ipnserver/server_test.go index e56ae8dab..8ca191f43 100644 --- a/ipn/ipnserver/server_test.go +++ b/ipn/ipnserver/server_test.go @@ -17,14 +17,14 @@ import ( "sync/atomic" "testing" - "tailscale.com/client/tailscale" - "tailscale.com/client/tailscale/apitype" "tailscale.com/control/controlclient" "tailscale.com/envknob" "tailscale.com/ipn" "tailscale.com/ipn/ipnauth" "tailscale.com/ipn/ipnlocal" "tailscale.com/ipn/store/mem" + "tailscale.com/localclient/tailscale" + "tailscale.com/localclient/tailscale/apitype" "tailscale.com/tsd" "tailscale.com/tstest" "tailscale.com/types/logger" diff --git a/ipn/localapi/localapi.go b/ipn/localapi/localapi.go index c75f732b6..7730bdbf8 100644 --- a/ipn/localapi/localapi.go +++ b/ipn/localapi/localapi.go @@ -32,7 +32,6 @@ import ( "time" "golang.org/x/net/dns/dnsmessage" - "tailscale.com/client/tailscale/apitype" "tailscale.com/clientupdate" "tailscale.com/drive" "tailscale.com/envknob" @@ -41,6 +40,7 @@ import ( "tailscale.com/ipn/ipnauth" "tailscale.com/ipn/ipnlocal" "tailscale.com/ipn/ipnstate" + "tailscale.com/localclient/tailscale/apitype" "tailscale.com/logtail" "tailscale.com/net/netmon" "tailscale.com/net/netutil" diff --git a/ipn/localapi/localapi_test.go b/ipn/localapi/localapi_test.go index b7f0c416c..66a0914d7 100644 --- a/ipn/localapi/localapi_test.go +++ b/ipn/localapi/localapi_test.go @@ -24,11 +24,11 @@ import ( "strings" "testing" - "tailscale.com/client/tailscale/apitype" "tailscale.com/ipn" "tailscale.com/ipn/ipnauth" "tailscale.com/ipn/ipnlocal" "tailscale.com/ipn/store/mem" + "tailscale.com/localclient/tailscale/apitype" "tailscale.com/tailcfg" "tailscale.com/tsd" "tailscale.com/tstest" diff --git a/k8s-operator/sessionrecording/hijacker.go b/k8s-operator/sessionrecording/hijacker.go index 43aa14e61..1c95c7456 100644 --- a/k8s-operator/sessionrecording/hijacker.go +++ b/k8s-operator/sessionrecording/hijacker.go @@ -21,10 +21,10 @@ import ( "github.com/pkg/errors" "go.uber.org/zap" - "tailscale.com/client/tailscale/apitype" "tailscale.com/k8s-operator/sessionrecording/spdy" "tailscale.com/k8s-operator/sessionrecording/tsrecorder" "tailscale.com/k8s-operator/sessionrecording/ws" + "tailscale.com/localclient/tailscale/apitype" "tailscale.com/sessionrecording" "tailscale.com/tailcfg" "tailscale.com/tsnet" diff --git a/k8s-operator/sessionrecording/hijacker_test.go b/k8s-operator/sessionrecording/hijacker_test.go index e166ce63b..197cf00f9 100644 --- a/k8s-operator/sessionrecording/hijacker_test.go +++ b/k8s-operator/sessionrecording/hijacker_test.go @@ -17,8 +17,8 @@ import ( "time" "go.uber.org/zap" - "tailscale.com/client/tailscale/apitype" "tailscale.com/k8s-operator/sessionrecording/fakes" + "tailscale.com/localclient/tailscale/apitype" "tailscale.com/sessionrecording" "tailscale.com/tailcfg" "tailscale.com/tsnet" diff --git a/localclient/tailscale/localclient.go b/localclient/tailscale/localclient.go index eecd05dfd..88337d172 100644 --- a/localclient/tailscale/localclient.go +++ b/localclient/tailscale/localclient.go @@ -3,6 +3,10 @@ //go:build go1.22 +// Package tailscale contains a Go client for the Tailscale LocalAPI. +// +// 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. package tailscale import ( @@ -28,11 +32,11 @@ import ( "time" "go4.org/mem" - "tailscale.com/client/tailscale/apitype" "tailscale.com/drive" "tailscale.com/envknob" "tailscale.com/ipn" "tailscale.com/ipn/ipnstate" + "tailscale.com/localclient/tailscale/apitype" "tailscale.com/net/netutil" "tailscale.com/paths" "tailscale.com/safesocket" @@ -44,6 +48,13 @@ import ( "tailscale.com/util/syspolicy/setting" ) +// I_Acknowledge_This_API_Is_Unstable must be set true to use this package +// for now. It was added 2022-04-29 when it was moved to this git repo +// and will be removed when the public API has settled. +// +// TODO(bradfitz): remove this after the we're happy with the public API. +var I_Acknowledge_This_API_Is_Unstable = false + // defaultLocalClient is the default LocalClient when using the legacy // package-level functions. var defaultLocalClient LocalClient diff --git a/prober/derp.go b/prober/derp.go index 05cc8f05c..27cee3d95 100644 --- a/prober/derp.go +++ b/prober/derp.go @@ -30,9 +30,9 @@ import ( "github.com/tailscale/wireguard-go/device" "github.com/tailscale/wireguard-go/tun" "go4.org/netipx" - "tailscale.com/client/tailscale" "tailscale.com/derp" "tailscale.com/derp/derphttp" + "tailscale.com/localclient/tailscale" "tailscale.com/net/netmon" "tailscale.com/net/stun" "tailscale.com/net/tstun" diff --git a/taildrop/retrieve.go b/taildrop/retrieve.go index 3e37b492a..19ae59fdf 100644 --- a/taildrop/retrieve.go +++ b/taildrop/retrieve.go @@ -14,7 +14,7 @@ import ( "sort" "time" - "tailscale.com/client/tailscale/apitype" + "tailscale.com/localclient/tailscale/apitype" "tailscale.com/logtail/backoff" ) diff --git a/tsnet/tsnet.go b/tsnet/tsnet.go index 23a9f9a98..eb4a7d06e 100644 --- a/tsnet/tsnet.go +++ b/tsnet/tsnet.go @@ -26,7 +26,7 @@ import ( "sync" "time" - "tailscale.com/client/tailscale" + remoteclient "tailscale.com/client/tailscale" "tailscale.com/control/controlclient" "tailscale.com/envknob" _ "tailscale.com/feature/condregister" @@ -38,6 +38,7 @@ import ( "tailscale.com/ipn/localapi" "tailscale.com/ipn/store" "tailscale.com/ipn/store/mem" + "tailscale.com/localclient/tailscale" "tailscale.com/logpolicy" "tailscale.com/logtail" "tailscale.com/logtail/filch" @@ -928,7 +929,7 @@ func getTSNetDir(logf logger.Logf, confDir, prog string) (string, error) { // APIClient returns a tailscale.Client that can be used to make authenticated // requests to the Tailscale control server. // It requires the user to set tailscale.I_Acknowledge_This_API_Is_Unstable. -func (s *Server) APIClient() (*tailscale.Client, error) { +func (s *Server) APIClient() (*remoteclient.Client, error) { if !tailscale.I_Acknowledge_This_API_Is_Unstable { return nil, errors.New("use of Client without setting I_Acknowledge_This_API_Is_Unstable") } @@ -936,7 +937,7 @@ func (s *Server) APIClient() (*tailscale.Client, error) { return nil, err } - c := tailscale.NewClient("-", nil) + c := remoteclient.NewClient("-", nil) c.UserAgent = "tailscale-tsnet" c.HTTPClient = &http.Client{Transport: s.lb.KeyProvingNoiseRoundTripper()} return c, nil diff --git a/tsnet/tsnet_test.go b/tsnet/tsnet_test.go index 0f245b015..4440e274f 100644 --- a/tsnet/tsnet_test.go +++ b/tsnet/tsnet_test.go @@ -36,10 +36,10 @@ import ( dto "github.com/prometheus/client_model/go" "github.com/prometheus/common/expfmt" "golang.org/x/net/proxy" - "tailscale.com/client/tailscale" "tailscale.com/cmd/testwrapper/flakytest" "tailscale.com/ipn" "tailscale.com/ipn/store/mem" + "tailscale.com/localclient/tailscale" "tailscale.com/net/netns" "tailscale.com/tailcfg" "tailscale.com/tstest" diff --git a/tstest/integration/integration_test.go b/tstest/integration/integration_test.go index 70c5d68c3..a7fa381f0 100644 --- a/tstest/integration/integration_test.go +++ b/tstest/integration/integration_test.go @@ -32,13 +32,13 @@ import ( "github.com/miekg/dns" "go4.org/mem" - "tailscale.com/client/tailscale" "tailscale.com/clientupdate" "tailscale.com/cmd/testwrapper/flakytest" "tailscale.com/ipn" "tailscale.com/ipn/ipnlocal" "tailscale.com/ipn/ipnstate" "tailscale.com/ipn/store" + "tailscale.com/localclient/tailscale" "tailscale.com/net/tsaddr" "tailscale.com/net/tstun" "tailscale.com/safesocket" diff --git a/tstest/natlab/vnet/vnet.go b/tstest/natlab/vnet/vnet.go index 586fd28e0..db5f0bb8a 100644 --- a/tstest/natlab/vnet/vnet.go +++ b/tstest/natlab/vnet/vnet.go @@ -50,9 +50,9 @@ import ( "gvisor.dev/gvisor/pkg/tcpip/transport/icmp" "gvisor.dev/gvisor/pkg/tcpip/transport/tcp" "gvisor.dev/gvisor/pkg/waiter" - "tailscale.com/client/tailscale" "tailscale.com/derp" "tailscale.com/derp/derphttp" + "tailscale.com/localclient/tailscale" "tailscale.com/net/netutil" "tailscale.com/net/stun" "tailscale.com/syncs" |