Fix log cleanup

kylecarbs · kylecarbs · commit ebf2f77f5481 · 2022-03-07T01:17:23.000Z
diff --git a/coderd/projectversions_test.go b/coderd/projectversions_test.go
@@ -196,7 +196,9 @@ func TestProjectVersionLogs(t *testing.T) {
 			},
 		}},
 	})
-	logs, err := client.ProjectVersionLogsAfter(context.Background(), version.ID, before)
+	ctx, cancelFunc := context.WithCancel(context.Background())
+	t.Cleanup(cancelFunc)
+	logs, err := client.ProjectVersionLogsAfter(ctx, version.ID, before)
 	require.NoError(t, err)
 	log := <-logs
 	require.Equal(t, "example", log.Output)
diff --git a/coderd/provisionerjobs_test.go b/coderd/provisionerjobs_test.go
@@ -47,7 +47,9 @@ func TestProvisionerJobLogs(t *testing.T) {
 		require.NoError(t, err)
 		coderdtest.AwaitWorkspaceBuildJob(t, client, build.ID)
 
-		logs, err := client.WorkspaceBuildLogsAfter(context.Background(), build.ID, before)
+		ctx, cancelFunc := context.WithCancel(context.Background())
+		t.Cleanup(cancelFunc)
+		logs, err := client.WorkspaceBuildLogsAfter(ctx, build.ID, before)
 		require.NoError(t, err)
 		log, ok := <-logs
 		require.True(t, ok)
@@ -86,7 +88,9 @@ func TestProvisionerJobLogs(t *testing.T) {
 			Transition:       database.WorkspaceTransitionStart,
 		})
 		require.NoError(t, err)
-		logs, err := client.WorkspaceBuildLogsAfter(context.Background(), build.ID, before)
+		ctx, cancelFunc := context.WithCancel(context.Background())
+		t.Cleanup(cancelFunc)
+		logs, err := client.WorkspaceBuildLogsAfter(ctx, build.ID, before)
 		require.NoError(t, err)
 		log := <-logs
 		require.Equal(t, "log-output", log.Output)
diff --git a/coderd/workspacebuilds_test.go b/coderd/workspacebuilds_test.go
@@ -141,7 +141,9 @@ func TestWorkspaceBuildLogs(t *testing.T) {
 		Transition:       database.WorkspaceTransitionStart,
 	})
 	require.NoError(t, err)
-	logs, err := client.WorkspaceBuildLogsAfter(context.Background(), build.ID, before)
+	ctx, cancelFunc := context.WithCancel(context.Background())
+	t.Cleanup(cancelFunc)
+	logs, err := client.WorkspaceBuildLogsAfter(ctx, build.ID, before)
 	require.NoError(t, err)
 	log := <-logs
 	require.Equal(t, "example", log.Output)
diff --git a/site/api.ts b/site/api.ts
@@ -108,7 +108,7 @@ export namespace Workspace {
 }
 
 export const login = async (email: string, password: string): Promise<LoginResponse> => {
-  const response = await fetch("/api/v2/login", {
+  const response = await fetch("/api/v2/users/login", {
     method: "POST",
     headers: {
       "Content-Type": "application/json",
@@ -128,7 +128,7 @@ export const login = async (email: string, password: string): Promise<LoginRespo
 }
 
 export const logout = async (): Promise<void> => {
-  const response = await fetch("/api/v2/logout", {
+  const response = await fetch("/api/v2/users/logout", {
     method: "POST",
   })
 

Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ export namespace Workspace {`
`108`	`108`	`}`
`109`	`109`
`110`	`110`	`export const login = async (email: string, password: string): Promise<LoginResponse> => {`
`111`		`- const response = await fetch("/api/v2/login", {`
	`111`	`+ const response = await fetch("/api/v2/users/login", {`
`112`	`112`	`method: "POST",`
`113`	`113`	`headers: {`
`114`	`114`	`"Content-Type": "application/json",`
`@@ -128,7 +128,7 @@ export const login = async (email: string, password: string): Promise<LoginRespo`
`128`	`128`	`}`
`129`	`129`
`130`	`130`	`export const logout = async (): Promise<void> => {`
`131`		`- const response = await fetch("/api/v2/logout", {`
	`131`	`+ const response = await fetch("/api/v2/users/logout", {`
`132`	`132`	`method: "POST",`
`133`	`133`	`})`
`134`	`134`