Skip to content

chore: upgrade tailscale to v1.46.1 #8913

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 22 commits into from
Aug 9, 2023
Merged

chore: upgrade tailscale to v1.46.1 #8913

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
98b6ecb
t
coadler Aug 3, 2023
1fb0a1b
chore: update `golang.org/x/exp/slices`
coadler Aug 4, 2023
3eaec11
fixup! chore: update `golang.org/x/exp/slices`
coadler Aug 4, 2023
2fd96f1
fixup! chore: update `golang.org/x/exp/slices`
coadler Aug 4, 2023
8cedf7a
fixup! chore: update `golang.org/x/exp/slices`
coadler Aug 4, 2023
ccac703
fixup! chore: update `golang.org/x/exp/slices`
coadler Aug 4, 2023
ea37bc6
fixup! chore: update `golang.org/x/exp/slices`
coadler Aug 4, 2023
3c345e8
fixup! chore: update `golang.org/x/exp/slices`
coadler Aug 4, 2023
db5931f
fixup! chore: update `golang.org/x/exp/slices`
coadler Aug 4, 2023
1992d1f
fixup! chore: update `golang.org/x/exp/slices`
coadler Aug 4, 2023
dc935d0
fixup! chore: update `golang.org/x/exp/slices`
coadler Aug 4, 2023
faf4189
Merge branch 'main' into colin/ts-1.46
coadler Aug 7, 2023
58cc6ee
fixup! Merge branch 'main' into colin/ts-1.46
coadler Aug 7, 2023
00c2b66
fix batcher maybe
coadler Aug 7, 2023
6c7f012
use wireguard-go fork
coadler Aug 7, 2023
9a08790
try to fix batcher flake again
coadler Aug 8, 2023
f50b31f
Merge branch 'main' into colin/ts-1.46
coadler Aug 8, 2023
72681f0
fixup! Merge branch 'main' into colin/ts-1.46
coadler Aug 8, 2023
2e5e08d
Merge branch 'main' into colin/ts-1.46
coadler Aug 9, 2023
0feac85
fixup! Merge branch 'main' into colin/ts-1.46
coadler Aug 9, 2023
243e26a
fixup! Merge branch 'main' into colin/ts-1.46
coadler Aug 9, 2023
d231f46
fixup! Merge branch 'main' into colin/ts-1.46
coadler Aug 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fixup! chore: update golang.org/x/exp/slices
  • Loading branch information
@coadler
coadler committed Aug 4, 2023
commit db5931f045b446abbbe06c84d8e4fc66a5864c57
6 changes: 3 additions & 3 deletions coderd/prometheusmetrics/collector_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,11 +115,11 @@ func TestCollector_Set_Add(t *testing.T) {
assert.Equal(t, 6, int(metrics[1].Gauge.GetValue())) // Metric value
}

