From 1669a0869f14a5378dc96aafb825a036e53def19 Mon Sep 17 00:00:00 2001 From: Arya Khochare <91268931+Aryakoste@users.noreply.github.com> Date: Tue, 8 Oct 2024 00:50:18 +0530 Subject: [PATCH] errcheck issues fixed (#28555) --- server/.golangci.yml | 1 - .../api4/outgoing_oauth_connection_test.go | 71 ++++++++++++++----- 2 files changed, 54 insertions(+), 18 deletions(-) diff --git a/server/.golangci.yml b/server/.golangci.yml index 270ac9d06d..9ea368b782 100644 --- a/server/.golangci.yml +++ b/server/.golangci.yml @@ -86,7 +86,6 @@ issues: channels/api4/license.go|\ channels/api4/license_local.go|\ channels/api4/oauth_test.go|\ - channels/api4/outgoing_oauth_connection_test.go|\ channels/api4/plugin.go|\ channels/api4/plugin_test.go|\ channels/api4/post_test.go|\ diff --git a/server/channels/api4/outgoing_oauth_connection_test.go b/server/channels/api4/outgoing_oauth_connection_test.go index 55826f19d6..46639d5294 100644 --- a/server/channels/api4/outgoing_oauth_connection_test.go +++ b/server/channels/api4/outgoing_oauth_connection_test.go @@ -224,7 +224,8 @@ func TestClientOutgoingOAuthConnectionGet(t *testing.T) { license := model.NewTestLicenseSKU(model.LicenseShortSkuEnterprise, "outgoing_oauth_connections") license.Id = "test-license-id" th.App.Srv().SetLicense(license) - th.App.Srv().RemoveLicense() + appErr := th.App.Srv().RemoveLicense() + require.Nil(t, appErr) th.LoginTeamAdmin() @@ -262,7 +263,8 @@ func TestClientListOutgoingOAuthConnection(t *testing.T) { }) th.App.Srv().OutgoingOAuthConnection = outgoingOauthIface - th.Client.Login(context.Background(), th.BasicUser.Email, th.BasicUser.Password) + _, _, err := th.Client.Login(context.Background(), th.BasicUser.Email, th.BasicUser.Password) + require.NoError(t, err) filters := model.OutgoingOAuthConnectionGetConnectionsFilter{ Limit: 10, @@ -297,7 +299,8 @@ func TestClientListOutgoingOAuthConnection(t *testing.T) { }) th.App.Srv().OutgoingOAuthConnection = outgoingOauthIface - th.Client.Login(context.Background(), th.BasicUser.Email, th.BasicUser.Password) + _, _, err := th.Client.Login(context.Background(), th.BasicUser.Email, th.BasicUser.Password) + require.NoError(t, err) filters := model.OutgoingOAuthConnectionGetConnectionsFilter{ Limit: 10, @@ -333,7 +336,8 @@ func TestClientListOutgoingOAuthConnection(t *testing.T) { }) th.App.Srv().OutgoingOAuthConnection = outgoingOauthIface - th.Client.Login(context.Background(), th.BasicUser.Email, th.BasicUser.Password) + _, _, err := th.Client.Login(context.Background(), th.BasicUser.Email, th.BasicUser.Password) + require.NoError(t, err) filters := model.OutgoingOAuthConnectionGetConnectionsFilter{ Limit: 10, @@ -376,7 +380,8 @@ func TestClientListOutgoingOAuthConnection(t *testing.T) { }) th.App.Srv().OutgoingOAuthConnection = outgoingOauthIface - th.Client.Login(context.Background(), th.BasicUser.Email, th.BasicUser.Password) + _, _, err = th.Client.Login(context.Background(), th.BasicUser.Email, th.BasicUser.Password) + require.NoError(t, err) filters := model.OutgoingOAuthConnectionGetConnectionsFilter{ Limit: 1, @@ -421,7 +426,8 @@ func TestClientListOutgoingOAuthConnection(t *testing.T) { }) th.App.Srv().OutgoingOAuthConnection = outgoingOauthIface - th.Client.Login(context.Background(), th.BasicUser.Email, th.BasicUser.Password) + _, _, err = th.Client.Login(context.Background(), th.BasicUser.Email, th.BasicUser.Password) + require.NoError(t, err) filters := model.OutgoingOAuthConnectionGetConnectionsFilter{ Limit: 10, @@ -441,7 +447,10 @@ func TestClientGetOutgoingOAuthConnection(t *testing.T) { defer os.Unsetenv("MM_FEATUREFLAGS_OUTGOINGOAUTHCONNECTIONS") th := Setup(t).InitBasic() defer th.TearDown() - defer th.App.Srv().RemoveLicense() + defer func() { + appErr := th.App.Srv().RemoveLicense() + require.Nil(t, appErr) + }() license := model.NewTestLicenseSKU(model.LicenseShortSkuEnterprise, "outgoing_oauth_connections") license.Id = "test-license-id" @@ -460,7 +469,8 @@ func TestClientGetOutgoingOAuthConnection(t *testing.T) { }) th.App.Srv().OutgoingOAuthConnection = outgoingOauthIface - th.Client.Login(context.Background(), th.BasicUser.Email, th.BasicUser.Password) + _, _, err := th.Client.Login(context.Background(), th.BasicUser.Email, th.BasicUser.Password) + require.NoError(t, err) connection, response, err := th.Client.GetOutgoingOAuthConnection(context.Background(), "test") require.Error(t, err) @@ -512,7 +522,10 @@ func TestClientCreateOutgoingOAuthConnection(t *testing.T) { defer os.Unsetenv("MM_FEATUREFLAGS_OUTGOINGOAUTHCONNECTIONS") th := Setup(t).InitBasic() defer th.TearDown() - defer th.App.Srv().RemoveLicense() + defer func() { + appErr := th.App.Srv().RemoveLicense() + require.Nil(t, appErr) + }() license := model.NewTestLicenseSKU(model.LicenseShortSkuEnterprise, "outgoing_oauth_connections") license.Id = "test-license-id" @@ -585,7 +598,10 @@ func TestClientUpdateOutgoingOAuthConnection(t *testing.T) { defer os.Unsetenv("MM_FEATUREFLAGS_OUTGOINGOAUTHCONNECTIONS") th := Setup(t).InitBasic() defer th.TearDown() - defer th.App.Srv().RemoveLicense() + defer func() { + appErr := th.App.Srv().RemoveLicense() + require.Nil(t, appErr) + }() license := model.NewTestLicenseSKU(model.LicenseShortSkuEnterprise, "outgoing_oauth_connections") license.Id = "test-license-id" @@ -664,7 +680,10 @@ func TestClientDeleteOutgoingOAuthConnection(t *testing.T) { defer os.Unsetenv("MM_FEATUREFLAGS_OUTGOINGOAUTHCONNECTIONS") th := Setup(t).InitBasic() defer th.TearDown() - defer th.App.Srv().RemoveLicense() + defer func() { + appErr := th.App.Srv().RemoveLicense() + require.Nil(t, appErr) + }() license := model.NewTestLicenseSKU(model.LicenseShortSkuEnterprise, "outgoing_oauth_connections") license.Id = "test-license-id" @@ -809,7 +828,10 @@ func TestEnsureOutgoingOAuthConnectionInterface(t *testing.T) { license := model.NewTestLicenseSKU(model.LicenseShortSkuEnterprise, "outgoing_oauth_connections") license.Id = "test-license-id" th.App.Srv().SetLicense(license) - defer th.App.Srv().RemoveLicense() + defer func() { + appErr := th.App.Srv().RemoveLicense() + require.Nil(t, appErr) + }() c := &Context{} c.AppContext = th.Context @@ -831,7 +853,10 @@ func TestHandlerOutgoingOAuthConnectionListGet(t *testing.T) { license := model.NewTestLicenseSKU(model.LicenseShortSkuEnterprise, "outgoing_oauth_connections") license.Id = "test-license-id" th.App.Srv().SetLicense(license) - defer th.App.Srv().RemoveLicense() + defer func() { + appErr := th.App.Srv().RemoveLicense() + require.Nil(t, appErr) + }() c := &Context{} c.AppContext = th.Context @@ -954,7 +979,10 @@ func TestHandlerOutgoingOAuthConnectionListReadOnly(t *testing.T) { license := model.NewTestLicenseSKU(model.LicenseShortSkuEnterprise, "outgoing_oauth_connections") license.Id = "test-license-id" th.App.Srv().SetLicense(license) - defer th.App.Srv().RemoveLicense() + defer func() { + appErr := th.App.Srv().RemoveLicense() + require.Nil(t, appErr) + }() c := &Context{} c.AppContext = th.Context @@ -1048,7 +1076,10 @@ func TestHandlerOutgoingOAuthConnectionUpdate(t *testing.T) { license := model.NewTestLicenseSKU(model.LicenseShortSkuEnterprise, "outgoing_oauth_connections") license.Id = "test-license-id" th.App.Srv().SetLicense(license) - defer th.App.Srv().RemoveLicense() + defer func() { + appErr := th.App.Srv().RemoveLicense() + require.Nil(t, appErr) + }() t.Run("no permissions", func(t *testing.T) { c := &Context{} @@ -1258,7 +1289,10 @@ func TestHandlerOutgoingOAuthConnectionHandlerCreate(t *testing.T) { license := model.NewTestLicenseSKU(model.LicenseShortSkuEnterprise, "outgoing_oauth_connections") license.Id = "test-license-id" th.App.Srv().SetLicense(license) - defer th.App.Srv().RemoveLicense() + defer func() { + appErr := th.App.Srv().RemoveLicense() + require.Nil(t, appErr) + }() outgoingOAuthConnectionConfig := th.App.Config().ServiceSettings.EnableOutgoingOAuthConnections th.App.Config().ServiceSettings.EnableOutgoingOAuthConnections = model.NewPointer(true) @@ -1404,7 +1438,10 @@ func TestHandlerOutgoingOAuthConnectionHandlerValidate(t *testing.T) { license := model.NewTestLicenseSKU(model.LicenseShortSkuEnterprise, "outgoing_oauth_connections") license.Id = "test-license-id" th.App.Srv().SetLicense(license) - defer th.App.Srv().RemoveLicense() + defer func() { + appErr := th.App.Srv().RemoveLicense() + require.Nil(t, appErr) + }() // Run a server to fake the valid and invalid requests made to the oauth server server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {