[MM-32281] SqlRoleStore/GetByName: add context to allow read from master (#17176)
* role_store/GetByName: add context * propagate context in the app layer * propagate context in the app layer * add missing import Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
Этот коммит содержится в:
Ibrahim Serdar Acikgoz
коммит произвёл
GitHub
GitHub
родитель
9eceeaa8db
Коммит
28ff4dc8d0
@@ -99,42 +99,42 @@ func TestImportImportScheme(t *testing.T) {
|
||||
assert.Equal(t, *data.Description, scheme.Description)
|
||||
assert.Equal(t, *data.Scope, scheme.Scope)
|
||||
|
||||
role, nErr := th.App.Srv().Store.Role().GetByName(scheme.DefaultTeamAdminRole)
|
||||
role, nErr := th.App.Srv().Store.Role().GetByName(context.Background(), scheme.DefaultTeamAdminRole)
|
||||
require.NoError(t, nErr, "Should have found the imported role.")
|
||||
|
||||
assert.Equal(t, *data.DefaultTeamAdminRole.DisplayName, role.DisplayName)
|
||||
assert.False(t, role.BuiltIn)
|
||||
assert.True(t, role.SchemeManaged)
|
||||
|
||||
role, nErr = th.App.Srv().Store.Role().GetByName(scheme.DefaultTeamUserRole)
|
||||
role, nErr = th.App.Srv().Store.Role().GetByName(context.Background(), scheme.DefaultTeamUserRole)
|
||||
require.NoError(t, nErr, "Should have found the imported role.")
|
||||
|
||||
assert.Equal(t, *data.DefaultTeamUserRole.DisplayName, role.DisplayName)
|
||||
assert.False(t, role.BuiltIn)
|
||||
assert.True(t, role.SchemeManaged)
|
||||
|
||||
role, nErr = th.App.Srv().Store.Role().GetByName(scheme.DefaultTeamGuestRole)
|
||||
role, nErr = th.App.Srv().Store.Role().GetByName(context.Background(), scheme.DefaultTeamGuestRole)
|
||||
require.NoError(t, nErr, "Should have found the imported role.")
|
||||
|
||||
assert.Equal(t, *data.DefaultTeamGuestRole.DisplayName, role.DisplayName)
|
||||
assert.False(t, role.BuiltIn)
|
||||
assert.True(t, role.SchemeManaged)
|
||||
|
||||
role, nErr = th.App.Srv().Store.Role().GetByName(scheme.DefaultChannelAdminRole)
|
||||
role, nErr = th.App.Srv().Store.Role().GetByName(context.Background(), scheme.DefaultChannelAdminRole)
|
||||
require.NoError(t, nErr, "Should have found the imported role.")
|
||||
|
||||
assert.Equal(t, *data.DefaultChannelAdminRole.DisplayName, role.DisplayName)
|
||||
assert.False(t, role.BuiltIn)
|
||||
assert.True(t, role.SchemeManaged)
|
||||
|
||||
role, nErr = th.App.Srv().Store.Role().GetByName(scheme.DefaultChannelUserRole)
|
||||
role, nErr = th.App.Srv().Store.Role().GetByName(context.Background(), scheme.DefaultChannelUserRole)
|
||||
require.NoError(t, nErr, "Should have found the imported role.")
|
||||
|
||||
assert.Equal(t, *data.DefaultChannelUserRole.DisplayName, role.DisplayName)
|
||||
assert.False(t, role.BuiltIn)
|
||||
assert.True(t, role.SchemeManaged)
|
||||
|
||||
role, nErr = th.App.Srv().Store.Role().GetByName(scheme.DefaultChannelGuestRole)
|
||||
role, nErr = th.App.Srv().Store.Role().GetByName(context.Background(), scheme.DefaultChannelGuestRole)
|
||||
require.NoError(t, nErr, "Should have found the imported role.")
|
||||
|
||||
assert.Equal(t, *data.DefaultChannelGuestRole.DisplayName, role.DisplayName)
|
||||
@@ -156,42 +156,42 @@ func TestImportImportScheme(t *testing.T) {
|
||||
assert.Equal(t, *data.Description, scheme.Description)
|
||||
assert.Equal(t, *data.Scope, scheme.Scope)
|
||||
|
||||
role, nErr = th.App.Srv().Store.Role().GetByName(scheme.DefaultTeamAdminRole)
|
||||
role, nErr = th.App.Srv().Store.Role().GetByName(context.Background(), scheme.DefaultTeamAdminRole)
|
||||
require.NoError(t, nErr, "Should have found the imported role.")
|
||||
|
||||
assert.Equal(t, *data.DefaultTeamAdminRole.DisplayName, role.DisplayName)
|
||||
assert.False(t, role.BuiltIn)
|
||||
assert.True(t, role.SchemeManaged)
|
||||
|
||||
role, nErr = th.App.Srv().Store.Role().GetByName(scheme.DefaultTeamUserRole)
|
||||
role, nErr = th.App.Srv().Store.Role().GetByName(context.Background(), scheme.DefaultTeamUserRole)
|
||||
require.NoError(t, nErr, "Should have found the imported role.")
|
||||
|
||||
assert.Equal(t, *data.DefaultTeamUserRole.DisplayName, role.DisplayName)
|
||||
assert.False(t, role.BuiltIn)
|
||||
assert.True(t, role.SchemeManaged)
|
||||
|
||||
role, nErr = th.App.Srv().Store.Role().GetByName(scheme.DefaultTeamGuestRole)
|
||||
role, nErr = th.App.Srv().Store.Role().GetByName(context.Background(), scheme.DefaultTeamGuestRole)
|
||||
require.NoError(t, nErr, "Should have found the imported role.")
|
||||
|
||||
assert.Equal(t, *data.DefaultTeamGuestRole.DisplayName, role.DisplayName)
|
||||
assert.False(t, role.BuiltIn)
|
||||
assert.True(t, role.SchemeManaged)
|
||||
|
||||
role, nErr = th.App.Srv().Store.Role().GetByName(scheme.DefaultChannelAdminRole)
|
||||
role, nErr = th.App.Srv().Store.Role().GetByName(context.Background(), scheme.DefaultChannelAdminRole)
|
||||
require.NoError(t, nErr, "Should have found the imported role.")
|
||||
|
||||
assert.Equal(t, *data.DefaultChannelAdminRole.DisplayName, role.DisplayName)
|
||||
assert.False(t, role.BuiltIn)
|
||||
assert.True(t, role.SchemeManaged)
|
||||
|
||||
role, nErr = th.App.Srv().Store.Role().GetByName(scheme.DefaultChannelUserRole)
|
||||
role, nErr = th.App.Srv().Store.Role().GetByName(context.Background(), scheme.DefaultChannelUserRole)
|
||||
require.NoError(t, nErr, "Should have found the imported role.")
|
||||
|
||||
assert.Equal(t, *data.DefaultChannelUserRole.DisplayName, role.DisplayName)
|
||||
assert.False(t, role.BuiltIn)
|
||||
assert.True(t, role.SchemeManaged)
|
||||
|
||||
role, nErr = th.App.Srv().Store.Role().GetByName(scheme.DefaultChannelGuestRole)
|
||||
role, nErr = th.App.Srv().Store.Role().GetByName(context.Background(), scheme.DefaultChannelGuestRole)
|
||||
require.NoError(t, nErr, "Should have found the imported role.")
|
||||
|
||||
assert.Equal(t, *data.DefaultChannelGuestRole.DisplayName, role.DisplayName)
|
||||
@@ -286,42 +286,42 @@ func TestImportImportSchemeWithoutGuestRoles(t *testing.T) {
|
||||
assert.Equal(t, *data.Description, scheme.Description)
|
||||
assert.Equal(t, *data.Scope, scheme.Scope)
|
||||
|
||||
role, nErr := th.App.Srv().Store.Role().GetByName(scheme.DefaultTeamAdminRole)
|
||||
role, nErr := th.App.Srv().Store.Role().GetByName(context.Background(), scheme.DefaultTeamAdminRole)
|
||||
require.NoError(t, nErr, "Should have found the imported role.")
|
||||
|
||||
assert.Equal(t, *data.DefaultTeamAdminRole.DisplayName, role.DisplayName)
|
||||
assert.False(t, role.BuiltIn)
|
||||
assert.True(t, role.SchemeManaged)
|
||||
|
||||
role, nErr = th.App.Srv().Store.Role().GetByName(scheme.DefaultTeamUserRole)
|
||||
role, nErr = th.App.Srv().Store.Role().GetByName(context.Background(), scheme.DefaultTeamUserRole)
|
||||
require.NoError(t, nErr, "Should have found the imported role.")
|
||||
|
||||
assert.Equal(t, *data.DefaultTeamUserRole.DisplayName, role.DisplayName)
|
||||
assert.False(t, role.BuiltIn)
|
||||
assert.True(t, role.SchemeManaged)
|
||||
|
||||
role, nErr = th.App.Srv().Store.Role().GetByName(scheme.DefaultTeamGuestRole)
|
||||
role, nErr = th.App.Srv().Store.Role().GetByName(context.Background(), scheme.DefaultTeamGuestRole)
|
||||
require.NoError(t, nErr, "Should have found the imported role.")
|
||||
|
||||
assert.Equal(t, *data.DefaultTeamGuestRole.DisplayName, role.DisplayName)
|
||||
assert.False(t, role.BuiltIn)
|
||||
assert.True(t, role.SchemeManaged)
|
||||
|
||||
role, nErr = th.App.Srv().Store.Role().GetByName(scheme.DefaultChannelAdminRole)
|
||||
role, nErr = th.App.Srv().Store.Role().GetByName(context.Background(), scheme.DefaultChannelAdminRole)
|
||||
require.NoError(t, nErr, "Should have found the imported role.")
|
||||
|
||||
assert.Equal(t, *data.DefaultChannelAdminRole.DisplayName, role.DisplayName)
|
||||
assert.False(t, role.BuiltIn)
|
||||
assert.True(t, role.SchemeManaged)
|
||||
|
||||
role, nErr = th.App.Srv().Store.Role().GetByName(scheme.DefaultChannelUserRole)
|
||||
role, nErr = th.App.Srv().Store.Role().GetByName(context.Background(), scheme.DefaultChannelUserRole)
|
||||
require.NoError(t, nErr, "Should have found the imported role.")
|
||||
|
||||
assert.Equal(t, *data.DefaultChannelUserRole.DisplayName, role.DisplayName)
|
||||
assert.False(t, role.BuiltIn)
|
||||
assert.True(t, role.SchemeManaged)
|
||||
|
||||
role, nErr = th.App.Srv().Store.Role().GetByName(scheme.DefaultChannelGuestRole)
|
||||
role, nErr = th.App.Srv().Store.Role().GetByName(context.Background(), scheme.DefaultChannelGuestRole)
|
||||
require.NoError(t, nErr, "Should have found the imported role.")
|
||||
|
||||
assert.Equal(t, *data.DefaultChannelGuestRole.DisplayName, role.DisplayName)
|
||||
@@ -343,42 +343,42 @@ func TestImportImportSchemeWithoutGuestRoles(t *testing.T) {
|
||||
assert.Equal(t, *data.Description, scheme.Description)
|
||||
assert.Equal(t, *data.Scope, scheme.Scope)
|
||||
|
||||
role, nErr = th.App.Srv().Store.Role().GetByName(scheme.DefaultTeamAdminRole)
|
||||
role, nErr = th.App.Srv().Store.Role().GetByName(context.Background(), scheme.DefaultTeamAdminRole)
|
||||
require.NoError(t, nErr, "Should have found the imported role.")
|
||||
|
||||
assert.Equal(t, *data.DefaultTeamAdminRole.DisplayName, role.DisplayName)
|
||||
assert.False(t, role.BuiltIn)
|
||||
assert.True(t, role.SchemeManaged)
|
||||
|
||||
role, nErr = th.App.Srv().Store.Role().GetByName(scheme.DefaultTeamUserRole)
|
||||
role, nErr = th.App.Srv().Store.Role().GetByName(context.Background(), scheme.DefaultTeamUserRole)
|
||||
require.NoError(t, nErr, "Should have found the imported role.")
|
||||
|
||||
assert.Equal(t, *data.DefaultTeamUserRole.DisplayName, role.DisplayName)
|
||||
assert.False(t, role.BuiltIn)
|
||||
assert.True(t, role.SchemeManaged)
|
||||
|
||||
role, nErr = th.App.Srv().Store.Role().GetByName(scheme.DefaultTeamGuestRole)
|
||||
role, nErr = th.App.Srv().Store.Role().GetByName(context.Background(), scheme.DefaultTeamGuestRole)
|
||||
require.NoError(t, nErr, "Should have found the imported role.")
|
||||
|
||||
assert.Equal(t, *data.DefaultTeamGuestRole.DisplayName, role.DisplayName)
|
||||
assert.False(t, role.BuiltIn)
|
||||
assert.True(t, role.SchemeManaged)
|
||||
|
||||
role, nErr = th.App.Srv().Store.Role().GetByName(scheme.DefaultChannelAdminRole)
|
||||
role, nErr = th.App.Srv().Store.Role().GetByName(context.Background(), scheme.DefaultChannelAdminRole)
|
||||
require.NoError(t, nErr, "Should have found the imported role.")
|
||||
|
||||
assert.Equal(t, *data.DefaultChannelAdminRole.DisplayName, role.DisplayName)
|
||||
assert.False(t, role.BuiltIn)
|
||||
assert.True(t, role.SchemeManaged)
|
||||
|
||||
role, nErr = th.App.Srv().Store.Role().GetByName(scheme.DefaultChannelUserRole)
|
||||
role, nErr = th.App.Srv().Store.Role().GetByName(context.Background(), scheme.DefaultChannelUserRole)
|
||||
require.NoError(t, nErr, "Should have found the imported role.")
|
||||
|
||||
assert.Equal(t, *data.DefaultChannelUserRole.DisplayName, role.DisplayName)
|
||||
assert.False(t, role.BuiltIn)
|
||||
assert.True(t, role.SchemeManaged)
|
||||
|
||||
role, nErr = th.App.Srv().Store.Role().GetByName(scheme.DefaultChannelGuestRole)
|
||||
role, nErr = th.App.Srv().Store.Role().GetByName(context.Background(), scheme.DefaultChannelGuestRole)
|
||||
require.NoError(t, nErr, "Should have found the imported role.")
|
||||
|
||||
assert.Equal(t, *data.DefaultChannelGuestRole.DisplayName, role.DisplayName)
|
||||
@@ -413,7 +413,7 @@ func TestImportImportRole(t *testing.T) {
|
||||
err := th.App.importRole(&data, true, false)
|
||||
require.NotNil(t, err, "Should have failed to import.")
|
||||
|
||||
_, nErr := th.App.Srv().Store.Role().GetByName(rid1)
|
||||
_, nErr := th.App.Srv().Store.Role().GetByName(context.Background(), rid1)
|
||||
require.Error(t, nErr, "Should have failed to import.")
|
||||
|
||||
// Try importing the valid role in dryRun mode.
|
||||
@@ -422,7 +422,7 @@ func TestImportImportRole(t *testing.T) {
|
||||
err = th.App.importRole(&data, true, false)
|
||||
require.Nil(t, err, "Should have succeeded.")
|
||||
|
||||
_, nErr = th.App.Srv().Store.Role().GetByName(rid1)
|
||||
_, nErr = th.App.Srv().Store.Role().GetByName(context.Background(), rid1)
|
||||
require.Error(t, nErr, "Role should not have imported as we are in dry run mode.")
|
||||
|
||||
// Try importing an invalid role.
|
||||
@@ -431,7 +431,7 @@ func TestImportImportRole(t *testing.T) {
|
||||
err = th.App.importRole(&data, false, false)
|
||||
require.NotNil(t, err, "Should have failed to import.")
|
||||
|
||||
_, nErr = th.App.Srv().Store.Role().GetByName(rid1)
|
||||
_, nErr = th.App.Srv().Store.Role().GetByName(context.Background(), rid1)
|
||||
require.Error(t, nErr, "Role should not have imported.")
|
||||
|
||||
// Try importing a valid role with all params set.
|
||||
@@ -442,7 +442,7 @@ func TestImportImportRole(t *testing.T) {
|
||||
err = th.App.importRole(&data, false, false)
|
||||
require.Nil(t, err, "Should have succeeded.")
|
||||
|
||||
role, nErr := th.App.Srv().Store.Role().GetByName(rid1)
|
||||
role, nErr := th.App.Srv().Store.Role().GetByName(context.Background(), rid1)
|
||||
require.NoError(t, nErr, "Should have found the imported role.")
|
||||
|
||||
assert.Equal(t, *data.Name, role.Name)
|
||||
@@ -460,7 +460,7 @@ func TestImportImportRole(t *testing.T) {
|
||||
err = th.App.importRole(&data, false, true)
|
||||
require.Nil(t, err, "Should have succeeded. %v", err)
|
||||
|
||||
role, nErr = th.App.Srv().Store.Role().GetByName(rid1)
|
||||
role, nErr = th.App.Srv().Store.Role().GetByName(context.Background(), rid1)
|
||||
require.NoError(t, nErr, "Should have found the imported role.")
|
||||
|
||||
assert.Equal(t, *data.Name, role.Name)
|
||||
@@ -479,7 +479,7 @@ func TestImportImportRole(t *testing.T) {
|
||||
err = th.App.importRole(&data2, false, false)
|
||||
require.Nil(t, err, "Should have succeeded.")
|
||||
|
||||
role, nErr = th.App.Srv().Store.Role().GetByName(rid1)
|
||||
role, nErr = th.App.Srv().Store.Role().GetByName(context.Background(), rid1)
|
||||
require.NoError(t, nErr, "Should have found the imported role.")
|
||||
|
||||
assert.Equal(t, *data2.Name, role.Name)
|
||||
|
||||
Ссылка в новой задаче
Block a user