Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix typo
Browse files Browse the repository at this point in the history
marcoandredinis committed Oct 25, 2024
1 parent 9e766bb commit 1dbb17a
Showing 3 changed files with 3 additions and 4 deletions.
2 changes: 1 addition & 1 deletion api/proto/teleport/legacy/types/types.proto
Original file line number Diff line number Diff line change
@@ -7254,7 +7254,7 @@ message IntegrationV1 {
message IntegrationStatusV1 {
// PendingUserTasksNotificationID contains the notification ID that indicates that this integration has unresolved user tasks.
string PendingUserTasksNotificationID = 1 [(gogoproto.jsontag) = "pending_user_tasks_notification_id,omitempty"];
// NeedsAttentionNotificationExpires contains the expiration date for the notification.
// PendingUserTasksNotificationExpires contains the expiration date for the notification.
// Used to ensure new notifications' expiration is the greater between the current notification and the new one.
google.protobuf.Timestamp PendingUserTasksNotificationExpires = 2 [
(gogoproto.stdtime) = true,
2 changes: 1 addition & 1 deletion api/types/types.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions lib/auth/usertasks/usertasksv1/service.go
Original file line number Diff line number Diff line change
@@ -438,8 +438,7 @@ func (s *Service) notifyUserAboutPendingTask(ctx context.Context, ut *usertasksv
return trace.Wrap(err)
}
integrationStatus := integration.GetStatus()
existingNotification := integrationStatus.PendingUserTasksNotificationID
if existingNotification != "" {
if integrationStatus.PendingUserTasksNotificationID != "" {
if err := s.backend.DeleteGlobalNotification(ctx, integrationStatus.PendingUserTasksNotificationID); err != nil {
// NotFound might be returned when the GlobalNotification already expired or was deleted.
if !trace.IsNotFound(err) {

0 comments on commit 1dbb17a

Please sign in to comment.