Skip to content

Commit dbe7ee8

Browse files
ammarioammario
committed
Merge remote-tracking branch 'origin/main' into pull-tar
2 parents b39628a + 3f75f6b commit dbe7ee8

File tree

3 files changed

+102
-77
lines changed

3 files changed

+102
-77
lines changed

‎coderd/azureidentity/azureidentity_test.go

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import (
44
"context"
55
"crypto/x509"
66
"testing"
7+
"time"
78

89
"github.com/stretchr/testify/require"
910

@@ -16,7 +17,11 @@ const (
1617

1718
func TestValidate(t *testing.T) {
1819
t.Parallel()
19-
vm, err := azureidentity.Validate(context.Background(), signature, x509.VerifyOptions{})
20+
ct, err := time.Parse(time.RFC3339, "2023-02-01T00:00:00Z")
21+
require.NoError(t, err)
22+
vm, err := azureidentity.Validate(context.Background(), signature, x509.VerifyOptions{
23+
CurrentTime: ct,
24+
})
2025
require.NoError(t, err)
2126
require.Equal(t, "bd8e7443-24a0-41f3-b949-8baf4fd1c573", vm)
2227
}

‎go.mod

Lines changed: 32 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,9 @@ replace tailscale.com => github.com/coder/tailscale v1.1.1-0.20230210022917-446f
5151
// makes importing it directly a bit messy.
5252
replace github.com/gliderlabs/ssh => github.com/coder/ssh v0.0.0-20220811105153-fcea99919338
5353

54+
// Waiting on https://github.com/imulab/go-scim/pull/95 to merge.
55+
replace github.com/imulab/go-scim/pkg/v2 => github.com/coder/go-scim/pkg/v2 v2.0.0-20230221055123-1d63c1222136
56+
5457
require (
5558
cdr.dev/slog v1.4.2-0.20220525200111-18dce5c2cd5f
5659
cloud.google.com/go/compute/metadata v0.2.1
@@ -64,7 +67,7 @@ require (
6467
github.com/briandowns/spinner v1.18.1
6568
github.com/cakturk/go-netstat v0.0.0-20200220111822-e5b49efee7a5
6669
github.com/cenkalti/backoff/v4 v4.1.3
67-
github.com/charmbracelet/charm v0.12.1
70+
github.com/charmbracelet/charm v0.12.4
6871
github.com/charmbracelet/glamour v0.6.0
6972
github.com/charmbracelet/lipgloss v0.6.0
7073
github.com/cli/safeexec v1.0.0
@@ -92,7 +95,7 @@ require (
9295
github.com/gofrs/flock v0.8.1
9396
github.com/gohugoio/hugo v0.109.0
9497
github.com/golang-jwt/jwt v3.2.2+incompatible
95-
github.com/golang-jwt/jwt/v4 v4.4.2
98+
github.com/golang-jwt/jwt/v4 v4.5.0
9699
github.com/golang-migrate/migrate/v4 v4.15.2
97100
github.com/golang/protobuf v1.5.2
98101
github.com/google/go-github/v43 v43.0.1-0.20220414155304-00e42332e405
@@ -110,7 +113,7 @@ require (
110113
github.com/jmoiron/sqlx v1.3.5
111114
github.com/justinas/nosurf v1.1.1
112115
github.com/kirsle/configdir v0.0.0-20170128060238-e45d2f54772f
113-
github.com/klauspost/compress v1.15.9
116+
github.com/klauspost/compress v1.15.15
114117
github.com/lib/pq v1.10.6
115118
github.com/mattn/go-isatty v0.0.17
116119
github.com/mitchellh/go-wordwrap v1.0.1
@@ -126,7 +129,6 @@ require (
126129
github.com/prometheus/client_golang v1.14.0
127130
github.com/quasilyte/go-ruleguard/dsl v0.3.21
128131
github.com/robfig/cron/v3 v3.0.1
129-
github.com/schollz/progressbar/v3 v3.13.0
130132
github.com/spf13/afero v1.9.3
131133
github.com/spf13/cobra v1.6.1
132134
github.com/spf13/pflag v1.0.5
@@ -150,15 +152,15 @@ require (
150152
go.uber.org/atomic v1.10.0
151153
go.uber.org/goleak v1.2.0
152154
go4.org/netipx v0.0.0-20220725152314-7e7bdc8411bf
153-
golang.org/x/crypto v0.5.0
155+
golang.org/x/crypto v0.6.0
154156
golang.org/x/exp v0.0.0-20221205204356-47842c84f3db
155-
golang.org/x/mod v0.7.0
157+
golang.org/x/mod v0.8.0
156158
golang.org/x/oauth2 v0.3.0
157159
golang.org/x/sync v0.1.0
158160
golang.org/x/sys v0.5.0
159161
golang.org/x/term v0.5.0
160-
golang.org/x/text v0.6.0
161-
golang.org/x/tools v0.4.1-0.20221208213631-3f74d914ae6d
162+
golang.org/x/text v0.7.0
163+
golang.org/x/tools v0.6.0
162164
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2
163165
golang.zx2c4.com/wireguard v0.0.0-20230207233929-ebbd4a433088
164166
golang.zx2c4.com/wireguard/wgctrl v0.0.0-20220504211119-3d4a969bb56b
@@ -176,9 +178,17 @@ require (
176178
)
177179

178180
require (
181+
github.com/dgraph-io/badger/v3 v3.2103.5 // indirect
182+
github.com/dustin/go-humanize v1.0.1 // indirect
183+
github.com/google/flatbuffers v23.1.21+incompatible // indirect
179184
github.com/h2non/filetype v1.1.3 // indirect
185+
github.com/json-iterator/go v1.1.12 // indirect
180186
github.com/juju/errors v1.0.0 // indirect
181-
github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db // indirect
187+
github.com/mattn/go-localereader v0.0.1 // indirect
188+
github.com/mattn/go-sqlite3 v1.14.15 // indirect
189+
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
190+
github.com/modern-go/reflect2 v1.0.2 // indirect
191+
github.com/muesli/cancelreader v0.2.2 // indirect
182192
)
183193

184194
require (
@@ -197,14 +207,14 @@ require (
197207
github.com/alexbrainman/sspi v0.0.0-20210105120005-909beea2cc74 // indirect
198208
github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be // indirect
199209
github.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect
200-
github.com/aymanbagabas/go-osc52 v1.0.3 // indirect
210+
github.com/aymanbagabas/go-osc52 v1.2.1 // indirect
201211
github.com/aymerick/douceur v0.2.0 // indirect
202212
github.com/beorn7/perks v1.0.1 // indirect
203213
github.com/bep/godartsass v0.16.0 // indirect
204214
github.com/bep/golibsass v1.1.0 // indirect
205-
github.com/cespare/xxhash/v2 v2.1.2 // indirect
206-
github.com/charmbracelet/bubbles v0.10.3 // indirect
207-
github.com/charmbracelet/bubbletea v0.20.0 // indirect
215+
github.com/cespare/xxhash/v2 v2.2.0 // indirect
216+
github.com/charmbracelet/bubbles v0.15.0 // indirect
217+
github.com/charmbracelet/bubbletea v0.23.2 // indirect
208218
github.com/clbanning/mxj/v2 v2.5.7 // indirect
209219
github.com/containerd/console v1.0.3 // indirect
210220
github.com/containerd/continuity v0.3.0 // indirect
@@ -255,8 +265,8 @@ require (
255265
github.com/hashicorp/terraform-plugin-sdk/v2 v2.20.0 // indirect
256266
github.com/hdevalence/ed25519consensus v0.0.0-20220222234857-c00d1f31bab3 // indirect
257267
github.com/illarion/gonotify v1.0.1 // indirect
258-
github.com/imdario/mergo v0.3.12 // indirect
259-
github.com/inconshreveable/mousetrap v1.0.1 // indirect
268+
github.com/imdario/mergo v0.3.13 // indirect
269+
github.com/inconshreveable/mousetrap v1.1.0 // indirect
260270
github.com/insomniacslk/dhcp v0.0.0-20221215072855-de60144f33f8 // indirect
261271
github.com/joeshaw/multierror v0.0.0-20140124173710-69b34d4ec901 // indirect
262272
github.com/josharian/intern v1.0.0 // indirect
@@ -284,8 +294,8 @@ require (
284294
github.com/mitchellh/go-testing-interface v1.14.1 // indirect
285295
github.com/mitchellh/reflectwalk v1.0.2 // indirect
286296
github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 // indirect
287-
github.com/muesli/ansi v0.0.0-20211031195517-c9f0611b6c70 // indirect
288-
github.com/muesli/termenv v0.13.0 // indirect
297+
github.com/muesli/ansi v0.0.0-20221106050444-61f0cd9a192a // indirect
298+
github.com/muesli/termenv v0.14.0 // indirect
289299
github.com/niklasfasching/go-org v1.6.5 // indirect
290300
github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d // indirect
291301
github.com/olekukonko/tablewriter v0.0.5 // indirect
@@ -298,12 +308,12 @@ require (
298308
github.com/pkg/errors v0.9.1 // indirect
299309
github.com/pmezard/go-difflib v1.0.0 // indirect
300310
github.com/prometheus/client_model v0.3.0
301-
github.com/prometheus/common v0.39.0
302-
github.com/prometheus/procfs v0.8.0 // indirect
311+
github.com/prometheus/common v0.40.0
312+
github.com/prometheus/procfs v0.9.0 // indirect
303313
github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0 // indirect
304-
github.com/rivo/uniseg v0.4.4 // indirect
314+
github.com/rivo/uniseg v0.4.3 // indirect
305315
github.com/russross/blackfriday/v2 v2.1.0 // indirect
306-
github.com/satori/go.uuid v1.2.0 // indirect
316+
github.com/satori/go.uuid v1.2.1-0.20181028125025-b2ce2384e17b // indirect
307317
github.com/sirupsen/logrus v1.9.0 // indirect
308318
github.com/spf13/cast v1.5.0 // indirect
309319
github.com/spf13/jwalterweatherman v1.1.0 // indirect
@@ -339,7 +349,7 @@ require (
339349
go.opentelemetry.io/otel/metric v0.33.0 // indirect
340350
go.opentelemetry.io/proto/otlp v0.19.0 // indirect
341351
go4.org/mem v0.0.0-20210711025021-927187094b94 // indirect
342-
golang.org/x/net v0.5.0 // indirect
352+
golang.org/x/net v0.7.0 // indirect
343353
golang.org/x/time v0.0.0-20220609170525-579cf78fd858 // indirect
344354
golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2 // indirect
345355
golang.zx2c4.com/wireguard/windows v0.5.3 // indirect

0 commit comments

Comments
 (0)