diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index c00f94a5e8382..6e3d8fa18a1f5 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -179,13 +179,13 @@ jobs: # tested more exhaustively in the 'test' job above. - goos: linux goarch: arm64 - - goos: linux - goarch: "386" # thanks yaml - - goos: linux - goarch: loong64 - - goos: linux - goarch: arm - goarm: "5" + # - goos: linux + # goarch: "386" # thanks yaml + # - goos: linux + # goarch: loong64 + # - goos: linux + # goarch: arm + # goarm: "5" - goos: linux goarch: arm goarm: "7" @@ -199,11 +199,11 @@ jobs: goarch: amd64 - goos: windows goarch: arm64 - # BSDs - - goos: freebsd - goarch: amd64 - - goos: openbsd - goarch: amd64 + # # BSDs + # - goos: freebsd + # goarch: amd64 + # - goos: openbsd + # goarch: amd64 runs-on: ubuntu-22.04 steps: @@ -452,7 +452,7 @@ jobs: { "attachments": [{ "title": "Failure: ${{ github.workflow }}", - "title_link": "https://github.com/${{ github.repository }}/commit/${{ github.sha }}/checks", + "title_link": "https://github.com/${{ github.repository }}/commit/${{ github.sha }}/checks", "text": "${{ github.repository }}@${{ github.ref_name }}: ", "fields": [{ "value": ${{ toJson(github.event.head_commit.message) }}, "short": false }], "footer": "${{ github.event.head_commit.committer.name }} at ${{ github.event.head_commit.timestamp }}", diff --git a/Dockerfile b/Dockerfile index 74f811352d3e0..eeae5f396955e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -31,7 +31,7 @@ # $ docker exec tailscaled tailscale status -FROM golang:1.22-alpine AS build-env +FROM golang:1.23-alpine AS build-env WORKDIR /go/src/tailscale diff --git a/cmd/derper/depaware.txt b/cmd/derper/depaware.txt index 8c62b00431d7c..157e6e1a3ee6c 100644 --- a/cmd/derper/depaware.txt +++ b/cmd/derper/depaware.txt @@ -57,6 +57,7 @@ tailscale.com/cmd/derper dependencies: (generated by github.com/tailscale/depawa google.golang.org/protobuf/internal/descfmt from google.golang.org/protobuf/internal/filedesc google.golang.org/protobuf/internal/descopts from google.golang.org/protobuf/internal/filedesc+ google.golang.org/protobuf/internal/detrand from google.golang.org/protobuf/internal/descfmt+ + google.golang.org/protobuf/internal/editiondefaults from google.golang.org/protobuf/internal/filedesc+ google.golang.org/protobuf/internal/encoding/defval from google.golang.org/protobuf/internal/encoding/tag+ google.golang.org/protobuf/internal/encoding/messageset from google.golang.org/protobuf/encoding/prototext+ google.golang.org/protobuf/internal/encoding/tag from google.golang.org/protobuf/internal/impl @@ -78,7 +79,8 @@ tailscale.com/cmd/derper dependencies: (generated by github.com/tailscale/depawa google.golang.org/protobuf/reflect/protoregistry from github.com/golang/protobuf/proto+ google.golang.org/protobuf/runtime/protoiface from github.com/golang/protobuf/proto+ google.golang.org/protobuf/runtime/protoimpl from github.com/golang/protobuf/proto+ - google.golang.org/protobuf/types/descriptorpb from google.golang.org/protobuf/reflect/protodesc + google.golang.org/protobuf/types/descriptorpb from google.golang.org/protobuf/reflect/protodesc+ + google.golang.org/protobuf/types/gofeaturespb from google.golang.org/protobuf/reflect/protodesc 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+ @@ -159,11 +161,10 @@ tailscale.com/cmd/derper dependencies: (generated by github.com/tailscale/depawa golang.org/x/crypto/blake2b from golang.org/x/crypto/nacl/box+ golang.org/x/crypto/blake2s from tailscale.com/tka golang.org/x/crypto/chacha20 from golang.org/x/crypto/chacha20poly1305 - golang.org/x/crypto/chacha20poly1305 from crypto/tls + golang.org/x/crypto/chacha20poly1305 from crypto/tls+ golang.org/x/crypto/cryptobyte from crypto/ecdsa+ golang.org/x/crypto/cryptobyte/asn1 from crypto/ecdsa+ golang.org/x/crypto/curve25519 from golang.org/x/crypto/nacl/box+ - golang.org/x/crypto/hkdf from crypto/tls golang.org/x/crypto/nacl/box from tailscale.com/types/key golang.org/x/crypto/nacl/secretbox from golang.org/x/crypto/nacl/box golang.org/x/crypto/salsa20/salsa from golang.org/x/crypto/nacl/box+ @@ -198,7 +199,7 @@ tailscale.com/cmd/derper dependencies: (generated by github.com/tailscale/depawa container/list from crypto/tls+ context from crypto/tls+ crypto from crypto/ecdsa+ - crypto/aes from crypto/ecdsa+ + crypto/aes from crypto/internal/hpke+ crypto/cipher from crypto/aes+ crypto/des from crypto/tls+ crypto/dsa from crypto/x509 @@ -213,12 +214,13 @@ tailscale.com/cmd/derper dependencies: (generated by github.com/tailscale/depawa crypto/rsa from crypto/tls+ crypto/sha1 from crypto/tls+ crypto/sha256 from crypto/tls+ + crypto/sha3 from crypto/internal/fips140hash crypto/sha512 from crypto/ecdsa+ - crypto/subtle from crypto/aes+ + crypto/subtle from crypto/cipher+ crypto/tls from golang.org/x/crypto/acme+ crypto/x509 from crypto/tls+ crypto/x509/pkix from crypto/x509+ - embed from crypto/internal/nistec+ + embed from google.golang.org/protobuf/internal/editiondefaults+ encoding from encoding/json+ encoding/asn1 from crypto/x509+ encoding/base32 from tailscale.com/tka @@ -240,12 +242,15 @@ tailscale.com/cmd/derper dependencies: (generated by github.com/tailscale/depawa io from bufio+ io/fs from crypto/x509+ io/ioutil from github.com/mitchellh/go-ps+ + iter from bytes+ log from expvar+ log/internal from log + maps from crypto/x509+ math from compress/flate+ math/big from crypto/dsa+ math/bits from compress/flate+ math/rand from github.com/mdlayher/netlink+ + math/rand/v2 from crypto/ecdsa+ mime from mime/multipart+ mime/multipart from net/http mime/quotedprintable from mime/multipart @@ -257,7 +262,7 @@ tailscale.com/cmd/derper dependencies: (generated by github.com/tailscale/depawa net/netip from go4.org/netipx+ net/textproto from golang.org/x/net/http/httpguts+ net/url from crypto/x509+ - os from crypto/rand+ + os from crypto/internal/sysrand+ os/exec from golang.zx2c4.com/wireguard/windows/tunnel/winipcfg+ W os/user from tailscale.com/util/winutil path from golang.org/x/crypto/acme/autocert+ @@ -275,9 +280,11 @@ tailscale.com/cmd/derper dependencies: (generated by github.com/tailscale/depawa strings from bufio+ sync from compress/flate+ sync/atomic from context+ - syscall from crypto/rand+ + syscall from crypto/internal/sysrand+ text/tabwriter from runtime/pprof time from compress/gzip+ unicode from bytes+ unicode/utf16 from crypto/x509+ unicode/utf8 from bufio+ + unique from net/netip + weak from unique diff --git a/cmd/tailscale/depaware.txt b/cmd/tailscale/depaware.txt index 43ef2ba4e090b..314a7c0c74adc 100644 --- a/cmd/tailscale/depaware.txt +++ b/cmd/tailscale/depaware.txt @@ -158,7 +158,7 @@ tailscale.com/cmd/tailscale dependencies: (generated by github.com/tailscale/dep golang.org/x/crypto/cryptobyte from crypto/ecdsa+ golang.org/x/crypto/cryptobyte/asn1 from crypto/ecdsa+ golang.org/x/crypto/curve25519 from golang.org/x/crypto/nacl/box+ - golang.org/x/crypto/hkdf from crypto/tls+ + golang.org/x/crypto/hkdf from tailscale.com/control/controlbase golang.org/x/crypto/nacl/box from tailscale.com/types/key golang.org/x/crypto/nacl/secretbox from golang.org/x/crypto/nacl/box golang.org/x/crypto/pbkdf2 from software.sslmate.com/src/go-pkcs12 @@ -201,7 +201,7 @@ tailscale.com/cmd/tailscale dependencies: (generated by github.com/tailscale/dep container/list from crypto/tls+ context from crypto/tls+ crypto from crypto/ecdsa+ - crypto/aes from crypto/ecdsa+ + crypto/aes from crypto/internal/hpke+ crypto/cipher from crypto/aes+ crypto/des from crypto/tls+ crypto/dsa from crypto/x509 @@ -216,8 +216,9 @@ tailscale.com/cmd/tailscale dependencies: (generated by github.com/tailscale/dep crypto/rsa from crypto/tls+ crypto/sha1 from crypto/tls+ crypto/sha256 from crypto/tls+ + crypto/sha3 from crypto/internal/fips140hash crypto/sha512 from crypto/ecdsa+ - crypto/subtle from crypto/aes+ + crypto/subtle from crypto/cipher+ crypto/tls from github.com/tcnksm/go-httpstat+ crypto/x509 from crypto/tls+ crypto/x509/pkix from crypto/x509+ @@ -250,12 +251,15 @@ tailscale.com/cmd/tailscale dependencies: (generated by github.com/tailscale/dep io from bufio+ io/fs from crypto/x509+ io/ioutil from github.com/mitchellh/go-ps+ + iter from maps+ log from expvar+ log/internal from log + maps from net/http+ math from compress/flate+ math/big from crypto/dsa+ math/bits from compress/flate+ math/rand from math/big+ + math/rand/v2 from crypto/ecdsa+ mime from mime/multipart+ mime/multipart from net/http mime/quotedprintable from mime/multipart @@ -268,7 +272,7 @@ tailscale.com/cmd/tailscale dependencies: (generated by github.com/tailscale/dep net/netip from net+ net/textproto from golang.org/x/net/http/httpguts+ net/url from crypto/x509+ - os from crypto/rand+ + os from crypto/internal/sysrand+ os/exec from github.com/toqueteos/webbrowser+ os/signal from tailscale.com/cmd/tailscale/cli os/user from tailscale.com/util/groupmember+ @@ -284,7 +288,7 @@ tailscale.com/cmd/tailscale dependencies: (generated by github.com/tailscale/dep strings from bufio+ sync from compress/flate+ sync/atomic from context+ - syscall from crypto/rand+ + syscall from crypto/internal/sysrand+ text/tabwriter from github.com/peterbourgon/ff/v3/ffcli+ text/template from html/template text/template/parse from html/template+ @@ -292,3 +296,5 @@ tailscale.com/cmd/tailscale dependencies: (generated by github.com/tailscale/dep unicode from bytes+ unicode/utf16 from encoding/asn1+ unicode/utf8 from bufio+ + unique from net/netip + weak from unique diff --git a/cmd/tailscaled/depaware.txt b/cmd/tailscaled/depaware.txt index b1b4411748da8..f272e84cf94cb 100644 --- a/cmd/tailscaled/depaware.txt +++ b/cmd/tailscaled/depaware.txt @@ -370,7 +370,7 @@ tailscale.com/cmd/tailscaled dependencies: (generated by github.com/tailscale/de golang.org/x/crypto/cryptobyte/asn1 from crypto/ecdsa+ golang.org/x/crypto/curve25519 from github.com/tailscale/golang-x-crypto/ssh+ LD golang.org/x/crypto/ed25519 from github.com/tailscale/golang-x-crypto/ssh - golang.org/x/crypto/hkdf from crypto/tls+ + golang.org/x/crypto/hkdf from tailscale.com/control/controlbase golang.org/x/crypto/nacl/box from tailscale.com/types/key golang.org/x/crypto/nacl/secretbox from golang.org/x/crypto/nacl/box golang.org/x/crypto/poly1305 from github.com/tailscale/golang-x-crypto/ssh+ @@ -416,7 +416,7 @@ tailscale.com/cmd/tailscaled dependencies: (generated by github.com/tailscale/de container/list from crypto/tls+ context from crypto/tls+ crypto from crypto/ecdsa+ - crypto/aes from crypto/ecdsa+ + crypto/aes from crypto/internal/hpke+ crypto/cipher from crypto/aes+ crypto/des from crypto/tls+ crypto/dsa from crypto/x509+ @@ -431,8 +431,9 @@ tailscale.com/cmd/tailscaled dependencies: (generated by github.com/tailscale/de crypto/rsa from crypto/tls+ crypto/sha1 from crypto/tls+ crypto/sha256 from crypto/tls+ + crypto/sha3 from crypto/internal/fips140hash crypto/sha512 from crypto/ecdsa+ - crypto/subtle from crypto/aes+ + crypto/subtle from crypto/cipher+ crypto/tls from github.com/tcnksm/go-httpstat+ crypto/x509 from crypto/tls+ crypto/x509/pkix from crypto/x509+ @@ -461,13 +462,16 @@ tailscale.com/cmd/tailscaled dependencies: (generated by github.com/tailscale/de io from bufio+ io/fs from crypto/x509+ io/ioutil from github.com/godbus/dbus/v5+ + iter from bytes+ log from expvar+ log/internal from log LD log/syslog from tailscale.com/ssh/tailssh + maps from crypto/x509+ math from compress/flate+ math/big from crypto/dsa+ math/bits from compress/flate+ math/rand from github.com/mdlayher/netlink+ + math/rand/v2 from crypto/ecdsa+ mime from mime/multipart+ mime/multipart from net/http mime/quotedprintable from mime/multipart @@ -481,7 +485,7 @@ tailscale.com/cmd/tailscaled dependencies: (generated by github.com/tailscale/de net/netip from github.com/tailscale/wireguard-go/conn+ net/textproto from golang.org/x/net/http/httpguts+ net/url from crypto/x509+ - os from crypto/rand+ + os from crypto/internal/sysrand+ os/exec from github.com/coreos/go-iptables/iptables+ os/signal from tailscale.com/cmd/tailscaled os/user from github.com/godbus/dbus/v5+ @@ -499,9 +503,11 @@ tailscale.com/cmd/tailscaled dependencies: (generated by github.com/tailscale/de strings from bufio+ sync from compress/flate+ sync/atomic from context+ - syscall from crypto/rand+ + syscall from crypto/internal/sysrand+ text/tabwriter from runtime/pprof time from compress/gzip+ unicode from bytes+ unicode/utf16 from crypto/x509+ unicode/utf8 from bufio+ + unique from net/netip + weak from unique diff --git a/go.mod b/go.mod index 7f3e399c5394d..cefd0709fed86 100644 --- a/go.mod +++ b/go.mod @@ -2,6 +2,11 @@ module tailscale.com go 1.23.0 +// We have this in coder/coder too, for the same reason. We need it here too for +// the tests to pass. +// https://github.com/tcnksm/go-httpstat/pull/29 +replace github.com/tcnksm/go-httpstat => github.com/coder/go-httpstat v0.0.0-20230801153223-321c88088322 + require ( filippo.io/mkcert v1.4.4 github.com/Microsoft/go-winio v0.6.1 @@ -21,7 +26,6 @@ require ( github.com/dave/jennifer v1.6.1 github.com/dblohm7/wingoes v0.0.0-20230803162905-5c6286bb8c6e github.com/dsnet/try v0.0.3 - github.com/evanw/esbuild v0.14.53 github.com/frankban/quicktest v1.14.5 github.com/fxamacker/cbor/v2 v2.4.0 github.com/go-json-experiment/json v0.0.0-20230321051131-ccbac49a6929 diff --git a/go.sum b/go.sum index 14e59577565b1..77ac7f1a5f4c6 100644 --- a/go.sum +++ b/go.sum @@ -210,6 +210,8 @@ github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGX github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/coder/go-httpstat v0.0.0-20230801153223-321c88088322 h1:m0lPZjlQ7vdVpRBPKfYIFlmgevoTkBxB10wv6l2gOaU= +github.com/coder/go-httpstat v0.0.0-20230801153223-321c88088322/go.mod h1:rOLFDDVKVFiDqZFXoteXc97YXx7kFi9kYqR+2ETPkLQ= github.com/coder/websocket v1.8.12 h1:5bUXkEPPIbewrnkU8LTCLVaxi4N4J8ahufH2vlo4NAo= github.com/coder/websocket v1.8.12/go.mod h1:LNVeNrXQZfe5qhS9ALED3uA+l5pPqvwXg3CKoDBB2gs= github.com/containerd/stargz-snapshotter/estargz v0.14.3 h1:OqlDCK3ZVUO6C3B/5FSkDwbkEETK84kQgEeFwDC+62k= @@ -282,8 +284,6 @@ github.com/evanphx/json-patch v5.6.0+incompatible h1:jBYDEEiFBPxA0v50tFdvOzQQTCv github.com/evanphx/json-patch v5.6.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/evanphx/json-patch/v5 v5.6.0 h1:b91NhWfaz02IuVxO9faSllyAtNXHMPkC5J8sJCLunww= github.com/evanphx/json-patch/v5 v5.6.0/go.mod h1:G79N1coSVB93tBe7j6PhzjmR3/2VvlbKOFpnXhI9Bw4= -github.com/evanw/esbuild v0.14.53 h1:9uU73SZUmP1jRQhaC6hPm9aoqFGYlPwfk7OrhG6AhpQ= -github.com/evanw/esbuild v0.14.53/go.mod h1:iINY06rn799hi48UqEnaQvVfZWe6W9bET78LbvN8VWk= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU= github.com/fatih/color v1.10.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM= @@ -1062,8 +1062,6 @@ github.com/tailscale/wireguard-go v0.0.0-20230710185534-bb2c8f22eccf h1:bHQHwIHI github.com/tailscale/wireguard-go v0.0.0-20230710185534-bb2c8f22eccf/go.mod h1:QRIcq2+DbdIC5sKh/gcAZhuqu6WT6L6G8/ALPN5wqYw= github.com/tc-hib/winres v0.2.0 h1:gly/ivDWGvlhl7ENtEmA7wPQ6dWab1LlLq/DgcZECKE= github.com/tc-hib/winres v0.2.0/go.mod h1:uG6S5M2Q0/kThoqsCSYvGJODUQP9O9R0SNxUPmFIegw= -github.com/tcnksm/go-httpstat v0.2.0 h1:rP7T5e5U2HfmOBmZzGgGZjBQ5/GluWUylujl0tJ04I0= -github.com/tcnksm/go-httpstat v0.2.0/go.mod h1:s3JVJFtQxtBEBC9dwcdTTXS9xFnM3SXAZwPG41aurT8= github.com/tdakkota/asciicheck v0.0.0-20200416190851-d7f85be797a2/go.mod h1:yHp0ai0Z9gUljN3o0xMhYJnH/IcvkdTBOX2fmJ93JEM= github.com/tdakkota/asciicheck v0.0.0-20200416200610-e657995f937b/go.mod h1:yHp0ai0Z9gUljN3o0xMhYJnH/IcvkdTBOX2fmJ93JEM= github.com/tdakkota/asciicheck v0.2.0 h1:o8jvnUANo0qXtnslk2d3nMKTFNlOnJjRrNcj0j9qkHM=