Skip to content

Commit 6f909ae

Browse files
dannykoppingdannykopping
committed
Remove unnecessary Labels struct
Signed-off-by: Danny Kopping <danny@coder.com>
1 parent 757327c commit 6f909ae

File tree

4 files changed

+20
-18
lines changed

4 files changed

+20
-18
lines changed

‎coderd/notifications/dispatch/smtp.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,13 +71,13 @@ func (s *SMTPHandler) Dispatcher(payload types.MessagePayload, titleTmpl, bodyTm
7171
}
7272

7373
// Then, reuse these strings in the HTML & plain body templates.
74-
payload.Labels.Set("_subject", subject)
75-
payload.Labels.Set("_body", htmlBody)
74+
payload.Labels["_subject"] = subject
75+
payload.Labels["_body"] = htmlBody
7676
htmlBody, err = render.GoTemplate(htmlTemplate, payload, nil)
7777
if err != nil {
7878
return nil, xerrors.Errorf("render full html template: %w", err)
7979
}
80-
payload.Labels.Set("_body", plainBody)
80+
payload.Labels["_body"] = plainBody
8181
plainBody, err = render.GoTemplate(plainTemplate, payload, nil)
8282
if err != nil {
8383
return nil, xerrors.Errorf("render full plaintext template: %w", err)

‎coderd/notifications/manager_test.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import (
1414

1515
"cdr.dev/slog"
1616
"cdr.dev/slog/sloggers/slogtest"
17+
1718
"github.com/coder/coder/v2/coderd/coderdtest"
1819
"github.com/coder/coder/v2/coderd/database"
1920
"github.com/coder/coder/v2/coderd/database/dbmem"
@@ -48,13 +49,13 @@ func TestBufferedUpdates(t *testing.T) {
4849
user := coderdtest.CreateFirstUser(t, client)
4950

5051
// given
51-
if _, err := enq.Enqueue(ctx, user.UserID, notifications.TemplateWorkspaceDeleted, types.Labels{"nice": "true"}, ""); true {
52+
if _, err := enq.Enqueue(ctx, user.UserID, notifications.TemplateWorkspaceDeleted, map[string]string{"nice": "true"}, ""); true {
5253
require.NoError(t, err)
5354
}
54-
if _, err := enq.Enqueue(ctx, user.UserID, notifications.TemplateWorkspaceDeleted, types.Labels{"nice": "true"}, ""); true {
55+
if _, err := enq.Enqueue(ctx, user.UserID, notifications.TemplateWorkspaceDeleted, map[string]string{"nice": "true"}, ""); true {
5556
require.NoError(t, err)
5657
}
57-
if _, err := enq.Enqueue(ctx, user.UserID, notifications.TemplateWorkspaceDeleted, types.Labels{"nice": "false"}, ""); true {
58+
if _, err := enq.Enqueue(ctx, user.UserID, notifications.TemplateWorkspaceDeleted, map[string]string{"nice": "false"}, ""); true {
5859
require.NoError(t, err)
5960
}
6061

@@ -174,7 +175,7 @@ func (*santaHandler) NotificationMethod() database.NotificationMethod {
174175

175176
func (s *santaHandler) Dispatcher(payload types.MessagePayload, _, _ string) (dispatch.DeliveryFunc, error) {
176177
return func(ctx context.Context, msgID uuid.UUID) (retryable bool, err error) {
177-
if payload.Labels.Get("nice") != "true" {
178+
if payload.Labels["nice"] != "true" {
178179
s.naughty.Add(1)
179180
return false, xerrors.New("be nice")
180181
}

‎coderd/notifications/notifications_test.go

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ import (
1717
"github.com/stretchr/testify/require"
1818
"go.uber.org/goleak"
1919

20+
"github.com/coder/serpent"
21+
2022
"github.com/coder/coder/v2/coderd/coderdtest"
2123
"github.com/coder/coder/v2/coderd/database"
2224
"github.com/coder/coder/v2/coderd/database/dbtestutil"
@@ -25,7 +27,6 @@ import (
2527
"github.com/coder/coder/v2/coderd/notifications/types"
2628
"github.com/coder/coder/v2/codersdk"
2729
"github.com/coder/coder/v2/testutil"
28-
"github.com/coder/serpent"
2930
)
3031

3132
func TestMain(m *testing.M) {
@@ -62,9 +63,9 @@ func TestBasicNotificationRoundtrip(t *testing.T) {
6263
user := coderdtest.CreateFirstUser(t, client)
6364

6465
// when
65-
sid, err := enq.Enqueue(ctx, user.UserID, notifications.TemplateWorkspaceDeleted, types.Labels{"type": "success"}, "test")
66+
sid, err := enq.Enqueue(ctx, user.UserID, notifications.TemplateWorkspaceDeleted, map[string]string{"type": "success"}, "test")
6667
require.NoError(t, err)
67-
fid, err := enq.Enqueue(ctx, user.UserID, notifications.TemplateWorkspaceDeleted, types.Labels{"type": "failure"}, "test")
68+
fid, err := enq.Enqueue(ctx, user.UserID, notifications.TemplateWorkspaceDeleted, map[string]string{"type": "failure"}, "test")
6869
require.NoError(t, err)
6970

7071
mgr.Run(ctx, 1)
@@ -120,7 +121,7 @@ func TestSMTPDispatch(t *testing.T) {
120121
})
121122

122123
// when
123-
msgID, err := enq.Enqueue(ctx, user.ID, notifications.TemplateWorkspaceDeleted, types.Labels{}, "test")
124+
msgID, err := enq.Enqueue(ctx, user.ID, notifications.TemplateWorkspaceDeleted, map[string]string{}, "test")
124125
require.NoError(t, err)
125126

126127
mgr.Run(ctx, 1)
@@ -150,7 +151,7 @@ func TestWebhookDispatch(t *testing.T) {
150151

151152
var (
152153
msgID *uuid.UUID
153-
input types.Labels
154+
input map[string]string
154155
)
155156

156157
sent := make(chan bool, 1)
@@ -201,7 +202,7 @@ func TestWebhookDispatch(t *testing.T) {
201202
})
202203

203204
// when
204-
input = types.Labels{
205+
input = map[string]string{
205206
"a": "b",
206207
"c": "d",
207208
}
@@ -284,7 +285,7 @@ func TestBackpressure(t *testing.T) {
284285
// when
285286
const totalMessages = 30
286287
for i := 0; i < totalMessages; i++ {
287-
_, err = enq.Enqueue(ctx, user.ID, notifications.TemplateWorkspaceDeleted, types.Labels{"i": fmt.Sprintf("%d", i)}, "test")
288+
_, err = enq.Enqueue(ctx, user.ID, notifications.TemplateWorkspaceDeleted, map[string]string{"i": fmt.Sprintf("%d", i)}, "test")
288289
require.NoError(t, err)
289290
}
290291

@@ -389,7 +390,7 @@ func TestRetries(t *testing.T) {
389390

390391
// when
391392
for i := 0; i < 1; i++ {
392-
_, err = enq.Enqueue(ctx, user.ID, notifications.TemplateWorkspaceDeleted, types.Labels{"i": fmt.Sprintf("%d", i)}, "test")
393+
_, err = enq.Enqueue(ctx, user.ID, notifications.TemplateWorkspaceDeleted, map[string]string{"i": fmt.Sprintf("%d", i)}, "test")
393394
require.NoError(t, err)
394395
}
395396

@@ -415,7 +416,7 @@ func (*fakeHandler) NotificationMethod() database.NotificationMethod {
415416

416417
func (f *fakeHandler) Dispatcher(payload types.MessagePayload, _, _ string) (dispatch.DeliveryFunc, error) {
417418
return func(ctx context.Context, msgID uuid.UUID) (retryable bool, err error) {
418-
if payload.Labels.Get("type") == "success" {
419+
if payload.Labels["type"] == "success" {
419420
f.succeeded = msgID.String()
420421
} else {
421422
f.failed = msgID.String()

‎coderd/notifications/types/payload.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ type MessagePayload struct {
1414
UserEmail string `json:"user_email"`
1515
UserName string `json:"user_name"`
1616

17-
Actions []TemplateAction `json:"actions"`
18-
Labels Labels `json:"labels"`
17+
Actions []TemplateAction `json:"actions"`
18+
Labels map[string]string `json:"labels"`
1919
}

0 commit comments

Comments
 (0)