fix: address PR comments

johnstcn · johnstcn · commit 316501dc2f14 · 2022-04-06T20:05:21.000Z
diff --git a/coderd/database/migrations/000005_workspace_autostartstop.down.sql b/coderd/database/migrations/000005_workspace_autostartstop.down.sql
@@ -1,3 +1,3 @@
 ALTER TABLE ONLY workspaces
-    DROP COLUMN autostart_schedule,
-    DROP COLUMN autostop_schedule;
+    DROP COLUMN IF EXISTS autostart_schedule,
+    DROP COLUMN IF EXISTS autostop_schedule;
diff --git a/coderd/database/migrations/000005_workspace_autostartstop.up.sql b/coderd/database/migrations/000005_workspace_autostartstop.up.sql
@@ -1,3 +1,3 @@
 ALTER TABLE ONLY workspaces
-    ADD COLUMN autostart_schedule text DEFAULT NULL,
-    ADD COLUMN autostop_schedule text DEFAULT NULL;
+    ADD COLUMN IF NOT EXISTS autostart_schedule text DEFAULT NULL,
+    ADD COLUMN IF NOT EXISTS autostop_schedule text DEFAULT NULL;
diff --git a/coderd/workspaces_test.go b/coderd/workspaces_test.go
@@ -308,7 +308,10 @@ func TestWorkspaceUpdateAutostart(t *testing.T) {
 		)
 
 		err := client.UpdateWorkspaceAutostart(ctx, wsid, req)
-		require.EqualError(t, err, fmt.Sprintf("status code 404: workspace %q does not exist", wsid), "unexpected error")
+		require.IsType(t, err, &codersdk.Error{}, "expected codersdk.Error")
+		coderSDKErr, _ := err.(*codersdk.Error)
+		require.Equal(t, coderSDKErr.StatusCode(), 404, "expected status code 404")
+		require.Equal(t, fmt.Sprintf("workspace %q does not exist", wsid), coderSDKErr.Message, "unexpected response code")
 	})
 }
 

Original file line number	Diff line number	Diff line change
`@@ -308,7 +308,10 @@ func TestWorkspaceUpdateAutostart(t *testing.T) {`
`308`	`308`	`)`
`309`	`309`
`310`	`310`	`err := client.UpdateWorkspaceAutostart(ctx, wsid, req)`
`311`		`- require.EqualError(t, err, fmt.Sprintf("status code 404: workspace %q does not exist", wsid), "unexpected error")`
	`311`	`+ require.IsType(t, err, &codersdk.Error{}, "expected codersdk.Error")`
	`312`	`+ coderSDKErr, _ := err.(*codersdk.Error)`
	`313`	`+ require.Equal(t, coderSDKErr.StatusCode(), 404, "expected status code 404")`
	`314`	`+ require.Equal(t, fmt.Sprintf("workspace %q does not exist", wsid), coderSDKErr.Message, "unexpected response code")`
`312`	`315`	`})`
`313`	`316`	`}`
`314`	`317`