Commit10327fb

authored

fix(coderd): humanize duration on notifications (#14333)

1 parent755afa3 commit10327fbCopy full SHA for 10327fb

File tree

+24

-5

lines changed

+24

-5

lines changed

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ import (`
`8`	`8`	`"sync/atomic"`
`9`	`9`	`"time"`
`10`	`10`
	`11`	`+"github.com/dustin/go-humanize"`
`11`	`12`	`"github.com/google/uuid"`
`12`	`13`	`"golang.org/x/sync/errgroup"`
`13`	`14`	`"golang.org/x/xerrors"`
`@@ -323,14 +324,15 @@ func (e *Executor) runOnce(t time.Time) Stats {`
`323`	`324`	`}`
`324`	`325`	`}`
`325`	`326`	`ifshouldNotifyDormancy {`
	`327`	`+dormantTime:=dbtime.Now().Add(time.Duration(tmpl.TimeTilDormant))`
`326`	`328`	`_,err=e.notificationsEnqueuer.Enqueue(`
`327`	`329`	`e.ctx,`
`328`	`330`	`ws.OwnerID,`
`329`	`331`	`notifications.TemplateWorkspaceDormant,`
`330`	`332`	`map[string]string{`
`331`	`333`	`"name":ws.Name,`
`332`	`334`	`"reason":"inactivity exceeded the dormancy threshold",`
`333`		`-"timeTilDormant":time.Duration(tmpl.TimeTilDormant).String(),`
	`335`	`+"timeTilDormant":humanize.Time(dormantTime),`
`334`	`336`	`},`
`335`	`337`	`"lifecycle_executor",`
`336`	`338`	`ws.ID,`

Lines changed: 15 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -691,7 +691,7 @@ func TestNotificationTemplatesCanRender(t *testing.T) {`
`691`	`691`	`"reason":"breached the template's threshold for inactivity",`
`692`	`692`	`"initiator":"autobuild",`
`693`	`693`	`"dormancyHours":"24",`
`694`		`-"timeTilDormant":"24h",`
	`694`	`+"timeTilDormant":"24 hours",`
`695`	`695`	`},`
`696`	`696`	`},`
`697`	`697`	`},`
`@@ -716,7 +716,20 @@ func TestNotificationTemplatesCanRender(t *testing.T) {`
`716`	`716`	`"name":"bobby-workspace",`
`717`	`717`	`"reason":"template updated to new dormancy policy",`
`718`	`718`	`"dormancyHours":"24",`
`719`		`-"timeTilDormant":"24h",`
	`719`	`+"timeTilDormant":"24 hours",`
	`720`	`+},`
	`721`	`+},`
	`722`	`+},`
	`723`	`+{`
	`724`	`+name:"TemplateWorkspaceMarkedForDeletionInOneWeek",`
	`725`	`+id:notifications.TemplateWorkspaceMarkedForDeletion,`
	`726`	`+payload: types.MessagePayload{`
	`727`	`+UserName:"bobby",`
	`728`	`+Labels:map[string]string{`
	`729`	`+"name":"bobby-workspace",`
	`730`	`+"reason":"template updated to new dormancy policy",`
	`731`	`+"dormancyHours":"168",// 168 hours = 7 days = 1 week`
	`732`	`+"timeTilDormant":"1 week",`
`720`	`733`	`},`
`721`	`734`	`},`
`722`	`735`	`},`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@ import (`
`11`	`11`	`"strconv"`
`12`	`12`	`"time"`
`13`	`13`
	`14`	`+"github.com/dustin/go-humanize"`
`14`	`15`	`"github.com/go-chi/chi/v5"`
`15`	`16`	`"github.com/google/uuid"`
`16`	`17`	`"golang.org/x/xerrors"`
`@@ -1064,14 +1065,15 @@ func (api API) putWorkspaceDormant(rw http.ResponseWriter, r http.Request) {`
`1064`	`1065`	`}`
`1065`	`1066`
`1066`	`1067`	`ifinitiatorErr==nil&&tmplErr==nil {`
	`1068`	`+dormantTime:=dbtime.Now().Add(time.Duration(tmpl.TimeTilDormant))`
`1067`	`1069`	`_,err=api.NotificationsEnqueuer.Enqueue(`
`1068`	`1070`	`ctx,`
`1069`	`1071`	`workspace.OwnerID,`
`1070`	`1072`	`notifications.TemplateWorkspaceDormant,`
`1071`	`1073`	`map[string]string{`
`1072`	`1074`	`"name":workspace.Name,`
`1073`	`1075`	`"reason":"a "+initiator.Username+" request",`
`1074`		`-"timeTilDormant":time.Duration(tmpl.TimeTilDormant).String(),`
	`1076`	`+"timeTilDormant":humanize.Time(dormantTime),`
`1075`	`1077`	`},`
`1076`	`1078`	`"api",`
`1077`	`1079`	`workspace.ID,`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ import (`
`8`	`8`
`9`	`9`	`"cdr.dev/slog"`
`10`	`10`
	`11`	`+"github.com/dustin/go-humanize"`
`11`	`12`	`"github.com/google/uuid"`
`12`	`13`	`"go.opentelemetry.io/otel/attribute"`
`13`	`14`	`"go.opentelemetry.io/otel/trace"`
`@@ -205,14 +206,15 @@ func (s *EnterpriseTemplateScheduleStore) Set(ctx context.Context, db database.S`
`205`	`206`	`}`
`206`	`207`
`207`	`208`	`for_,ws:=rangemarkedForDeletion {`
	`209`	`+dormantTime:=dbtime.Now().Add(opts.TimeTilDormantAutoDelete)`
`208`	`210`	`_,err=s.enqueuer.Enqueue(`
`209`	`211`	`ctx,`
`210`	`212`	`ws.OwnerID,`
`211`	`213`	`notifications.TemplateWorkspaceMarkedForDeletion,`
`212`	`214`	`map[string]string{`
`213`	`215`	`"name":ws.Name,`
`214`	`216`	`"reason":"an update to the template's dormancy",`
`215`		`-"timeTilDormant":opts.TimeTilDormantAutoDelete.String(),`
	`217`	`+"timeTilDormant":humanize.Time(dormantTime),`
`216`	`218`	`},`
`217`	`219`	`"scheduletemplate",`
`218`	`220`	`// Associate this notification with all the related entities.`

Comments

(0)