From abf60421b450a5423a580e50fc16dc91e4bcf057 Mon Sep 17 00:00:00 2001
From: Rohan Sharma <117426013+RS-labhub@users.noreply.github.com>
Date: Mon, 14 Oct 2024 13:25:34 +0530
Subject: [PATCH] fix: role test errcheck issues (#28545)

Co-authored-by: Mattermost Build <build@mattermost.com>
---
 server/.golangci.yml              |  4 +++-
 server/channels/api4/role_test.go | 40 ++++++++++++++++++++++++-------
 2 files changed, 35 insertions(+), 9 deletions(-)

diff --git a/server/.golangci.yml b/server/.golangci.yml
index 74a12db10d..1126d6b936 100644
--- a/server/.golangci.yml
+++ b/server/.golangci.yml
@@ -84,7 +84,9 @@ issues:
         channels/api4/preference_test.go|\
         channels/api4/reaction_test.go|\
         channels/api4/remote_cluster.go|\
-        channels/api4/role_test.go|\
+        channels/api4/role.go|\
+        channels/api4/saml.go|\
+        channels/api4/scheme.go|\
         channels/api4/scheme_test.go|\
         channels/api4/shared_channel.go|\
         channels/api4/status.go|\
diff --git a/server/channels/api4/role_test.go b/server/channels/api4/role_test.go
index a62b784386..3abdda262c 100644
--- a/server/channels/api4/role_test.go
+++ b/server/channels/api4/role_test.go
@@ -52,7 +52,10 @@ func TestGetRole(t *testing.T) {
 
 	role, err := th.App.Srv().Store().Role().Save(role)
 	require.NoError(t, err)
-	defer th.App.Srv().Store().Job().Delete(role.Id)
+	defer func() {
+		_, err := th.App.Srv().Store().Job().Delete(role.Id)
+		require.NoError(t, err)
+	}()
 
 	th.TestForAllClients(t, func(t *testing.T, client *model.Client4) {
 		received, _, err := client.GetRole(context.Background(), role.Id)
@@ -91,7 +94,10 @@ func TestGetRoleByName(t *testing.T) {
 
 	role, err := th.App.Srv().Store().Role().Save(role)
 	assert.NoError(t, err)
-	defer th.App.Srv().Store().Job().Delete(role.Id)
+	defer func() {
+		_, err := th.App.Srv().Store().Job().Delete(role.Id)
+		require.NoError(t, err)
+	}()
 
 	th.TestForAllClients(t, func(t *testing.T, client *model.Client4) {
 		received, _, err := client.GetRoleByName(context.Background(), role.Name)
@@ -144,15 +150,24 @@ func TestGetRolesByNames(t *testing.T) {
 
 	role1, err := th.App.Srv().Store().Role().Save(role1)
 	assert.NoError(t, err)
-	defer th.App.Srv().Store().Job().Delete(role1.Id)
+	defer func() {
+		_, err = th.App.Srv().Store().Job().Delete(role1.Id)
+		require.NoError(t, err)
+	}()
 
 	role2, err = th.App.Srv().Store().Role().Save(role2)
 	assert.NoError(t, err)
-	defer th.App.Srv().Store().Job().Delete(role2.Id)
+	defer func() {
+		_, err = th.App.Srv().Store().Job().Delete(role2.Id)
+		require.NoError(t, err)
+	}()
 
 	role3, err = th.App.Srv().Store().Role().Save(role3)
 	assert.NoError(t, err)
-	defer th.App.Srv().Store().Job().Delete(role3.Id)
+	defer func() {
+		_, err = th.App.Srv().Store().Job().Delete(role3.Id)
+		require.NoError(t, err)
+	}()
 
 	th.TestForAllClients(t, func(t *testing.T, client *model.Client4) {
 		// Check all three roles can be found.
@@ -213,7 +228,10 @@ func TestPatchRole(t *testing.T) {
 
 	role, err2 := th.App.Srv().Store().Role().Save(role)
 	assert.NoError(t, err2)
-	defer th.App.Srv().Store().Job().Delete(role.Id)
+	defer func() {
+		_, err := th.App.Srv().Store().Job().Delete(role.Id)
+		require.NoError(t, err)
+	}()
 
 	patch := &model.RolePatch{
 		Permissions: &[]string{"create_direct_channel", "create_public_channel", "manage_incoming_webhooks", "manage_outgoing_webhooks"},
@@ -223,7 +241,10 @@ func TestPatchRole(t *testing.T) {
 		// Cannot edit a system admin
 		adminRole, err := th.App.Srv().Store().Role().GetByName(context.Background(), "system_admin")
 		assert.NoError(t, err)
-		defer th.App.Srv().Store().Job().Delete(adminRole.Id)
+		defer func() {
+			_, err = th.App.Srv().Store().Job().Delete(adminRole.Id)
+			require.NoError(t, err)
+		}()
 
 		_, resp, err := client.PatchRole(context.Background(), adminRole.Id, patch)
 		require.Error(t, err)
@@ -232,7 +253,10 @@ func TestPatchRole(t *testing.T) {
 		// Cannot give other roles read / write to system roles or manage roles because only system admin can do these actions
 		systemManager, err := th.App.Srv().Store().Role().GetByName(context.Background(), "system_manager")
 		assert.NoError(t, err)
-		defer th.App.Srv().Store().Job().Delete(systemManager.Id)
+		defer func() {
+			_, err = th.App.Srv().Store().Job().Delete(systemManager.Id)
+			require.NoError(t, err)
+		}()
 
 		patchWriteSystemRoles := &model.RolePatch{
 			Permissions: &[]string{model.PermissionSysconsoleWriteUserManagementSystemRoles.Id},