Skip to content

Commit a78b79d

Browse files
committed
Merge branch 'main' into authzgen
2 parents f7b98d8 + 794a551 commit a78b79d

File tree

11 files changed

+1288
-72
lines changed

11 files changed

+1288
-72
lines changed

coderd/coderdtest/coderdtest.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,8 @@ func newWithCloser(t testing.TB, options *Options) (*codersdk.Client, io.Closer)
169169
}
170170

171171
func NewOptions(t testing.TB, options *Options) (func(http.Handler), context.CancelFunc, *url.URL, *coderd.Options) {
172+
t.Helper()
173+
172174
if options == nil {
173175
options = &Options{}
174176
}
@@ -402,6 +404,8 @@ func NewWithAPI(t testing.TB, options *Options) (*codersdk.Client, io.Closer, *c
402404
// well with coderd testing. It registers the "echo" provisioner for
403405
// quick testing.
404406
func NewProvisionerDaemon(t testing.TB, coderAPI *coderd.API) io.Closer {
407+
t.Helper()
408+
405409
echoClient, echoServer := provisionersdk.MemTransportPipe()
406410
ctx, cancelFunc := context.WithCancel(context.Background())
407411
t.Cleanup(func() {

coderd/database/dbmetrics/dbmetrics.go

Lines changed: 68 additions & 65 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)