From cdfadcf47d8eb9d95cd23f377654df70080c21d9 Mon Sep 17 00:00:00 2001
From: Arya Khochare <91268931+Aryakoste@users.noreply.github.com>
Date: Tue, 17 Dec 2024 17:22:43 +0530
Subject: [PATCH] Fixed errcheck issues in
 server/channels/app/security_update_check.go (#29200)

---
 server/.golangci.yml                         |  1 -
 server/channels/app/security_update_check.go | 19 +++++++++++++++----
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/server/.golangci.yml b/server/.golangci.yml
index e0e15aaa8b6..65124f3b821 100644
--- a/server/.golangci.yml
+++ b/server/.golangci.yml
@@ -104,7 +104,6 @@ issues:
         channels/app/plugin_test.go|\
         channels/app/post_helpers_test.go|\
         channels/app/post_test.go|\
-        channels/app/security_update_check.go|\
         channels/app/server.go|\
         channels/app/slack.go|\
         channels/app/slashcommands/auto_environment.go|\
diff --git a/server/channels/app/security_update_check.go b/server/channels/app/security_update_check.go
index 52e64c9164c..81499e6c6d0 100644
--- a/server/channels/app/security_update_check.go
+++ b/server/channels/app/security_update_check.go
@@ -64,9 +64,15 @@ func (s *Server) DoSecurityUpdateCheck() {
 
 		systemSecurityLastTime := &model.System{Name: model.SystemLastSecurityTime, Value: strconv.FormatInt(currentTime, 10)}
 		if lastSecurityTime == 0 {
-			s.Store().System().Save(systemSecurityLastTime)
+			if err := s.Store().System().Save(systemSecurityLastTime); err != nil {
+				s.Log().Error("Failed to save last security check time", mlog.Err(err))
+				return
+			}
 		} else {
-			s.Store().System().Update(systemSecurityLastTime)
+			if err := s.Store().System().Update(systemSecurityLastTime); err != nil {
+				s.Log().Error("Failed to update last security check time", mlog.Err(err))
+				return
+			}
 		}
 
 		if count, err := s.Store().User().Count(model.UserCountOptions{IncludeDeleted: true}); err == nil {
@@ -121,11 +127,16 @@ func (s *Server) DoSecurityUpdateCheck() {
 						mlog.Info("Sending security bulletin", mlog.String("bulletin_id", bulletin.Id), mlog.String("user_email", user.Email))
 						license := s.License()
 						mailConfig := s.MailServiceConfig()
-						mail.SendMailUsingConfig(user.Email, i18n.T("mattermost.bulletin.subject"), string(body), mailConfig, license != nil && *license.Features.Compliance, "", "", "", "", "SecurityUpdateCheck")
+						err = mail.SendMailUsingConfig(user.Email, i18n.T("mattermost.bulletin.subject"), string(body), mailConfig, license != nil && *license.Features.Compliance, "", "", "", "", "SecurityUpdateCheck")
+						if err != nil {
+							s.Log().Error("Failed to send security bulletin email", mlog.String("user_email", user.Email), mlog.Err(err))
+						}
 					}
 
 					bulletinSeen := &model.System{Name: "SecurityBulletin_" + bulletin.Id, Value: bulletin.Id}
-					s.Store().System().Save(bulletinSeen)
+					if err := s.Store().System().Save(bulletinSeen); err != nil {
+						s.Log().Error("Failed to save security bulletin status", mlog.Err(err))
+					}
 				}
 			}
 		}