Skip to content

Commit db5931f

Browse files
coadlercoadler
committed
fixup! chore: update golang.org/x/exp/slices 
1 parent 3c345e8 commit db5931f

File tree

5 files changed

+26
-41
lines changed

5 files changed

+26
-41
lines changed

‎coderd/prometheusmetrics/collector_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -115,11 +115,11 @@ func TestCollector_Set_Add(t *testing.T) {
115115
assert.Equal(t, 6, int(metrics[1].Gauge.GetValue())) // Metric value
116116
}
117117

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

122-
var metrics []dto.Metric
122+
var metrics []*dto.Metric
123123

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

132-
metrics = append(metrics, metric)
132+
metrics = append(metrics, &metric)
133133
}
134134

135135
// Ensure always the same order of metrics

‎enterprise/tailnet/pgcoord.go

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1402,13 +1402,3 @@ func (c *pgCoord) htmlDebug(ctx context.Context) (agpl.HTMLDebug, error) {
14021402

14031403
return data, nil
14041404
}
1405-
1406-
func nameOrdering(a, b string) int {
1407-
if a < b {
1408-
return -1
1409-
} else if a == b {
1410-
return 0
1411-
} else {
1412-
return 1
1413-
}
1414-
}

‎go.mod

Lines changed: 19 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,7 @@ require (
189189
gvisor.dev/gvisor v0.0.0-20230504175454-7b0a1988a28f
190190
nhooyr.io/websocket v1.8.7
191191
storj.io/drpc v0.0.33-0.20230420154621-9716137f6037
192+
tailscale.com v0.0.0-00010101000000-000000000000
192193
)
193194

