fix build and lint (#1613)

spikecurtis · web-flow · commit d1817310a1f6 · 2022-05-19T23:28:29.000Z
Signed-off-by: Spike Curtis &lt;spike@coder.com&gt;
diff --git a/cli/delete_test.go b/cli/delete_test.go
@@ -13,9 +13,8 @@ import (
 func TestDelete(t *testing.T) {
 	t.Run("WithParameter", func(t *testing.T) {
 		t.Parallel()
-		client := coderdtest.New(t, nil)
+		client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerD: true})
 		user := coderdtest.CreateFirstUser(t, client)
-		coderdtest.NewProvisionerDaemon(t, client)
 		version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil)
 		coderdtest.AwaitTemplateVersionJob(t, client, version.ID)
 		template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID)
diff --git a/cli/logout_test.go b/cli/logout_test.go
@@ -3,10 +3,11 @@ package cli_test
 import (
 	"testing"
 
+	"github.com/stretchr/testify/require"
+
 	"github.com/coder/coder/cli/clitest"
 	"github.com/coder/coder/coderd/coderdtest"
 	"github.com/coder/coder/pty/ptytest"
-	"github.com/stretchr/testify/require"
 )
 
 func TestLogout(t *testing.T) {
diff --git a/cli/server.go b/cli/server.go
@@ -110,7 +110,7 @@ func server() *cobra.Command {
 					logger.Warn(cmd.Context(), "failed to start telemetry exporter", slog.Error(err))
 				} else {
 					defer func() {
-						// allow time for traces to flush even if command context is cancelled
+						// allow time for traces to flush even if command context is canceled
 						ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
 						defer cancel()
 						_ = tracerProvider.Shutdown(ctx)
diff --git a/coderd/coderd.go b/coderd/coderd.go
@@ -103,7 +103,7 @@ func newRouter(options *Options, a *api) chi.Router {
 			})
 		},
 		httpmw.Prometheus,
-		tracing.HTTPMW(api.TracerProvider, "coderd.http"),
+		tracing.HTTPMW(a.TracerProvider, "coderd.http"),
 	)
 
 	r.Route("/api/v2", func(r chi.Router) {

Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ func newRouter(options Options, a api) chi.Router {`
`103`	`103`	`})`
`104`	`104`	`},`
`105`	`105`	`httpmw.Prometheus,`
`106`		`- tracing.HTTPMW(api.TracerProvider, "coderd.http"),`
	`106`	`+ tracing.HTTPMW(a.TracerProvider, "coderd.http"),`
`107`	`107`	`)`
`108`	`108`
`109`	`109`	`r.Route("/api/v2", func(r chi.Router) {`