Skip to content

feat: notify users on template deprecation #15195

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Oct 24, 2024
Merged

feat: notify users on template deprecation #15195

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
2b236e8
feat: notify users on template deprecation
DanielleMaywood Oct 23, 2024
640138a
test: test behaviour
DanielleMaywood Oct 23, 2024
22ec59d
fix: ci
DanielleMaywood Oct 23, 2024
cd97285
feat: add CTAs
DanielleMaywood Oct 23, 2024
5732b26
test: add rendered-template test
DanielleMaywood Oct 23, 2024
a971712
test: ensure notification goes to correct users
DanielleMaywood Oct 24, 2024
800adad
refactor: only notify users of template
DanielleMaywood Oct 24, 2024
c63dbff
test: create another template+workspace
DanielleMaywood Oct 24, 2024
468ba87
fix: remove unused test
DanielleMaywood Oct 24, 2024
c1e0fb2
chore: rename 'See workspaces' to 'See affected workspaces'
DanielleMaywood Oct 24, 2024
b210680
fix: update golden files
DanielleMaywood Oct 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
test: create another template+workspace
  • Loading branch information
@DanielleMaywood
DanielleMaywood committed Oct 24, 2024
commit c63dbff5b760f29d96b087388cbb0a98112c7b99
13 changes: 11 additions & 2 deletions enterprise/coderd/templates_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,14 +52,23 @@ func TestTemplates(t *testing.T) {
},
})
client, secondUser := coderdtest.CreateAnotherUser(t, owner, user.OrganizationID, rbac.RoleTemplateAdmin())
_, thirdUser := coderdtest.CreateAnotherUser(t, owner, user.OrganizationID, rbac.RoleTemplateAdmin())
otherClient, otherUser := coderdtest.CreateAnotherUser(t, owner, user.OrganizationID, rbac.RoleTemplateAdmin())

version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil)
template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID)
coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID)

_ = coderdtest.CreateWorkspace(t, owner, template.ID)
_ = coderdtest.CreateWorkspace(t, client, template.ID)

// Create another template for testing that users of another template do not
// get a notification.
secondVersion := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil)
secondTemplate := coderdtest.CreateTemplate(t, client, user.OrganizationID, secondVersion.ID)
coderdtest.AwaitTemplateVersionJobCompleted(t, client, secondVersion.ID)

_ = coderdtest.CreateWorkspace(t, otherClient, secondTemplate.ID)

ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
defer cancel()

Expand Down Expand Up @@ -95,7 +104,7 @@ func TestTemplates(t *testing.T) {
// The previous check should verify this but we're double checking that
// the notification wasn't sent to users not using the template.
for _, notif := range notifs {
assert.NotEqual(t, thirdUser.ID, notif.UserID)
assert.NotEqual(t, otherUser.ID, notif.UserID)
}

_, err = client.CreateWorkspace(ctx, user.OrganizationID, codersdk.Me, codersdk.CreateWorkspaceRequest{
Expand Down
Loading