go.toolchain.branch: switch to Go 1.26
Updates #18682 Change-Id: I1eadfab950e55d004484af880a5d8df6893e85e8 Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
This commit is contained in:
committed by
Brad Fitzpatrick
parent
87bf76de89
commit
d784dcc61b
@@ -224,7 +224,7 @@ func runNetworkLockStatus(ctx context.Context, args []string) error {
|
||||
if nlStatusArgs.json.Value == 1 {
|
||||
return jsonoutput.PrintNetworkLockStatusJSONV1(os.Stdout, st)
|
||||
} else {
|
||||
return fmt.Errorf("unrecognised version: %q", nlStatusArgs.json.Value)
|
||||
return fmt.Errorf("unrecognised version: %d", nlStatusArgs.json.Value)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -717,7 +717,7 @@ func printNetworkLockLog(updates []ipnstate.NetworkLockUpdate, out io.Writer, js
|
||||
if jsonSchema.Value == 1 {
|
||||
return jsonoutput.PrintNetworkLockLogJSONV1(out, updates)
|
||||
} else {
|
||||
return fmt.Errorf("unrecognised version: %q", jsonSchema.Value)
|
||||
return fmt.Errorf("unrecognised version: %d", jsonSchema.Value)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -219,7 +219,7 @@ var errHelpFunc = func(m serveMode) error {
|
||||
// newServeV2Command returns a new "serve" subcommand using e as its environment.
|
||||
func newServeV2Command(e *serveEnv, subcmd serveMode) *ffcli.Command {
|
||||
if subcmd != serve && subcmd != funnel {
|
||||
log.Fatalf("newServeDevCommand called with unknown subcmd %q", subcmd)
|
||||
log.Fatalf("newServeDevCommand called with unknown subcmd %v", subcmd)
|
||||
}
|
||||
|
||||
info := infoMap[subcmd]
|
||||
|
||||
@@ -176,13 +176,13 @@ func runStatus(ctx context.Context, args []string) error {
|
||||
}
|
||||
if !ps.Active {
|
||||
if ps.ExitNode {
|
||||
f("idle; exit node" + offline)
|
||||
f("idle; exit node%s", offline)
|
||||
} else if ps.ExitNodeOption {
|
||||
f("idle; offers exit node" + offline)
|
||||
f("idle; offers exit node%s", offline)
|
||||
} else if anyTraffic {
|
||||
f("idle" + offline)
|
||||
f("idle%s", offline)
|
||||
} else if !ps.Online {
|
||||
f("offline" + lastSeenFmt(ps.LastSeen))
|
||||
f("offline%s", lastSeenFmt(ps.LastSeen))
|
||||
} else {
|
||||
f("-")
|
||||
}
|
||||
@@ -201,7 +201,7 @@ func runStatus(ctx context.Context, args []string) error {
|
||||
f("peer-relay %s", ps.PeerRelay)
|
||||
}
|
||||
if !ps.Online {
|
||||
f(offline)
|
||||
f("%s", offline)
|
||||
}
|
||||
}
|
||||
if anyTraffic {
|
||||
|
||||
+21
-15
@@ -1,5 +1,6 @@
|
||||
tailscale.com/cmd/tailscale dependencies: (generated by github.com/tailscale/depaware)
|
||||
|
||||
💣 crypto/internal/entropy/v1.0.0 from crypto/internal/fips140/drbg
|
||||
filippo.io/edwards25519 from github.com/hdevalence/ed25519consensus
|
||||
filippo.io/edwards25519/field from filippo.io/edwards25519
|
||||
L fyne.io/systray from tailscale.com/client/systray
|
||||
@@ -352,7 +353,7 @@ tailscale.com/cmd/tailscale dependencies: (generated by github.com/tailscale/dep
|
||||
golang.org/x/text/unicode/norm from golang.org/x/net/idna
|
||||
golang.org/x/time/rate from tailscale.com/cmd/tailscale/cli+
|
||||
vendor/golang.org/x/crypto/chacha20 from vendor/golang.org/x/crypto/chacha20poly1305
|
||||
vendor/golang.org/x/crypto/chacha20poly1305 from crypto/internal/hpke+
|
||||
vendor/golang.org/x/crypto/chacha20poly1305 from crypto/hpke+
|
||||
vendor/golang.org/x/crypto/cryptobyte from crypto/ecdsa+
|
||||
vendor/golang.org/x/crypto/cryptobyte/asn1 from crypto/ecdsa+
|
||||
vendor/golang.org/x/crypto/internal/alias from vendor/golang.org/x/crypto/chacha20+
|
||||
@@ -377,7 +378,7 @@ tailscale.com/cmd/tailscale dependencies: (generated by github.com/tailscale/dep
|
||||
container/list from crypto/tls+
|
||||
context from crypto/tls+
|
||||
crypto from crypto/ecdh+
|
||||
crypto/aes from crypto/internal/hpke+
|
||||
crypto/aes from crypto/tls+
|
||||
crypto/cipher from crypto/aes+
|
||||
crypto/des from crypto/tls+
|
||||
crypto/dsa from crypto/x509
|
||||
@@ -385,13 +386,14 @@ tailscale.com/cmd/tailscale dependencies: (generated by github.com/tailscale/dep
|
||||
crypto/ecdsa from crypto/tls+
|
||||
crypto/ed25519 from crypto/tls+
|
||||
crypto/elliptic from crypto/ecdsa+
|
||||
crypto/fips140 from crypto/tls/internal/fips140tls
|
||||
crypto/hkdf from crypto/internal/hpke+
|
||||
crypto/fips140 from crypto/tls/internal/fips140tls+
|
||||
crypto/hkdf from crypto/hpke+
|
||||
crypto/hmac from crypto/tls+
|
||||
crypto/hpke from crypto/tls
|
||||
crypto/internal/boring from crypto/aes+
|
||||
crypto/internal/boring/bbig from crypto/ecdsa+
|
||||
crypto/internal/boring/sig from crypto/internal/boring
|
||||
crypto/internal/entropy from crypto/internal/fips140/drbg
|
||||
crypto/internal/constanttime from crypto/internal/fips140/edwards25519+
|
||||
crypto/internal/fips140 from crypto/internal/fips140/aes+
|
||||
crypto/internal/fips140/aes from crypto/aes+
|
||||
crypto/internal/fips140/aes/gcm from crypto/cipher+
|
||||
@@ -406,7 +408,7 @@ tailscale.com/cmd/tailscale dependencies: (generated by github.com/tailscale/dep
|
||||
crypto/internal/fips140/edwards25519/field from crypto/ecdh+
|
||||
crypto/internal/fips140/hkdf from crypto/internal/fips140/tls13+
|
||||
crypto/internal/fips140/hmac from crypto/hmac+
|
||||
crypto/internal/fips140/mlkem from crypto/tls
|
||||
crypto/internal/fips140/mlkem from crypto/mlkem
|
||||
crypto/internal/fips140/nistec from crypto/elliptic+
|
||||
crypto/internal/fips140/nistec/fiat from crypto/internal/fips140/nistec
|
||||
crypto/internal/fips140/rsa from crypto/rsa
|
||||
@@ -420,19 +422,21 @@ tailscale.com/cmd/tailscale dependencies: (generated by github.com/tailscale/dep
|
||||
crypto/internal/fips140deps/byteorder from crypto/internal/fips140/aes+
|
||||
crypto/internal/fips140deps/cpu from crypto/internal/fips140/aes+
|
||||
crypto/internal/fips140deps/godebug from crypto/internal/fips140+
|
||||
crypto/internal/fips140deps/time from crypto/internal/entropy/v1.0.0
|
||||
crypto/internal/fips140hash from crypto/ecdsa+
|
||||
crypto/internal/fips140only from crypto/cipher+
|
||||
crypto/internal/hpke from crypto/tls
|
||||
crypto/internal/impl from crypto/internal/fips140/aes+
|
||||
crypto/internal/randutil from crypto/dsa+
|
||||
crypto/internal/sysrand from crypto/internal/entropy+
|
||||
crypto/internal/rand from crypto/dsa+
|
||||
crypto/internal/randutil from crypto/internal/rand
|
||||
crypto/internal/sysrand from crypto/internal/fips140/drbg
|
||||
crypto/md5 from crypto/tls+
|
||||
crypto/mlkem from crypto/hpke+
|
||||
crypto/rand from crypto/ed25519+
|
||||
crypto/rc4 from crypto/tls
|
||||
crypto/rsa from crypto/tls+
|
||||
crypto/sha1 from crypto/tls+
|
||||
crypto/sha256 from crypto/tls+
|
||||
crypto/sha3 from crypto/internal/fips140hash
|
||||
crypto/sha3 from crypto/internal/fips140hash+
|
||||
crypto/sha512 from crypto/ecdsa+
|
||||
crypto/subtle from crypto/cipher+
|
||||
crypto/tls from net/http+
|
||||
@@ -482,9 +486,8 @@ tailscale.com/cmd/tailscale dependencies: (generated by github.com/tailscale/dep
|
||||
internal/goarch from crypto/internal/fips140deps/cpu+
|
||||
internal/godebug from archive/tar+
|
||||
internal/godebugs from internal/godebug+
|
||||
internal/goexperiment from hash/maphash+
|
||||
internal/goexperiment from net/http/pprof+
|
||||
internal/goos from crypto/x509+
|
||||
internal/itoa from internal/poll+
|
||||
internal/msan from internal/runtime/maps+
|
||||
internal/nettrace from net+
|
||||
internal/oserror from io/fs+
|
||||
@@ -497,14 +500,17 @@ tailscale.com/cmd/tailscale dependencies: (generated by github.com/tailscale/dep
|
||||
internal/runtime/atomic from internal/runtime/exithook+
|
||||
L internal/runtime/cgroup from runtime
|
||||
internal/runtime/exithook from runtime
|
||||
internal/runtime/gc from runtime
|
||||
internal/runtime/gc from runtime+
|
||||
internal/runtime/gc/scan from runtime
|
||||
internal/runtime/maps from reflect+
|
||||
internal/runtime/math from internal/runtime/maps+
|
||||
internal/runtime/strconv from internal/runtime/cgroup+
|
||||
internal/runtime/pprof/label from runtime+
|
||||
internal/runtime/sys from crypto/subtle+
|
||||
L internal/runtime/syscall from runtime+
|
||||
L internal/runtime/syscall/linux from internal/runtime/cgroup+
|
||||
W internal/runtime/syscall/windows from internal/syscall/windows+
|
||||
internal/saferio from debug/pe+
|
||||
internal/singleflight from net
|
||||
internal/strconv from internal/poll+
|
||||
internal/stringslite from embed+
|
||||
internal/sync from sync+
|
||||
internal/synctest from sync
|
||||
|
||||
Reference in New Issue
Block a user