Skip to content

Commit f4ae81e

Browse files
alexwlchanalexwlchan
authored
tsnet: remove APIClient() which is deprecated and now unused (tailscale#17073)
Updates tailscale/corp#22748 Signed-off-by: Alex Chan <alexc@tailscale.com>
1 parent 3e4b0c1 commit f4ae81e

File tree

3 files changed

+6
-28
lines changed

3 files changed

+6
-28
lines changed

‎cmd/tsidp/depaware.txt‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -217,8 +217,7 @@ tailscale.com/cmd/tsidp dependencies: (generated by github.com/tailscale/depawar
217217
tailscale.com from tailscale.com/version
218218
tailscale.com/appc from tailscale.com/ipn/ipnlocal
219219
💣 tailscale.com/atomicfile from tailscale.com/ipn+
220-
tailscale.com/client/local from tailscale.com/client/tailscale+
221-
tailscale.com/client/tailscale from tailscale.com/tsnet
220+
tailscale.com/client/local from tailscale.com/client/web+
222221
tailscale.com/client/tailscale/apitype from tailscale.com/client/local+
223222
tailscale.com/client/web from tailscale.com/ipn/ipnlocal
224223
tailscale.com/clientupdate from tailscale.com/client/web+
@@ -343,7 +342,7 @@ tailscale.com/cmd/tsidp dependencies: (generated by github.com/tailscale/depawar
343342
tailscale.com/types/netlogtype from tailscale.com/net/connstats+
344343
tailscale.com/types/netmap from tailscale.com/control/controlclient+
345344
tailscale.com/types/nettype from tailscale.com/ipn/localapi+
346-
tailscale.com/types/opt from tailscale.com/client/tailscale+
345+
tailscale.com/types/opt from tailscale.com/cmd/tsidp+
347346
tailscale.com/types/persist from tailscale.com/control/controlclient+
348347
tailscale.com/types/preftype from tailscale.com/ipn+
349348
tailscale.com/types/ptr from tailscale.com/control/controlclient+
@@ -364,7 +363,7 @@ tailscale.com/cmd/tsidp dependencies: (generated by github.com/tailscale/depawar
364363
tailscale.com/util/goroutines from tailscale.com/ipn/ipnlocal
365364
tailscale.com/util/groupmember from tailscale.com/client/web+
366365
💣 tailscale.com/util/hashx from tailscale.com/util/deephash
367-
tailscale.com/util/httpm from tailscale.com/client/tailscale+
366+
tailscale.com/util/httpm from tailscale.com/client/web+
368367
tailscale.com/util/lineiter from tailscale.com/hostinfo+
369368
L tailscale.com/util/linuxfw from tailscale.com/net/netns+
370369
tailscale.com/util/mak from tailscale.com/appc+

‎tsnet/depaware.txt‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -213,8 +213,7 @@ tailscale.com/tsnet dependencies: (generated by github.com/tailscale/depaware)
213213
tailscale.com from tailscale.com/version
214214
tailscale.com/appc from tailscale.com/ipn/ipnlocal
215215
💣 tailscale.com/atomicfile from tailscale.com/ipn+
216-
tailscale.com/client/local from tailscale.com/client/tailscale+
217-
tailscale.com/client/tailscale from tailscale.com/tsnet
216+
tailscale.com/client/local from tailscale.com/client/web+
218217
tailscale.com/client/tailscale/apitype from tailscale.com/client/local+
219218
LDW tailscale.com/client/web from tailscale.com/ipn/ipnlocal
220219
tailscale.com/clientupdate from tailscale.com/client/web+
@@ -338,7 +337,7 @@ tailscale.com/tsnet dependencies: (generated by github.com/tailscale/depaware)
338337
tailscale.com/types/netlogtype from tailscale.com/net/connstats+
339338
tailscale.com/types/netmap from tailscale.com/control/controlclient+
340339
tailscale.com/types/nettype from tailscale.com/ipn/localapi+
341-
tailscale.com/types/opt from tailscale.com/client/tailscale+
340+
tailscale.com/types/opt from tailscale.com/control/controlknobs+
342341
tailscale.com/types/persist from tailscale.com/control/controlclient+
343342
tailscale.com/types/preftype from tailscale.com/ipn+
344343
tailscale.com/types/ptr from tailscale.com/control/controlclient+
@@ -359,7 +358,7 @@ tailscale.com/tsnet dependencies: (generated by github.com/tailscale/depaware)
359358
tailscale.com/util/goroutines from tailscale.com/ipn/ipnlocal
360359
tailscale.com/util/groupmember from tailscale.com/client/web+
361360
💣 tailscale.com/util/hashx from tailscale.com/util/deephash
362-
tailscale.com/util/httpm from tailscale.com/client/tailscale+
361+
tailscale.com/util/httpm from tailscale.com/client/web+
363362
tailscale.com/util/lineiter from tailscale.com/hostinfo+
364363
L tailscale.com/util/linuxfw from tailscale.com/net/netns+
365364
tailscale.com/util/mak from tailscale.com/appc+

‎tsnet/tsnet.go‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ import (
2727
"time"
2828

2929
"tailscale.com/client/local"
30-
"tailscale.com/client/tailscale"
3130
"tailscale.com/control/controlclient"
3231
"tailscale.com/envknob"
3332
"tailscale.com/health"
@@ -910,25 +909,6 @@ func (s *Server) getUDPHandlerForFlow(src, dst netip.AddrPort) (handler func(net
910909
return func(c nettype.ConnPacketConn) { ln.handle(c) }, true
911910
}
912911

913-
// APIClient returns a tailscale.Client that can be used to make authenticated
914-
// requests to the Tailscale control server.
915-
// It requires the user to set tailscale.I_Acknowledge_This_API_Is_Unstable.
916-
//
917-
// Deprecated: use AuthenticatedAPITransport with tailscale.com/client/tailscale/v2 instead.
918-
func (s *Server) APIClient() (*tailscale.Client, error) {
919-
if !tailscale.I_Acknowledge_This_API_Is_Unstable {
920-
return nil, errors.New("use of Client without setting I_Acknowledge_This_API_Is_Unstable")
921-
}
922-
if err := s.Start(); err != nil {
923-
return nil, err
924-
}
925-
926-
c := tailscale.NewClient("-", nil)
927-
c.UserAgent = "tailscale-tsnet"
928-
c.HTTPClient = &http.Client{Transport: s.lb.KeyProvingNoiseRoundTripper()}
929-
return c, nil
930-
}
931-
932912
// I_Acknowledge_This_API_Is_Experimental must be set true to use AuthenticatedAPITransport()
933913
// for now.
934914
var I_Acknowledge_This_API_Is_Experimental = false

0 commit comments

Comments
 (0)