mirrors/mostlymatter
1
0
Форкнуть 0
Код Задачи Запросы на слияние Действия Пакеты Проекты Релизы Вики Активность

fix: Scheme test errcheck issues (#28553)

Просмотр исходного кода 
Co-authored-by: Ben Schumacher <ben.schumacher@mattermost.com>
Этот коммит содержится в:
Rohan Sharma
2024-10-17 03:00:09 +05:30
коммит произвёл GitHub
родитель b1cde33d2c
Коммит df925a3e6b
2 изменённых файлов: 54 добавлений и 30 удалений
Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

1
server/.golangci.yml
Просмотреть файл

@@ -82,7 +82,6 @@ issues:
channels/api4/role.go|\ channels/api4/role.go|\
channels/api4/saml.go|\ channels/api4/saml.go|\
channels/api4/scheme.go|\ channels/api4/scheme.go|\
channels/api4/scheme_test.go|\
channels/api4/shared_channel.go|\ channels/api4/shared_channel.go|\
channels/api4/system.go|\ channels/api4/system.go|\
channels/api4/system_local.go|\ channels/api4/system_local.go|\

83
server/channels/api4/scheme_test.go
Просмотреть файл

@@ -20,7 +20,8 @@ func TestCreateScheme(t *testing.T) {
th.App.Srv().SetLicense(model.NewTestLicense("custom_permissions_schemes")) th.App.Srv().SetLicense(model.NewTestLicense("custom_permissions_schemes"))
th.App.SetPhase2PermissionsMigrationStatus(true) err := th.App.SetPhase2PermissionsMigrationStatus(true)
require.NoError(t, err)
// Basic test of creating a team scheme. // Basic test of creating a team scheme.
scheme1 := &model.Scheme{ scheme1 := &model.Scheme{
@@ -175,7 +176,8 @@ func TestCreateScheme(t *testing.T) {
require.NoError(t, err) require.NoError(t, err)
CheckCreatedStatus(t, resp) CheckCreatedStatus(t, resp)
th.App.SetPhase2PermissionsMigrationStatus(false) err = th.App.SetPhase2PermissionsMigrationStatus(false)
require.NoError(t, err)
th.LoginSystemAdmin() th.LoginSystemAdmin()
th.App.Srv().SetLicense(model.NewTestLicense("custom_permissions_schemes")) th.App.Srv().SetLicense(model.NewTestLicense("custom_permissions_schemes"))
@@ -204,7 +206,8 @@ func TestGetScheme(t *testing.T) {
Scope: model.SchemeScopeTeam, Scope: model.SchemeScopeTeam,
} }
th.App.SetPhase2PermissionsMigrationStatus(true) err := th.App.SetPhase2PermissionsMigrationStatus(true)
require.NoError(t, err)
s1, _, err := th.SystemAdminClient.CreateScheme(context.Background(), scheme1) s1, _, err := th.SystemAdminClient.CreateScheme(context.Background(), scheme1)
require.NoError(t, err) require.NoError(t, err)
@@ -234,11 +237,13 @@ func TestGetScheme(t *testing.T) {
_, r4, _ := th.SystemAdminClient.GetScheme(context.Background(), "12345") _, r4, _ := th.SystemAdminClient.GetScheme(context.Background(), "12345")
CheckBadRequestStatus(t, r4) CheckBadRequestStatus(t, r4)
th.SystemAdminClient.Logout(context.Background()) _, err = th.SystemAdminClient.Logout(context.Background())
require.NoError(t, err)
_, r5, _ := th.SystemAdminClient.GetScheme(context.Background(), s1.Id) _, r5, _ := th.SystemAdminClient.GetScheme(context.Background(), s1.Id)
CheckUnauthorizedStatus(t, r5) CheckUnauthorizedStatus(t, r5)
th.SystemAdminClient.Login(context.Background(), th.SystemAdminUser.Username, th.SystemAdminUser.Password) _, _, err = th.SystemAdminClient.Login(context.Background(), th.SystemAdminUser.Username, th.SystemAdminUser.Password)
require.NoError(t, err)
th.App.Srv().SetLicense(nil) th.App.Srv().SetLicense(nil)
_, _, err = th.SystemAdminClient.GetScheme(context.Background(), s1.Id) _, _, err = th.SystemAdminClient.GetScheme(context.Background(), s1.Id)
require.NoError(t, err) require.NoError(t, err)
@@ -247,7 +252,8 @@ func TestGetScheme(t *testing.T) {
require.Error(t, err) require.Error(t, err)
CheckForbiddenStatus(t, r7) CheckForbiddenStatus(t, r7)
th.App.SetPhase2PermissionsMigrationStatus(false) err = th.App.SetPhase2PermissionsMigrationStatus(false)
require.NoError(t, err)
_, r8, _ := th.SystemAdminClient.GetScheme(context.Background(), s1.Id) _, r8, _ := th.SystemAdminClient.GetScheme(context.Background(), s1.Id)
CheckNotImplementedStatus(t, r8) CheckNotImplementedStatus(t, r8)
@@ -273,9 +279,10 @@ func TestGetSchemes(t *testing.T) {
Scope: model.SchemeScopeChannel, Scope: model.SchemeScopeChannel,
} }
th.App.SetPhase2PermissionsMigrationStatus(true) err := th.App.SetPhase2PermissionsMigrationStatus(true)
require.NoError(t, err)
_, _, err := th.SystemAdminClient.CreateScheme(context.Background(), scheme1) _, _, err = th.SystemAdminClient.CreateScheme(context.Background(), scheme1)
require.NoError(t, err) require.NoError(t, err)
_, _, err = th.SystemAdminClient.CreateScheme(context.Background(), scheme2) _, _, err = th.SystemAdminClient.CreateScheme(context.Background(), scheme2)
require.NoError(t, err) require.NoError(t, err)
@@ -302,16 +309,19 @@ func TestGetSchemes(t *testing.T) {
_, r6, _ := th.SystemAdminClient.GetSchemes(context.Background(), "asdf", 0, 100) _, r6, _ := th.SystemAdminClient.GetSchemes(context.Background(), "asdf", 0, 100)
CheckBadRequestStatus(t, r6) CheckBadRequestStatus(t, r6)
th.Client.Logout(context.Background()) _, err = th.Client.Logout(context.Background())
require.NoError(t, err)
_, r7, _ := th.Client.GetSchemes(context.Background(), "", 0, 100) _, r7, _ := th.Client.GetSchemes(context.Background(), "", 0, 100)
CheckUnauthorizedStatus(t, r7) CheckUnauthorizedStatus(t, r7)
th.Client.Login(context.Background(), th.BasicUser.Username, th.BasicUser.Password) _, _, err = th.Client.Login(context.Background(), th.BasicUser.Username, th.BasicUser.Password)
require.NoError(t, err)
_, r8, err := th.Client.GetSchemes(context.Background(), "", 0, 100) _, r8, err := th.Client.GetSchemes(context.Background(), "", 0, 100)
require.Error(t, err) require.Error(t, err)
CheckForbiddenStatus(t, r8) CheckForbiddenStatus(t, r8)
th.App.SetPhase2PermissionsMigrationStatus(false) err = th.App.SetPhase2PermissionsMigrationStatus(false)
require.NoError(t, err)
_, r9, _ := th.SystemAdminClient.GetSchemes(context.Background(), "", 0, 100) _, r9, _ := th.SystemAdminClient.GetSchemes(context.Background(), "", 0, 100)
CheckNotImplementedStatus(t, r9) CheckNotImplementedStatus(t, r9)
@@ -323,7 +333,8 @@ func TestGetTeamsForScheme(t *testing.T) {
th.App.Srv().SetLicense(model.NewTestLicense("custom_permissions_schemes")) th.App.Srv().SetLicense(model.NewTestLicense("custom_permissions_schemes"))
th.App.SetPhase2PermissionsMigrationStatus(true) err := th.App.SetPhase2PermissionsMigrationStatus(true)
require.NoError(t, err)
scheme1 := &model.Scheme{ scheme1 := &model.Scheme{
DisplayName: model.NewId(), DisplayName: model.NewId(),
@@ -331,7 +342,7 @@ func TestGetTeamsForScheme(t *testing.T) {
Description: model.NewId(), Description: model.NewId(),
Scope: model.SchemeScopeTeam, Scope: model.SchemeScopeTeam,
} }
scheme1, _, err := th.SystemAdminClient.CreateScheme(context.Background(), scheme1) scheme1, _, err = th.SystemAdminClient.CreateScheme(context.Background(), scheme1)
require.NoError(t, err) require.NoError(t, err)
team1 := &model.Team{ team1 := &model.Team{
@@ -383,11 +394,13 @@ func TestGetTeamsForScheme(t *testing.T) {
_, ri2, _ := th.SystemAdminClient.GetTeamsForScheme(context.Background(), "", 0, 100) _, ri2, _ := th.SystemAdminClient.GetTeamsForScheme(context.Background(), "", 0, 100)
CheckBadRequestStatus(t, ri2) CheckBadRequestStatus(t, ri2)
th.Client.Logout(context.Background()) _, err = th.Client.Logout(context.Background())
require.NoError(t, err)
_, ri3, _ := th.Client.GetTeamsForScheme(context.Background(), model.NewId(), 0, 100) _, ri3, _ := th.Client.GetTeamsForScheme(context.Background(), model.NewId(), 0, 100)
CheckUnauthorizedStatus(t, ri3) CheckUnauthorizedStatus(t, ri3)
th.Client.Login(context.Background(), th.BasicUser.Username, th.BasicUser.Password) _, _, err = th.Client.Login(context.Background(), th.BasicUser.Username, th.BasicUser.Password)
require.NoError(t, err)
_, ri4, err := th.Client.GetTeamsForScheme(context.Background(), model.NewId(), 0, 100) _, ri4, err := th.Client.GetTeamsForScheme(context.Background(), model.NewId(), 0, 100)
require.Error(t, err) require.Error(t, err)
CheckForbiddenStatus(t, ri4) CheckForbiddenStatus(t, ri4)
@@ -404,7 +417,8 @@ func TestGetTeamsForScheme(t *testing.T) {
_, ri5, _ := th.SystemAdminClient.GetTeamsForScheme(context.Background(), scheme2.Id, 0, 100) _, ri5, _ := th.SystemAdminClient.GetTeamsForScheme(context.Background(), scheme2.Id, 0, 100)
CheckBadRequestStatus(t, ri5) CheckBadRequestStatus(t, ri5)
th.App.SetPhase2PermissionsMigrationStatus(false) err = th.App.SetPhase2PermissionsMigrationStatus(false)
require.NoError(t, err)
_, ri6, _ := th.SystemAdminClient.GetTeamsForScheme(context.Background(), scheme1.Id, 0, 100) _, ri6, _ := th.SystemAdminClient.GetTeamsForScheme(context.Background(), scheme1.Id, 0, 100)
CheckNotImplementedStatus(t, ri6) CheckNotImplementedStatus(t, ri6)
@@ -416,7 +430,8 @@ func TestGetChannelsForScheme(t *testing.T) {
th.App.Srv().SetLicense(model.NewTestLicense("custom_permissions_schemes")) th.App.Srv().SetLicense(model.NewTestLicense("custom_permissions_schemes"))
th.App.SetPhase2PermissionsMigrationStatus(true) err := th.App.SetPhase2PermissionsMigrationStatus(true)
require.NoError(t, err)
scheme1 := &model.Scheme{ scheme1 := &model.Scheme{
DisplayName: model.NewId(), DisplayName: model.NewId(),
@@ -424,7 +439,7 @@ func TestGetChannelsForScheme(t *testing.T) {
Description: model.NewId(), Description: model.NewId(),
Scope: model.SchemeScopeChannel, Scope: model.SchemeScopeChannel,
} }
scheme1, _, err := th.SystemAdminClient.CreateScheme(context.Background(), scheme1) scheme1, _, err = th.SystemAdminClient.CreateScheme(context.Background(), scheme1)
require.NoError(t, err) require.NoError(t, err)
channel1 := &model.Channel{ channel1 := &model.Channel{
@@ -478,11 +493,13 @@ func TestGetChannelsForScheme(t *testing.T) {
_, ri2, _ := th.SystemAdminClient.GetChannelsForScheme(context.Background(), "", 0, 100) _, ri2, _ := th.SystemAdminClient.GetChannelsForScheme(context.Background(), "", 0, 100)
CheckBadRequestStatus(t, ri2) CheckBadRequestStatus(t, ri2)
th.Client.Logout(context.Background()) _, err = th.Client.Logout(context.Background())
require.NoError(t, err)
_, ri3, _ := th.Client.GetChannelsForScheme(context.Background(), model.NewId(), 0, 100) _, ri3, _ := th.Client.GetChannelsForScheme(context.Background(), model.NewId(), 0, 100)
CheckUnauthorizedStatus(t, ri3) CheckUnauthorizedStatus(t, ri3)
th.Client.Login(context.Background(), th.BasicUser.Username, th.BasicUser.Password) _, _, err = th.Client.Login(context.Background(), th.BasicUser.Username, th.BasicUser.Password)
require.NoError(t, err)
_, ri4, err := th.Client.GetChannelsForScheme(context.Background(), model.NewId(), 0, 100) _, ri4, err := th.Client.GetChannelsForScheme(context.Background(), model.NewId(), 0, 100)
require.Error(t, err) require.Error(t, err)
CheckForbiddenStatus(t, ri4) CheckForbiddenStatus(t, ri4)
@@ -499,7 +516,8 @@ func TestGetChannelsForScheme(t *testing.T) {
_, ri5, _ := th.SystemAdminClient.GetChannelsForScheme(context.Background(), scheme2.Id, 0, 100) _, ri5, _ := th.SystemAdminClient.GetChannelsForScheme(context.Background(), scheme2.Id, 0, 100)
CheckBadRequestStatus(t, ri5) CheckBadRequestStatus(t, ri5)
th.App.SetPhase2PermissionsMigrationStatus(false) err = th.App.SetPhase2PermissionsMigrationStatus(false)
require.NoError(t, err)
_, ri6, _ := th.SystemAdminClient.GetChannelsForScheme(context.Background(), scheme1.Id, 0, 100) _, ri6, _ := th.SystemAdminClient.GetChannelsForScheme(context.Background(), scheme1.Id, 0, 100)
CheckNotImplementedStatus(t, ri6) CheckNotImplementedStatus(t, ri6)
@@ -511,7 +529,8 @@ func TestPatchScheme(t *testing.T) {
th.App.Srv().SetLicense(model.NewTestLicense("custom_permissions_schemes")) th.App.Srv().SetLicense(model.NewTestLicense("custom_permissions_schemes"))
th.App.SetPhase2PermissionsMigrationStatus(true) err := th.App.SetPhase2PermissionsMigrationStatus(true)
require.NoError(t, err)
// Basic test of creating a team scheme. // Basic test of creating a team scheme.
scheme1 := &model.Scheme{ scheme1 := &model.Scheme{
@@ -622,7 +641,8 @@ func TestPatchScheme(t *testing.T) {
_, _, err = th.SystemAdminClient.PatchScheme(context.Background(), s6.Id, schemePatch) _, _, err = th.SystemAdminClient.PatchScheme(context.Background(), s6.Id, schemePatch)
require.NoError(t, err) require.NoError(t, err)
th.App.SetPhase2PermissionsMigrationStatus(false) err = th.App.SetPhase2PermissionsMigrationStatus(false)
require.NoError(t, err)
th.LoginSystemAdmin() th.LoginSystemAdmin()
th.App.Srv().SetLicense(model.NewTestLicense("custom_permissions_schemes")) th.App.Srv().SetLicense(model.NewTestLicense("custom_permissions_schemes"))
@@ -638,7 +658,8 @@ func TestDeleteScheme(t *testing.T) {
t.Run("ValidTeamScheme", func(t *testing.T) { t.Run("ValidTeamScheme", func(t *testing.T) {
th.App.Srv().SetLicense(model.NewTestLicense("custom_permissions_schemes")) th.App.Srv().SetLicense(model.NewTestLicense("custom_permissions_schemes"))
th.App.SetPhase2PermissionsMigrationStatus(true) err := th.App.SetPhase2PermissionsMigrationStatus(true)
require.NoError(t, err)
// Create a team scheme. // Create a team scheme.
scheme1 := &model.Scheme{ scheme1 := &model.Scheme{
@@ -716,7 +737,8 @@ func TestDeleteScheme(t *testing.T) {
t.Run("ValidChannelScheme", func(t *testing.T) { t.Run("ValidChannelScheme", func(t *testing.T) {
th.App.Srv().SetLicense(model.NewTestLicense("custom_permissions_schemes")) th.App.Srv().SetLicense(model.NewTestLicense("custom_permissions_schemes"))
th.App.SetPhase2PermissionsMigrationStatus(true) err := th.App.SetPhase2PermissionsMigrationStatus(true)
require.NoError(t, err)
// Create a channel scheme. // Create a channel scheme.
scheme1 := &model.Scheme{ scheme1 := &model.Scheme{
@@ -776,7 +798,8 @@ func TestDeleteScheme(t *testing.T) {
t.Run("FailureCases", func(t *testing.T) { t.Run("FailureCases", func(t *testing.T) {
th.App.Srv().SetLicense(model.NewTestLicense("custom_permissions_schemes")) th.App.Srv().SetLicense(model.NewTestLicense("custom_permissions_schemes"))
th.App.SetPhase2PermissionsMigrationStatus(true) err := th.App.SetPhase2PermissionsMigrationStatus(true)
require.NoError(t, err)
scheme1 := &model.Scheme{ scheme1 := &model.Scheme{
DisplayName: model.NewId(), DisplayName: model.NewId(),
@@ -836,7 +859,8 @@ func TestDeleteScheme(t *testing.T) {
_, err = th.SystemAdminClient.DeleteScheme(context.Background(), s2.Id) _, err = th.SystemAdminClient.DeleteScheme(context.Background(), s2.Id)
require.NoError(t, err) require.NoError(t, err)
th.App.SetPhase2PermissionsMigrationStatus(false) err = th.App.SetPhase2PermissionsMigrationStatus(false)
require.NoError(t, err)
th.App.Srv().SetLicense(model.NewTestLicense("custom_permissions_schemes")) th.App.Srv().SetLicense(model.NewTestLicense("custom_permissions_schemes"))
@@ -851,7 +875,8 @@ func TestUpdateTeamSchemeWithTeamMembers(t *testing.T) {
defer th.TearDown() defer th.TearDown()
t.Run("Correctly invalidates team member cache", func(t *testing.T) { t.Run("Correctly invalidates team member cache", func(t *testing.T) {
th.App.SetPhase2PermissionsMigrationStatus(true) err := th.App.SetPhase2PermissionsMigrationStatus(true)
require.NoError(t, err)
team := th.CreateTeam() team := th.CreateTeam()
_, _, appErr := th.App.AddUserToTeam(th.Context, team.Id, th.BasicUser.Id, th.SystemAdminUser.Id) _, _, appErr := th.App.AddUserToTeam(th.Context, team.Id, th.BasicUser.Id, th.SystemAdminUser.Id)
@@ -867,7 +892,7 @@ func TestUpdateTeamSchemeWithTeamMembers(t *testing.T) {
th.LoginBasic() th.LoginBasic()
_, _, err := th.Client.CreateChannel(context.Background(), &model.Channel{DisplayName: "Test API Name", Name: GenerateTestChannelName(), Type: model.ChannelTypeOpen, TeamId: team.Id}) _, _, err = th.Client.CreateChannel(context.Background(), &model.Channel{DisplayName: "Test API Name", Name: GenerateTestChannelName(), Type: model.ChannelTypeOpen, TeamId: team.Id})
require.NoError(t, err) require.NoError(t, err)
team.SchemeId = &teamScheme.Id team.SchemeId = &teamScheme.Id