194195
require (
@@ -210,6 +211,19 @@ require (
210211
github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be // indirect
211212
github.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect
212213
github.com/armon/go-radix v1.0.0 // indirect
214+
github.com/aws/aws-sdk-go-v2 v1.18.0 // indirect
215+
github.com/aws/aws-sdk-go-v2/config v1.18.22 // indirect
216+
github.com/aws/aws-sdk-go-v2/credentials v1.13.21 // indirect
217+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.3 // indirect
218+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.33 // indirect
219+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.27 // indirect
220+
github.com/aws/aws-sdk-go-v2/internal/ini v1.3.34 // indirect
221+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.27 // indirect
222+
github.com/aws/aws-sdk-go-v2/service/ssm v1.36.3 // indirect
223+
github.com/aws/aws-sdk-go-v2/service/sso v1.12.9 // indirect
224+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.9 // indirect
225+
github.com/aws/aws-sdk-go-v2/service/sts v1.18.10 // indirect
226+
github.com/aws/smithy-go v1.13.5 // indirect
213227
github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
214228
github.com/aymerick/douceur v0.2.0 // indirect
215229
github.com/beorn7/perks v1.0.1 // indirect
@@ -234,6 +248,7 @@ require (
234248
github.com/gabriel-vasile/mimetype v1.4.2 // indirect
235249
github.com/ghodss/yaml v1.0.0 // indirect
236250
github.com/gin-gonic/gin v1.9.1 // indirect
251+
github.com/go-ini/ini v1.67.0 // indirect
237252
github.com/go-logr/stdr v1.2.2 // indirect
238253
github.com/go-ole/go-ole v1.2.6 // indirect
239254
github.com/go-openapi/jsonpointer v0.19.6 // indirect
@@ -255,10 +270,12 @@ require (
255270
github.com/google/flatbuffers v23.1.21+incompatible // indirect
256271
github.com/google/go-cmp v0.5.9 // indirect
257272
github.com/google/go-querystring v1.1.0 // indirect
273+
github.com/google/nftables v0.1.1-0.20230115205135-9aa6fdf5a28c // indirect
258274
github.com/google/s2a-go v0.1.4 // indirect
259275
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
260276
github.com/googleapis/enterprise-certificate-proxy v0.2.5 // indirect
261277
github.com/gorilla/css v1.0.0 // indirect
278+
github.com/gorilla/mux v1.8.0 // indirect
262279
github.com/grpc-ecosystem/grpc-gateway/v2 v2.15.1 // indirect
263280
github.com/h2non/filetype v1.1.3 // indirect
264281
github.com/hashicorp/errwrap v1.1.0 // indirect
@@ -276,6 +293,7 @@ require (
276293
github.com/illarion/gonotify v1.0.1 // indirect
277294
github.com/imdario/mergo v0.3.15 // indirect
278295
github.com/insomniacslk/dhcp v0.0.0-20230407062729-974c6f05fe16 // indirect
296+
github.com/jmespath/go-jmespath v0.4.0 // indirect
279297
github.com/joeshaw/multierror v0.0.0-20140124173710-69b34d4ec901 // indirect
280298
github.com/josharian/intern v1.0.0 // indirect
281299
github.com/josharian/native v1.1.1-0.20230202152459-5c7d0dd6ab86 // indirect
@@ -313,6 +331,7 @@ require (
313331
github.com/opencontainers/image-spec v1.1.0-rc4 // indirect
314332
github.com/opencontainers/runc v1.1.5 // indirect
315333
github.com/pelletier/go-toml/v2 v2.0.8 // indirect
334+
github.com/pierrec/lz4/v4 v4.1.17 // indirect
316335
github.com/pion/transport v0.14.1 // indirect
317336
github.com/pkg/errors v0.9.1 // indirect
318337
github.com/pmezard/go-difflib v1.0.0 // indirect
@@ -368,26 +387,3 @@ require (
368387
howett.net/plist v1.0.0 // indirect
369388
inet.af/peercred v0.0.0-20210906144145-0893ea02156a // indirect
370389
)
371-
372-
require tailscale.com v0.0.0-00010101000000-000000000000
373-
374-
require (
375-
github.com/aws/aws-sdk-go-v2 v1.18.0 // indirect
376-
github.com/aws/aws-sdk-go-v2/config v1.18.22 // indirect
377-
github.com/aws/aws-sdk-go-v2/credentials v1.13.21 // indirect
378-
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.3 // indirect
379-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.33 // indirect
380-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.27 // indirect
381-
github.com/aws/aws-sdk-go-v2/internal/ini v1.3.34 // indirect
382-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.27 // indirect
383-
github.com/aws/aws-sdk-go-v2/service/ssm v1.36.3 // indirect
384-
github.com/aws/aws-sdk-go-v2/service/sso v1.12.9 // indirect
385-
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.9 // indirect
386-
github.com/aws/aws-sdk-go-v2/service/sts v1.18.10 // indirect
387-
github.com/aws/smithy-go v1.13.5 // indirect
388-
github.com/go-ini/ini v1.67.0 // indirect
389-
github.com/google/nftables v0.1.1-0.20230115205135-9aa6fdf5a28c // indirect
390-
github.com/gorilla/mux v1.8.0 // indirect
391-
github.com/jmespath/go-jmespath v0.4.0 // indirect
392-
github.com/pierrec/lz4/v4 v4.1.17 // indirect
393-
)

‎go.sum

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -977,7 +977,6 @@ golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EH
977977
golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
978978
golang.org/x/exp v0.0.0-20230801115018-d63ba01acd4b h1:r+vk0EmXNmekl0S0BascoeeoHk/L7wmaW2QF90K+kYI=
979979
golang.org/x/exp v0.0.0-20230801115018-d63ba01acd4b/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc=
980-
golang.org/x/exp/typeparams v0.0.0-20221208152030-732eee02a75a h1:Jw5wfR+h9mnIYH+OtGT2im5wV1YGGDora5vTv/aa5bE=
981980
golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
982981
golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
983982
golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=

‎scripts/metricsdocgen/main.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,13 @@ func main() {
5656
}
5757
}
5858

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

65-
var metrics []dto.MetricFamily
65+
var metrics []*dto.MetricFamily
6666

6767
decoder := expfmt.NewDecoder(f, expfmt.FmtProtoText)
6868
for {
@@ -73,7 +73,7 @@ func readMetrics() ([]dto.MetricFamily, error) {
7373
} else if err != nil {
7474
return nil, err
7575
}
76-
metrics = append(metrics, m)
76+
metrics = append(metrics, &m)
7777
}
7878

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

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

0 commit comments

Comments
 (0)