func collectAndSortMetrics(t *testing.T, collector prometheus.Collector, count int) []dto.Metric {
func collectAndSortMetrics(t *testing.T, collector prometheus.Collector, count int) []*dto.Metric {
ch := make(chan prometheus.Metric, count)
defer close(ch)

var metrics []dto.Metric
var metrics []*dto.Metric

collector.Collect(ch)
for i := 0; i < count; i++ {
Expand All @@ -129,7 +129,7 @@ func collectAndSortMetrics(t *testing.T, collector prometheus.Collector, count i
err := m.Write(&metric)
require.NoError(t, err)

metrics = append(metrics, metric)
metrics = append(metrics, &metric)
}

// Ensure always the same order of metrics
Expand Down
10 changes: 0 additions & 10 deletions enterprise/tailnet/pgcoord.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1402,13 +1402,3 @@ func (c *pgCoord) htmlDebug(ctx context.Context) (agpl.HTMLDebug, error) {

return data, nil
}

func nameOrdering(a, b string) int {
if a < b {
return -1
} else if a == b {
return 0
} else {
return 1
}
}
42 changes: 19 additions & 23 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,7 @@ require (
gvisor.dev/gvisor v0.0.0-20230504175454-7b0a1988a28f
nhooyr.io/websocket v1.8.7
storj.io/drpc v0.0.33-0.20230420154621-9716137f6037
tailscale.com v0.0.0-00010101000000-000000000000
)

require (
Expand All @@ -210,6 +211,19 @@ require (
github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be // indirect
github.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect
github.com/armon/go-radix v1.0.0 // indirect
github.com/aws/aws-sdk-go-v2 v1.18.0 // indirect
github.com/aws/aws-sdk-go-v2/config v1.18.22 // indirect
github.com/aws/aws-sdk-go-v2/credentials v1.13.21 // indirect
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.3 // indirect
github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.33 // indirect
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.27 // indirect
github.com/aws/aws-sdk-go-v2/internal/ini v1.3.34 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.27 // indirect
github.com/aws/aws-sdk-go-v2/service/ssm v1.36.3 // indirect
github.com/aws/aws-sdk-go-v2/service/sso v1.12.9 // indirect
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.9 // indirect
github.com/aws/aws-sdk-go-v2/service/sts v1.18.10 // indirect
github.com/aws/smithy-go v1.13.5 // indirect
github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
github.com/aymerick/douceur v0.2.0 // indirect
github.com/beorn7/perks v1.0.1 // indirect
Expand All @@ -234,6 +248,7 @@ require (
github.com/gabriel-vasile/mimetype v1.4.2 // indirect
github.com/ghodss/yaml v1.0.0 // indirect
github.com/gin-gonic/gin v1.9.1 // indirect
github.com/go-ini/ini v1.67.0 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-ole/go-ole v1.2.6 // indirect
github.com/go-openapi/jsonpointer v0.19.6 // indirect
Expand All @@ -255,10 +270,12 @@ require (
github.com/google/flatbuffers v23.1.21+incompatible // indirect
github.com/google/go-cmp v0.5.9 // indirect
github.com/google/go-querystring v1.1.0 // indirect
github.com/google/nftables v0.1.1-0.20230115205135-9aa6fdf5a28c // indirect
github.com/google/s2a-go v0.1.4 // indirect
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.2.5 // indirect
github.com/gorilla/css v1.0.0 // indirect
github.com/gorilla/mux v1.8.0 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.15.1 // indirect
github.com/h2non/filetype v1.1.3 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
Expand All @@ -276,6 +293,7 @@ require (
github.com/illarion/gonotify v1.0.1 // indirect
github.com/imdario/mergo v0.3.15 // indirect
github.com/insomniacslk/dhcp v0.0.0-20230407062729-974c6f05fe16 // indirect
github.com/jmespath/go-jmespath v0.4.0 // indirect
github.com/joeshaw/multierror v0.0.0-20140124173710-69b34d4ec901 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/josharian/native v1.1.1-0.20230202152459-5c7d0dd6ab86 // indirect
Expand Down Expand Up @@ -313,6 +331,7 @@ require (
github.com/opencontainers/image-spec v1.1.0-rc4 // indirect
github.com/opencontainers/runc v1.1.5 // indirect
github.com/pelletier/go-toml/v2 v2.0.8 // indirect
github.com/pierrec/lz4/v4 v4.1.17 // indirect
github.com/pion/transport v0.14.1 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
Expand Down Expand Up @@ -368,26 +387,3 @@ require (
howett.net/plist v1.0.0 // indirect
inet.af/peercred v0.0.0-20210906144145-0893ea02156a // indirect
)

require tailscale.com v0.0.0-00010101000000-000000000000

require (
github.com/aws/aws-sdk-go-v2 v1.18.0 // indirect
github.com/aws/aws-sdk-go-v2/config v1.18.22 // indirect
github.com/aws/aws-sdk-go-v2/credentials v1.13.21 // indirect
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.3 // indirect
github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.33 // indirect
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.27 // indirect
github.com/aws/aws-sdk-go-v2/internal/ini v1.3.34 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.27 // indirect
github.com/aws/aws-sdk-go-v2/service/ssm v1.36.3 // indirect
github.com/aws/aws-sdk-go-v2/service/sso v1.12.9 // indirect
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.9 // indirect
github.com/aws/aws-sdk-go-v2/service/sts v1.18.10 // indirect
github.com/aws/smithy-go v1.13.5 // indirect
github.com/go-ini/ini v1.67.0 // indirect
github.com/google/nftables v0.1.1-0.20230115205135-9aa6fdf5a28c // indirect
github.com/gorilla/mux v1.8.0 // indirect
github.com/jmespath/go-jmespath v0.4.0 // indirect
github.com/pierrec/lz4/v4 v4.1.17 // indirect
)
1 change: 0 additions & 1 deletion go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -977,7 +977,6 @@ golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EH
golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
golang.org/x/exp v0.0.0-20230801115018-d63ba01acd4b h1:r+vk0EmXNmekl0S0BascoeeoHk/L7wmaW2QF90K+kYI=
golang.org/x/exp v0.0.0-20230801115018-d63ba01acd4b/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc=
golang.org/x/exp/typeparams v0.0.0-20221208152030-732eee02a75a h1:Jw5wfR+h9mnIYH+OtGT2im5wV1YGGDora5vTv/aa5bE=
golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
Expand Down
8 changes: 4 additions & 4 deletions scripts/metricsdocgen/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,13 +56,13 @@ func main() {
}
}

func readMetrics() ([]dto.MetricFamily, error) {
func readMetrics() ([]*dto.MetricFamily, error) {
f, err := os.Open(metricsFile)
if err != nil {
return nil, xerrors.New("can't open metrics file")
}

var metrics []dto.MetricFamily
var metrics []*dto.MetricFamily

decoder := expfmt.NewDecoder(f, expfmt.FmtProtoText)
for {
Expand All @@ -73,7 +73,7 @@ func readMetrics() ([]dto.MetricFamily, error) {
} else if err != nil {
return nil, err
}
metrics = append(metrics, m)
metrics = append(metrics, &m)
}

sort.Slice(metrics, func(i, j int) bool {
Expand All @@ -90,7 +90,7 @@ func readPrometheusDoc() ([]byte, error) {
return doc, nil
}

func updatePrometheusDoc(doc []byte, metricFamilies []dto.MetricFamily) ([]byte, error) {
func updatePrometheusDoc(doc []byte, metricFamilies []*dto.MetricFamily) ([]byte, error) {
i := bytes.Index(doc, generatorPrefix)
if i < 0 {
return nil, xerrors.New("generator prefix tag not found")
Expand Down