address PR comments

johnstcn · johnstcn · commit 085497adb0ba · 2022-06-02T09:46:09.000Z
diff --git a/coderd/util/ptr/ptr.go b/coderd/util/ptr/ptr.go
@@ -12,11 +12,6 @@ func Ref[T any](v T) *T {
 	return &v
 }
 
-// Deref dereferences v. Opposite of Ptr.
-func Deref[T any](v *T) T {
-	return *v
-}
-
 // NilOrEmpty returns true if s is nil or the empty string.
 func NilOrEmpty(s *string) bool {
 	return s == nil || *s == ""
diff --git a/coderd/util/ptr/ptr_test.go b/coderd/util/ptr/ptr_test.go
@@ -16,35 +16,27 @@ func Test_Ref_Deref(t *testing.T) {
 		t.Parallel()
 		val := "test"
 		p := ptr.Ref(val)
-		d := ptr.Deref(p)
-		assert.Equal(t, val, d)
 		assert.Equal(t, &val, p)
 	})
 
 	t.Run("Bool", func(t *testing.T) {
 		t.Parallel()
 		val := true
 		p := ptr.Ref(val)
-		d := ptr.Deref(p)
-		assert.Equal(t, val, d)
 		assert.Equal(t, &val, p)
 	})
 
 	t.Run("Int64", func(t *testing.T) {
 		t.Parallel()
 		val := int64(42)
 		p := ptr.Ref(val)
-		d := ptr.Deref(p)
-		assert.Equal(t, val, d)
 		assert.Equal(t, &val, p)
 	})
 
 	t.Run("Float64", func(t *testing.T) {
 		t.Parallel()
 		val := float64(3.14159)
 		p := ptr.Ref(val)
-		d := ptr.Deref(p)
-		assert.Equal(t, val, d)
 		assert.Equal(t, &val, p)
 	})
 }
diff --git a/site/src/pages/WorkspaceSchedulePage/WorkspaceSchedulePage.tsx b/site/src/pages/WorkspaceSchedulePage/WorkspaceSchedulePage.tsx
@@ -106,7 +106,7 @@ export const workspaceToInitialValues = (workspace: TypesGen.Workspace): Workspa
       saturday: false,
       startTime: "",
       timezone: "",
-      ttl: ttl,
+      ttl,
     }
   }
 
@@ -133,7 +133,7 @@ export const workspaceToInitialValues = (workspace: TypesGen.Workspace): Workspa
     saturday: weeklyFlags[6],
     startTime: `${HH.padStart(2, "0")}:${mm.padStart(2, "0")}`,
     timezone,
-    ttl: ttl,
+    ttl,
   }
 }
 
diff --git a/site/src/testHelpers/entities.ts b/site/src/testHelpers/entities.ts
@@ -164,7 +164,7 @@ export const MockWorkspace: TypesGen.Workspace = {
   owner_id: MockUser.id,
   owner_name: MockUser.username,
   autostart_schedule: MockWorkspaceAutostartEnabled.schedule,
-  ttl_ms: 2 * 60 * 60 * 1000 * 1_000_000, // 2 hours as nanoseconds
+  ttl_ms: 2 * 60 * 60 * 1000, // 2 hours as milliseconds
   latest_build: MockWorkspaceBuild,
 }
 

Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ export const workspaceToInitialValues = (workspace: TypesGen.Workspace): Workspa`
`106`	`106`	`saturday: false,`
`107`	`107`	`startTime: "",`
`108`	`108`	`timezone: "",`
`109`		`- ttl: ttl,`
	`109`	`+ ttl,`
`110`	`110`	`}`
`111`	`111`	`}`
`112`	`112`
`@@ -133,7 +133,7 @@ export const workspaceToInitialValues = (workspace: TypesGen.Workspace): Workspa`
`133`	`133`	`saturday: weeklyFlags[6],`
`134`	`134`	startTime: `${HH.padStart(2, "0")}:${mm.padStart(2, "0")}`,
`135`	`135`	`timezone,`
`136`		`- ttl: ttl,`
	`136`	`+ ttl,`
`137`	`137`	`}`
`138`	`138`	`}`
`139`	`139`
Original file line number	Diff line number	Diff line change
`@@ -164,7 +164,7 @@ export const MockWorkspace: TypesGen.Workspace = {`
`164`	`164`	`owner_id: MockUser.id,`
`165`	`165`	`owner_name: MockUser.username,`
`166`	`166`	`autostart_schedule: MockWorkspaceAutostartEnabled.schedule,`
`167`		`- ttl_ms: 2 * 60 * 60 * 1000 * 1_000_000, // 2 hours as nanoseconds`
	`167`	`+ ttl_ms: 2 * 60 * 60 * 1000, // 2 hours as milliseconds`
`168`	`168`	`latest_build: MockWorkspaceBuild,`
`169`	`169`	`}`
`170`	`170`