From 865d8c0d23a4a5f538f6c4055d93dcb84d47705f Mon Sep 17 00:00:00 2001 From: Josh Bleecher Snyder Date: Thu, 19 Aug 2021 11:10:27 -0700 Subject: [PATCH] cmd: upgrade to ffcli v3 None of the breaking changes from v2 to v3 are relevant to us. Signed-off-by: Josh Bleecher Snyder --- cmd/speedtest/speedtest.go | 2 +- cmd/tailscale/cli/bugreport.go | 2 +- cmd/tailscale/cli/cert.go | 2 +- cmd/tailscale/cli/cli.go | 2 +- cmd/tailscale/cli/debug.go | 2 +- cmd/tailscale/cli/down.go | 2 +- cmd/tailscale/cli/file.go | 2 +- cmd/tailscale/cli/ip.go | 2 +- cmd/tailscale/cli/logout.go | 2 +- cmd/tailscale/cli/netcheck.go | 2 +- cmd/tailscale/cli/ping.go | 2 +- cmd/tailscale/cli/status.go | 2 +- cmd/tailscale/cli/up.go | 2 +- cmd/tailscale/cli/version.go | 2 +- cmd/tailscale/cli/web.go | 2 +- cmd/tailscale/depaware.txt | 8 ++++---- go.mod | 2 +- go.sum | 4 ++-- 18 files changed, 22 insertions(+), 22 deletions(-) diff --git a/cmd/speedtest/speedtest.go b/cmd/speedtest/speedtest.go index 5f318b63b..d63e0d239 100644 --- a/cmd/speedtest/speedtest.go +++ b/cmd/speedtest/speedtest.go @@ -23,7 +23,7 @@ import ( "text/tabwriter" "time" - "github.com/peterbourgon/ff/v2/ffcli" + "github.com/peterbourgon/ff/v3/ffcli" "tailscale.com/net/speedtest" ) diff --git a/cmd/tailscale/cli/bugreport.go b/cmd/tailscale/cli/bugreport.go index 46c32bf96..1ca0747e6 100644 --- a/cmd/tailscale/cli/bugreport.go +++ b/cmd/tailscale/cli/bugreport.go @@ -9,7 +9,7 @@ import ( "errors" "fmt" - "github.com/peterbourgon/ff/v2/ffcli" + "github.com/peterbourgon/ff/v3/ffcli" "tailscale.com/client/tailscale" ) diff --git a/cmd/tailscale/cli/cert.go b/cmd/tailscale/cli/cert.go index f6acb7137..1b3470724 100644 --- a/cmd/tailscale/cli/cert.go +++ b/cmd/tailscale/cli/cert.go @@ -15,7 +15,7 @@ import ( "os" "strings" - "github.com/peterbourgon/ff/v2/ffcli" + "github.com/peterbourgon/ff/v3/ffcli" "tailscale.com/atomicfile" "tailscale.com/client/tailscale" ) diff --git a/cmd/tailscale/cli/cli.go b/cmd/tailscale/cli/cli.go index 8d38e89b9..6c1628ebc 100644 --- a/cmd/tailscale/cli/cli.go +++ b/cmd/tailscale/cli/cli.go @@ -23,7 +23,7 @@ import ( "syscall" "text/tabwriter" - "github.com/peterbourgon/ff/v2/ffcli" + "github.com/peterbourgon/ff/v3/ffcli" "tailscale.com/client/tailscale" "tailscale.com/ipn" "tailscale.com/paths" diff --git a/cmd/tailscale/cli/debug.go b/cmd/tailscale/cli/debug.go index a25cd41e4..f5cc32ef6 100644 --- a/cmd/tailscale/cli/debug.go +++ b/cmd/tailscale/cli/debug.go @@ -16,7 +16,7 @@ import ( "runtime" "strings" - "github.com/peterbourgon/ff/v2/ffcli" + "github.com/peterbourgon/ff/v3/ffcli" "tailscale.com/client/tailscale" "tailscale.com/ipn" "tailscale.com/paths" diff --git a/cmd/tailscale/cli/down.go b/cmd/tailscale/cli/down.go index c0a9034fe..0f5d49101 100644 --- a/cmd/tailscale/cli/down.go +++ b/cmd/tailscale/cli/down.go @@ -10,7 +10,7 @@ import ( "log" "os" - "github.com/peterbourgon/ff/v2/ffcli" + "github.com/peterbourgon/ff/v3/ffcli" "tailscale.com/client/tailscale" "tailscale.com/ipn" ) diff --git a/cmd/tailscale/cli/file.go b/cmd/tailscale/cli/file.go index 7f6d9b5f0..9490ca5db 100644 --- a/cmd/tailscale/cli/file.go +++ b/cmd/tailscale/cli/file.go @@ -23,7 +23,7 @@ import ( "time" "unicode/utf8" - "github.com/peterbourgon/ff/v2/ffcli" + "github.com/peterbourgon/ff/v3/ffcli" "golang.org/x/time/rate" "inet.af/netaddr" "tailscale.com/client/tailscale" diff --git a/cmd/tailscale/cli/ip.go b/cmd/tailscale/cli/ip.go index 3acc683e5..0c3910a6e 100644 --- a/cmd/tailscale/cli/ip.go +++ b/cmd/tailscale/cli/ip.go @@ -10,7 +10,7 @@ import ( "flag" "fmt" - "github.com/peterbourgon/ff/v2/ffcli" + "github.com/peterbourgon/ff/v3/ffcli" "inet.af/netaddr" "tailscale.com/client/tailscale" "tailscale.com/ipn/ipnstate" diff --git a/cmd/tailscale/cli/logout.go b/cmd/tailscale/cli/logout.go index 6356b2452..a58a0f1ba 100644 --- a/cmd/tailscale/cli/logout.go +++ b/cmd/tailscale/cli/logout.go @@ -9,7 +9,7 @@ import ( "log" "strings" - "github.com/peterbourgon/ff/v2/ffcli" + "github.com/peterbourgon/ff/v3/ffcli" "tailscale.com/client/tailscale" ) diff --git a/cmd/tailscale/cli/netcheck.go b/cmd/tailscale/cli/netcheck.go index 106e085e0..37c9611de 100644 --- a/cmd/tailscale/cli/netcheck.go +++ b/cmd/tailscale/cli/netcheck.go @@ -18,7 +18,7 @@ import ( "strings" "time" - "github.com/peterbourgon/ff/v2/ffcli" + "github.com/peterbourgon/ff/v3/ffcli" "tailscale.com/client/tailscale" "tailscale.com/ipn" "tailscale.com/net/netcheck" diff --git a/cmd/tailscale/cli/ping.go b/cmd/tailscale/cli/ping.go index 0d3c16caf..2182474a5 100644 --- a/cmd/tailscale/cli/ping.go +++ b/cmd/tailscale/cli/ping.go @@ -14,7 +14,7 @@ import ( "strings" "time" - "github.com/peterbourgon/ff/v2/ffcli" + "github.com/peterbourgon/ff/v3/ffcli" "tailscale.com/client/tailscale" "tailscale.com/ipn" "tailscale.com/ipn/ipnstate" diff --git a/cmd/tailscale/cli/status.go b/cmd/tailscale/cli/status.go index 8e40067a7..042b70f7a 100644 --- a/cmd/tailscale/cli/status.go +++ b/cmd/tailscale/cli/status.go @@ -15,7 +15,7 @@ import ( "os" "strings" - "github.com/peterbourgon/ff/v2/ffcli" + "github.com/peterbourgon/ff/v3/ffcli" "github.com/toqueteos/webbrowser" "inet.af/netaddr" "tailscale.com/client/tailscale" diff --git a/cmd/tailscale/cli/up.go b/cmd/tailscale/cli/up.go index 0f9747f13..ec75eeb20 100644 --- a/cmd/tailscale/cli/up.go +++ b/cmd/tailscale/cli/up.go @@ -17,7 +17,7 @@ import ( "sync" shellquote "github.com/kballard/go-shellquote" - "github.com/peterbourgon/ff/v2/ffcli" + "github.com/peterbourgon/ff/v3/ffcli" "inet.af/netaddr" "tailscale.com/client/tailscale" "tailscale.com/ipn" diff --git a/cmd/tailscale/cli/version.go b/cmd/tailscale/cli/version.go index 2c6f97a3b..904c11e11 100644 --- a/cmd/tailscale/cli/version.go +++ b/cmd/tailscale/cli/version.go @@ -10,7 +10,7 @@ import ( "fmt" "log" - "github.com/peterbourgon/ff/v2/ffcli" + "github.com/peterbourgon/ff/v3/ffcli" "tailscale.com/client/tailscale" "tailscale.com/version" ) diff --git a/cmd/tailscale/cli/web.go b/cmd/tailscale/cli/web.go index e54a24b3f..c2b2702e4 100644 --- a/cmd/tailscale/cli/web.go +++ b/cmd/tailscale/cli/web.go @@ -23,7 +23,7 @@ import ( "runtime" "strings" - "github.com/peterbourgon/ff/v2/ffcli" + "github.com/peterbourgon/ff/v3/ffcli" "tailscale.com/client/tailscale" "tailscale.com/ipn" "tailscale.com/tailcfg" diff --git a/cmd/tailscale/depaware.txt b/cmd/tailscale/depaware.txt index 365c35a5d..643040420 100644 --- a/cmd/tailscale/depaware.txt +++ b/cmd/tailscale/depaware.txt @@ -5,8 +5,8 @@ tailscale.com/cmd/tailscale dependencies: (generated by github.com/tailscale/dep W 💣 github.com/alexbrainman/sspi/negotiate from tailscale.com/net/tshttpproxy github.com/kballard/go-shellquote from tailscale.com/cmd/tailscale/cli 💣 github.com/mitchellh/go-ps from tailscale.com/cmd/tailscale/cli+ - github.com/peterbourgon/ff/v2 from github.com/peterbourgon/ff/v2/ffcli - github.com/peterbourgon/ff/v2/ffcli from tailscale.com/cmd/tailscale/cli + github.com/peterbourgon/ff/v3 from github.com/peterbourgon/ff/v3/ffcli + github.com/peterbourgon/ff/v3/ffcli from tailscale.com/cmd/tailscale/cli github.com/tailscale/goupnp from github.com/tailscale/goupnp/dcps/internetgateway2+ github.com/tailscale/goupnp/dcps/internetgateway2 from tailscale.com/net/portmapper github.com/tailscale/goupnp/httpu from github.com/tailscale/goupnp+ @@ -136,7 +136,7 @@ tailscale.com/cmd/tailscale dependencies: (generated by github.com/tailscale/dep encoding/xml from tailscale.com/cmd/tailscale/cli+ errors from bufio+ expvar from tailscale.com/derp+ - flag from github.com/peterbourgon/ff/v2+ + flag from github.com/peterbourgon/ff/v3+ fmt from compress/flate+ hash from crypto+ hash/crc32 from compress/gzip+ @@ -177,7 +177,7 @@ tailscale.com/cmd/tailscale dependencies: (generated by github.com/tailscale/dep sync from compress/flate+ sync/atomic from context+ syscall from crypto/rand+ - text/tabwriter from github.com/peterbourgon/ff/v2/ffcli+ + text/tabwriter from github.com/peterbourgon/ff/v3/ffcli+ text/template from html/template text/template/parse from html/template+ time from compress/gzip+ diff --git a/go.mod b/go.mod index af9ceb62a..b00b7c375 100644 --- a/go.mod +++ b/go.mod @@ -27,7 +27,7 @@ require ( github.com/miekg/dns v1.1.42 github.com/mitchellh/go-ps v1.0.0 github.com/pborman/getopt v1.1.0 - github.com/peterbourgon/ff/v2 v2.0.0 + github.com/peterbourgon/ff/v3 v3.1.0 github.com/pkg/sftp v1.13.0 github.com/tailscale/certstore v0.0.0-20210528134328-066c94b793d3 github.com/tailscale/depaware v0.0.0-20201214215404-77d1e9757027 diff --git a/go.sum b/go.sum index 7694fa96a..bf46f82f2 100644 --- a/go.sum +++ b/go.sum @@ -465,9 +465,9 @@ github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/9 github.com/pelletier/go-toml v1.6.0/go.mod h1:5N711Q9dKgbdkxHL+MEfF31hpT7l0S0s/t2kKREewys= github.com/pelletier/go-toml v1.8.1 h1:1Nf83orprkJyknT6h7zbuEGUEjcyVlCxSUGTENmNCRM= github.com/pelletier/go-toml v1.8.1/go.mod h1:T2/BmBdy8dvIRq1a/8aqjN41wvWlN4lrapLU/GW4pbc= -github.com/peterbourgon/ff/v2 v2.0.0 h1:lx0oYI5qr/FU1xnpNhQ+EZM04gKgn46jyYvGEEqBBbY= -github.com/peterbourgon/ff/v2 v2.0.0/go.mod h1:xjwr+t+SjWm4L46fcj/D+Ap+6ME7+HqFzaP22pP5Ggk= github.com/peterbourgon/ff/v3 v3.0.0/go.mod h1:UILIFjRH5a/ar8TjXYLTkIvSvekZqPm5Eb/qbGk6CT0= +github.com/peterbourgon/ff/v3 v3.1.0 h1:5JAeDK5j/zhKFjyHEZQXwXBoDijERaos10RE+xamOsY= +github.com/peterbourgon/ff/v3 v3.1.0/go.mod h1:XNJLY8EIl6MjMVjBS4F0+G0LYoAqs0DTa4rmHHukKDE= github.com/phayes/checkstyle v0.0.0-20170904204023-bfd46e6a821d h1:CdDQnGF8Nq9ocOS/xlSptM1N3BbrA6/kmaep5ggwaIA= github.com/phayes/checkstyle v0.0.0-20170904204023-bfd46e6a821d/go.mod h1:3OzsM7FXDQlpCiw2j81fOmAwQLnZnLGXVKUzeKQXIAw= github.com/pkg/diff v0.0.0-20200914180035-5b29258ca4f7 h1:+/+DxvQaYifJ+grD4klzrS5y+KJXldn/2YTl5JG+vZ8=