Skip to content

Commit d2830ff

Browse files
committed
Merge branch 'main' of https://github.com/coder/coder into bq/refactor-users-service
2 parents 23517e3 + 885b250 commit d2830ff

File tree

35 files changed

+1104
-1166
lines changed

35 files changed

+1104
-1166
lines changed

.github/workflows/ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ jobs:
136136
137137
# Check for any typos
138138
- name: Check for typos
139-
uses: crate-ci/typos@v1.16.13
139+
uses: crate-ci/typos@v1.16.15
140140
with:
141141
config: .github/workflows/typos.toml
142142

.github/workflows/pr-auto-assign.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ jobs:
1414
runs-on: ubuntu-latest
1515
steps:
1616
- name: Assign author
17-
uses: toshimaru/auto-author-assign@v2.0.0
17+
uses: toshimaru/auto-author-assign@v2.0.1

cli/errors.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,10 @@ import (
66
"net/http/httptest"
77
"os"
88

9+
"golang.org/x/xerrors"
10+
911
"github.com/coder/coder/v2/cli/clibase"
1012
"github.com/coder/coder/v2/codersdk"
11-
"golang.org/x/xerrors"
1213
)
1314

1415
func (RootCmd) errorExample() *clibase.Cmd {

go.mod

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ require (
141141
github.com/mitchellh/mapstructure v1.5.0
142142
github.com/moby/moby v24.0.1+incompatible
143143
github.com/muesli/termenv v0.15.2
144-
github.com/open-policy-agent/opa v0.56.0
144+
github.com/open-policy-agent/opa v0.57.0
145145
github.com/ory/dockertest/v3 v3.10.0
146146
github.com/pion/udp v0.1.2
147147
github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8
@@ -154,7 +154,7 @@ require (
154154
github.com/robfig/cron/v3 v3.0.1
155155
github.com/spf13/afero v1.10.0
156156
github.com/spf13/pflag v1.0.5
157-
github.com/sqlc-dev/pqtype v0.2.0
157+
github.com/sqlc-dev/pqtype v0.3.0
158158
github.com/stretchr/testify v1.8.4
159159
github.com/swaggo/http-swagger/v2 v2.0.1
160160
github.com/swaggo/swag v1.16.2
@@ -164,11 +164,11 @@ require (
164164
github.com/wagslane/go-password-validator v0.3.0
165165
go.mozilla.org/pkcs7 v0.0.0-20200128120323-432b2356ecb1
166166
go.nhat.io/otelsql v0.12.0
167-
go.opentelemetry.io/otel v1.18.0
168-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.18.0
169-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.18.0
170-
go.opentelemetry.io/otel/sdk v1.18.0
171-
go.opentelemetry.io/otel/trace v1.18.0
167+
go.opentelemetry.io/otel v1.19.0
168+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0
169+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.19.0
170+
go.opentelemetry.io/otel/sdk v1.19.0
171+
go.opentelemetry.io/otel/trace v1.19.0
172172
go.uber.org/atomic v1.11.0
173173
go.uber.org/goleak v1.2.1
174174
go4.org/netipx v0.0.0-20230728180743-ad4cb58a6516
@@ -184,8 +184,8 @@ require (
184184
golang.org/x/tools v0.13.0
185185
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2
186186
golang.zx2c4.com/wireguard v0.0.0-20230704135630-469159ecf7d1
187-
google.golang.org/api v0.142.0
188-
google.golang.org/grpc v1.58.1
187+
google.golang.org/api v0.143.0
188+
google.golang.org/grpc v1.58.2
189189
google.golang.org/protobuf v1.31.0
190190
gopkg.in/DataDog/dd-trace-go.v1 v1.55.0
191191
gopkg.in/natefinch/lumberjack.v2 v2.2.1
@@ -196,6 +196,11 @@ require (
196196
tailscale.com v1.46.1
197197
)
198198

199+
require (
200+
github.com/chromedp/cdproto v0.0.0-20230802225258-3cf4e6d46a89
201+
github.com/chromedp/chromedp v0.9.2
202+
)
203+
199204
require (
200205
cloud.google.com/go/compute v1.23.0 // indirect
201206
cloud.google.com/go/logging v1.8.1 // indirect
@@ -244,12 +249,10 @@ require (
244249
github.com/bep/godartsass/v2 v2.0.0 // indirect
245250
github.com/bep/golibsass v1.1.1 // indirect
246251
github.com/cespare/xxhash/v2 v2.2.0 // indirect
247-
github.com/chromedp/cdproto v0.0.0-20230802225258-3cf4e6d46a89 // indirect
248-
github.com/chromedp/chromedp v0.9.2 // indirect
249252
github.com/chromedp/sysutil v1.0.0 // indirect
250253
github.com/clbanning/mxj/v2 v2.7.0 // indirect
251254
github.com/cloudflare/circl v1.3.3 // indirect
252-
github.com/containerd/continuity v0.4.2-0.20230616210509-1e0d26eb2381 // indirect
255+
github.com/containerd/continuity v0.4.2 // indirect
253256
github.com/coreos/go-iptables v0.6.0 // indirect
254257
github.com/dlclark/regexp2 v1.10.0 // indirect
255258
github.com/docker/cli v23.0.5+incompatible // indirect
@@ -290,7 +293,7 @@ require (
290293
github.com/google/pprof v0.0.0-20230817174616-7a8ec2ada47b // indirect
291294
github.com/google/s2a-go v0.1.7 // indirect
292295
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
293-
github.com/googleapis/enterprise-certificate-proxy v0.2.5 // indirect
296+
github.com/googleapis/enterprise-certificate-proxy v0.3.1 // indirect
294297
github.com/gorilla/css v1.0.0 // indirect
295298
github.com/gorilla/mux v1.8.0 // indirect
296299
github.com/grpc-ecosystem/grpc-gateway/v2 v2.18.0 // indirect
@@ -392,7 +395,7 @@ require (
392395
github.com/zeebo/errs v1.3.0 // indirect
393396
go.opencensus.io v0.24.0 // indirect
394397
go.opentelemetry.io/contrib v1.19.0 // indirect
395-
go.opentelemetry.io/otel/metric v1.18.0 // indirect
398+
go.opentelemetry.io/otel/metric v1.19.0 // indirect
396399
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
397400
go4.org/intern v0.0.0-20230525184215-6c62f75575cb // indirect
398401
go4.org/mem v0.0.0-20220726221520-4f986261bf13 // indirect
@@ -402,9 +405,9 @@ require (
402405
golang.zx2c4.com/wireguard/wgctrl v0.0.0-20230429144221-925a1e7659e6 // indirect
403406
golang.zx2c4.com/wireguard/windows v0.5.3 // indirect
404407
google.golang.org/appengine v1.6.7 // indirect
405-
google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5 // indirect
406-
google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d // indirect
407-
google.golang.org/genproto/googleapis/rpc v0.0.0-20230913181813-007df8e322eb // indirect
408+
google.golang.org/genproto v0.0.0-20230913181813-007df8e322eb // indirect
409+
google.golang.org/genproto/googleapis/api v0.0.0-20230913181813-007df8e322eb // indirect
410+
google.golang.org/genproto/googleapis/rpc v0.0.0-20230920204549-e6e6cdab5c13 // indirect
408411
gopkg.in/yaml.v2 v2.4.0 // indirect
409412
howett.net/plist v1.0.0 // indirect
410413
inet.af/netaddr v0.0.0-20230525184311-b8eac61e914a // indirect

0 commit comments

Comments
 (0)