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

RoleStore migration (#15017)

Просмотр исходного кода 
Automatic Merge
Этот коммит содержится в:
Rodrigo Villablanca
2020-08-04 10:37:21 -04:00
коммит произвёл GitHub
родитель 7a4d31c583
Коммит 86290685ae
13 изменённых файлов: 289 добавлений и 274 удалений
Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

20
store/opentracinglayer/opentracinglayer.go
Просмотреть файл

@@ -5617,7 +5617,7 @@ func (s *OpenTracingLayerReactionStore) Save(reaction *model.Reaction) (*model.R
return resultVar0, resultVar1
}
func (s *OpenTracingLayerRoleStore) AllChannelSchemeRoles() ([]*model.Role, *model.AppError) {
func (s *OpenTracingLayerRoleStore) AllChannelSchemeRoles() ([]*model.Role, error) {
origCtx := s.Root.Store.Context()
span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "RoleStore.AllChannelSchemeRoles")
s.Root.Store.SetContext(newCtx)
@@ -5635,7 +5635,7 @@ func (s *OpenTracingLayerRoleStore) AllChannelSchemeRoles() ([]*model.Role, *mod
return resultVar0, resultVar1
}
func (s *OpenTracingLayerRoleStore) ChannelHigherScopedPermissions(roleNames []string) (map[string]*model.RolePermissions, *model.AppError) {
func (s *OpenTracingLayerRoleStore) ChannelHigherScopedPermissions(roleNames []string) (map[string]*model.RolePermissions, error) {
origCtx := s.Root.Store.Context()
span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "RoleStore.ChannelHigherScopedPermissions")
s.Root.Store.SetContext(newCtx)
@@ -5653,7 +5653,7 @@ func (s *OpenTracingLayerRoleStore) ChannelHigherScopedPermissions(roleNames []s
return resultVar0, resultVar1
}
func (s *OpenTracingLayerRoleStore) ChannelRolesUnderTeamRole(roleName string) ([]*model.Role, *model.AppError) {
func (s *OpenTracingLayerRoleStore) ChannelRolesUnderTeamRole(roleName string) ([]*model.Role, error) {
origCtx := s.Root.Store.Context()
span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "RoleStore.ChannelRolesUnderTeamRole")
s.Root.Store.SetContext(newCtx)
@@ -5671,7 +5671,7 @@ func (s *OpenTracingLayerRoleStore) ChannelRolesUnderTeamRole(roleName string) (
return resultVar0, resultVar1
}
func (s *OpenTracingLayerRoleStore) Delete(roleId string) (*model.Role, *model.AppError) {
func (s *OpenTracingLayerRoleStore) Delete(roleId string) (*model.Role, error) {
origCtx := s.Root.Store.Context()
span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "RoleStore.Delete")
s.Root.Store.SetContext(newCtx)
@@ -5689,7 +5689,7 @@ func (s *OpenTracingLayerRoleStore) Delete(roleId string) (*model.Role, *model.A
return resultVar0, resultVar1
}
func (s *OpenTracingLayerRoleStore) Get(roleId string) (*model.Role, *model.AppError) {
func (s *OpenTracingLayerRoleStore) Get(roleId string) (*model.Role, error) {
origCtx := s.Root.Store.Context()
span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "RoleStore.Get")
s.Root.Store.SetContext(newCtx)
@@ -5707,7 +5707,7 @@ func (s *OpenTracingLayerRoleStore) Get(roleId string) (*model.Role, *model.AppE
return resultVar0, resultVar1
}
func (s *OpenTracingLayerRoleStore) GetAll() ([]*model.Role, *model.AppError) {
func (s *OpenTracingLayerRoleStore) GetAll() ([]*model.Role, error) {
origCtx := s.Root.Store.Context()
span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "RoleStore.GetAll")
s.Root.Store.SetContext(newCtx)
@@ -5725,7 +5725,7 @@ func (s *OpenTracingLayerRoleStore) GetAll() ([]*model.Role, *model.AppError) {
return resultVar0, resultVar1
}
func (s *OpenTracingLayerRoleStore) GetByName(name string) (*model.Role, *model.AppError) {
func (s *OpenTracingLayerRoleStore) GetByName(name string) (*model.Role, error) {
origCtx := s.Root.Store.Context()
span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "RoleStore.GetByName")
s.Root.Store.SetContext(newCtx)
@@ -5743,7 +5743,7 @@ func (s *OpenTracingLayerRoleStore) GetByName(name string) (*model.Role, *model.
return resultVar0, resultVar1
}
func (s *OpenTracingLayerRoleStore) GetByNames(names []string) ([]*model.Role, *model.AppError) {
func (s *OpenTracingLayerRoleStore) GetByNames(names []string) ([]*model.Role, error) {
origCtx := s.Root.Store.Context()
span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "RoleStore.GetByNames")
s.Root.Store.SetContext(newCtx)
@@ -5761,7 +5761,7 @@ func (s *OpenTracingLayerRoleStore) GetByNames(names []string) ([]*model.Role, *
return resultVar0, resultVar1
}
func (s *OpenTracingLayerRoleStore) PermanentDeleteAll() *model.AppError {
func (s *OpenTracingLayerRoleStore) PermanentDeleteAll() error {
origCtx := s.Root.Store.Context()
span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "RoleStore.PermanentDeleteAll")
s.Root.Store.SetContext(newCtx)
@@ -5779,7 +5779,7 @@ func (s *OpenTracingLayerRoleStore) PermanentDeleteAll() *model.AppError {
return resultVar0
}
func (s *OpenTracingLayerRoleStore) Save(role *model.Role) (*model.Role, *model.AppError) {
func (s *OpenTracingLayerRoleStore) Save(role *model.Role) (*model.Role, error) {
origCtx := s.Root.Store.Context()
span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "RoleStore.Save")
s.Root.Store.SetContext(newCtx)