Skip to content

feat: notify template owner on manual build failures #14262

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

Closed
wants to merge 8 commits into from
Closed

feat: notify template owner on manual build failures #14262

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f673b57
feat: notify template owner on manual build failures
BrunoQuaresma Aug 13, 2024
2ad3450
Merge branch 'main' of https://github.com/coder/coder into bq/notify-…
BrunoQuaresma Aug 14, 2024
cdf247b
Apply dannys suggestions
BrunoQuaresma Aug 14, 2024
9c36cb8
Rollback notify changes
BrunoQuaresma Aug 15, 2024
f81611d
Fix tests and notifications
BrunoQuaresma Aug 16, 2024
d5ecc0f
Merge branch 'main' of https://github.com/coder/coder into bq/notify-…
BrunoQuaresma Aug 19, 2024
35abdae
Fix workspace build
BrunoQuaresma Aug 19, 2024
204b17e
Try to fix tests
BrunoQuaresma Aug 19, 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
Rollback notify changes
  • Loading branch information
@BrunoQuaresma
BrunoQuaresma committed Aug 15, 2024
commit 9c36cb8a3e13d451d2fc62094e566eac22a38422
48 changes: 9 additions & 39 deletions coderd/provisionerdserver/provisionerdserver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1020,25 +1020,7 @@ func (s *server) FailJob(ctx context.Context, failJob *proto.FailedJob) (*proto.
return nil, err
}

manualBuild := build.Reason.Valid() && build.Reason == database.BuildReasonInitiator
if !manualBuild {
s.notifyWorkspaceAutoBuildFailed(ctx, workspace, build)
} else {
template, err := s.Database.GetTemplateByID(ctx, workspace.TemplateID)
if err != nil {
return nil, xerrors.Errorf("get template to notify manual build failed: %w", err)
}

owner, err := s.Database.GetUserByID(ctx, workspace.OwnerID)
if err != nil {
return nil, xerrors.Errorf("get owner to notify manual build failed: %w", err)
}

// Only notify the template creator if the build was initiated by someone else
if build.InitiatorID != template.CreatedBy {
s.notifyTemplateManualBuildFailed(ctx, workspace, owner, template, build)
}
}
s.notifyWorkspaceBuildFailed(ctx, workspace, build)

err = s.Pubsub.Publish(codersdk.WorkspaceNotifyChannel(build.WorkspaceID), []byte{})
if err != nil {
Expand Down Expand Up @@ -1113,8 +1095,13 @@ func (s *server) FailJob(ctx context.Context, failJob *proto.FailedJob) (*proto.
return &proto.Empty{}, nil
}

func (s *server) notifyWorkspaceAutoBuildFailed(ctx context.Context, workspace database.Workspace, build database.WorkspaceBuild) {
reason := string(build.Reason)
func (s *server) notifyWorkspaceBuildFailed(ctx context.Context, workspace database.Workspace, build database.WorkspaceBuild) {
var reason string
if build.Reason.Valid() && build.Reason == database.BuildReasonInitiator {
return // failed workspace build initiated by a user should not notify
}
reason = string(build.Reason)

if _, err := s.NotificationsEnqueuer.Enqueue(ctx, workspace.OwnerID, notifications.TemplateWorkspaceAutobuildFailed,
map[string]string{
"name": workspace.Name,
Expand All @@ -1123,24 +1110,7 @@ func (s *server) notifyWorkspaceAutoBuildFailed(ctx context.Context, workspace d
// Associate this notification with all the related entities.
workspace.ID, workspace.OwnerID, workspace.TemplateID, workspace.OrganizationID,
); err != nil {
s.Logger.Warn(ctx, "failed to notify of failed workspace autobuild", slog.F("workspace_id", workspace.ID), slog.Error(err))
}
}

func (s *server) notifyTemplateManualBuildFailed(ctx context.Context, workspace database.Workspace, owner database.User, template database.Template, build database.WorkspaceBuild) {
if _, err := s.NotificationsEnqueuer.Enqueue(ctx, template.CreatedBy, notifications.TemplateTemplateManualBuildFailed,
map[string]string{
"name": template.Name,
"workspaceName": workspace.Name,
"transition": string(build.Transition),
"initiator": build.InitiatorByUsername,
"workspaceUserName": owner.Username,
"buildNumber": strconv.FormatInt(int64(build.BuildNumber), 10),
}, "provisionerdserver",
// Associate this notification with all the related entities.
workspace.ID, workspace.OwnerID, workspace.TemplateID, workspace.OrganizationID, template.CreatedBy,
); err != nil {
s.Logger.Warn(ctx, "failed to notify of failed template manual build", slog.F("template_id", template.ID), slog.F("workspace_id", workspace.ID), slog.Error(err))
s.Logger.Warn(ctx, "failed to notify of failed workspace autobuild", slog.Error(err))
}
}

Expand Down