diff --git a/i18n/en.json b/i18n/en.json index 2933b8f196..57af719740 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -6482,30 +6482,6 @@ "id": "store.sql_channel.user_belongs_to_channels.app_error", "translation": "Unable to determine if the user belongs to a list of channels." }, - { - "id": "store.sql_cluster_discovery.cleanup.app_error", - "translation": "Failed to save ClusterDiscovery row." - }, - { - "id": "store.sql_cluster_discovery.delete.app_error", - "translation": "Failed to delete." - }, - { - "id": "store.sql_cluster_discovery.exists.app_error", - "translation": "Failed to check if it exists." - }, - { - "id": "store.sql_cluster_discovery.get_all.app_error", - "translation": "Failed to get all discovery rows." - }, - { - "id": "store.sql_cluster_discovery.save.app_error", - "translation": "Failed to save ClusterDiscovery row." - }, - { - "id": "store.sql_cluster_discovery.set_last_ping.app_error", - "translation": "Failed to update last ping at." - }, { "id": "store.sql_command.analytics_command_count.app_error", "translation": "Unable to count the commands." diff --git a/store/opentracing_layer.go b/store/opentracing_layer.go index 3af321c77e..a39287fbd9 100644 --- a/store/opentracing_layer.go +++ b/store/opentracing_layer.go @@ -2313,7 +2313,7 @@ func (s *OpenTracingLayerChannelMemberHistoryStore) PermanentDeleteBatch(endTime return resultVar0, resultVar1 } -func (s *OpenTracingLayerClusterDiscoveryStore) Cleanup() *model.AppError { +func (s *OpenTracingLayerClusterDiscoveryStore) Cleanup() error { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "ClusterDiscoveryStore.Cleanup") s.Root.Store.SetContext(newCtx) @@ -2331,7 +2331,7 @@ func (s *OpenTracingLayerClusterDiscoveryStore) Cleanup() *model.AppError { return resultVar0 } -func (s *OpenTracingLayerClusterDiscoveryStore) Delete(discovery *model.ClusterDiscovery) (bool, *model.AppError) { +func (s *OpenTracingLayerClusterDiscoveryStore) Delete(discovery *model.ClusterDiscovery) (bool, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "ClusterDiscoveryStore.Delete") s.Root.Store.SetContext(newCtx) @@ -2349,7 +2349,7 @@ func (s *OpenTracingLayerClusterDiscoveryStore) Delete(discovery *model.ClusterD return resultVar0, resultVar1 } -func (s *OpenTracingLayerClusterDiscoveryStore) Exists(discovery *model.ClusterDiscovery) (bool, *model.AppError) { +func (s *OpenTracingLayerClusterDiscoveryStore) Exists(discovery *model.ClusterDiscovery) (bool, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "ClusterDiscoveryStore.Exists") s.Root.Store.SetContext(newCtx) @@ -2367,7 +2367,7 @@ func (s *OpenTracingLayerClusterDiscoveryStore) Exists(discovery *model.ClusterD return resultVar0, resultVar1 } -func (s *OpenTracingLayerClusterDiscoveryStore) GetAll(discoveryType string, clusterName string) ([]*model.ClusterDiscovery, *model.AppError) { +func (s *OpenTracingLayerClusterDiscoveryStore) GetAll(discoveryType string, clusterName string) ([]*model.ClusterDiscovery, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "ClusterDiscoveryStore.GetAll") s.Root.Store.SetContext(newCtx) @@ -2385,7 +2385,7 @@ func (s *OpenTracingLayerClusterDiscoveryStore) GetAll(discoveryType string, clu return resultVar0, resultVar1 } -func (s *OpenTracingLayerClusterDiscoveryStore) Save(discovery *model.ClusterDiscovery) *model.AppError { +func (s *OpenTracingLayerClusterDiscoveryStore) Save(discovery *model.ClusterDiscovery) error { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "ClusterDiscoveryStore.Save") s.Root.Store.SetContext(newCtx) @@ -2403,7 +2403,7 @@ func (s *OpenTracingLayerClusterDiscoveryStore) Save(discovery *model.ClusterDis return resultVar0 } -func (s *OpenTracingLayerClusterDiscoveryStore) SetLastPingAt(discovery *model.ClusterDiscovery) *model.AppError { +func (s *OpenTracingLayerClusterDiscoveryStore) SetLastPingAt(discovery *model.ClusterDiscovery) error { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "ClusterDiscoveryStore.SetLastPingAt") s.Root.Store.SetContext(newCtx) diff --git a/store/sqlstore/cluster_discovery_store.go b/store/sqlstore/cluster_discovery_store.go index 2e0f1be866..81ff727905 100644 --- a/store/sqlstore/cluster_discovery_store.go +++ b/store/sqlstore/cluster_discovery_store.go @@ -5,7 +5,7 @@ package sqlstore import ( sq "github.com/Masterminds/squirrel" - "net/http" + "github.com/pkg/errors" "github.com/mattermost/mattermost-server/v5/model" "github.com/mattermost/mattermost-server/v5/store" @@ -29,19 +29,19 @@ func newSqlClusterDiscoveryStore(sqlStore SqlStore) store.ClusterDiscoveryStore return s } -func (s sqlClusterDiscoveryStore) Save(ClusterDiscovery *model.ClusterDiscovery) *model.AppError { +func (s sqlClusterDiscoveryStore) Save(ClusterDiscovery *model.ClusterDiscovery) error { ClusterDiscovery.PreSave() if err := ClusterDiscovery.IsValid(); err != nil { return err } if err := s.GetMaster().Insert(ClusterDiscovery); err != nil { - return model.NewAppError("SqlClusterDiscoveryStore.Save", "store.sql_cluster_discovery.save.app_error", nil, err.Error(), http.StatusInternalServerError) + return errors.Wrap(err, "failed to save ClusterDiscovery") } return nil } -func (s sqlClusterDiscoveryStore) Delete(ClusterDiscovery *model.ClusterDiscovery) (bool, *model.AppError) { +func (s sqlClusterDiscoveryStore) Delete(ClusterDiscovery *model.ClusterDiscovery) (bool, error) { query := s.getQueryBuilder(). Delete("ClusterDiscovery"). Where(sq.Eq{"Type": ClusterDiscovery.Type}). @@ -50,12 +50,12 @@ func (s sqlClusterDiscoveryStore) Delete(ClusterDiscovery *model.ClusterDiscover queryString, args, err := query.ToSql() if err != nil { - return false, model.NewAppError("SqlClusterDiscoveryStore.Delete", "store.sql.build_query.app_error", nil, err.Error(), http.StatusInternalServerError) + return false, errors.Wrap(err, "cluster_discovery_tosql") } count, err := s.GetMaster().SelectInt(queryString, args...) if err != nil { - return false, model.NewAppError("SqlClusterDiscoveryStore.Delete", "store.sql_cluster_discovery.delete.app_error", nil, err.Error(), http.StatusInternalServerError) + return false, errors.Wrap(err, "failed to delete ClusterDiscovery") } if count == 0 { return false, nil @@ -63,7 +63,7 @@ func (s sqlClusterDiscoveryStore) Delete(ClusterDiscovery *model.ClusterDiscover return true, nil } -func (s sqlClusterDiscoveryStore) Exists(ClusterDiscovery *model.ClusterDiscovery) (bool, *model.AppError) { +func (s sqlClusterDiscoveryStore) Exists(ClusterDiscovery *model.ClusterDiscovery) (bool, error) { query := s.getQueryBuilder(). Select("COUNT(*)"). From("ClusterDiscovery"). @@ -73,12 +73,12 @@ func (s sqlClusterDiscoveryStore) Exists(ClusterDiscovery *model.ClusterDiscover queryString, args, err := query.ToSql() if err != nil { - return false, model.NewAppError("SqlClusterDiscoveryStore.Exists", "store.sql.build_query.app_error", nil, err.Error(), http.StatusInternalServerError) + return false, errors.Wrap(err, "cluster_discovery_tosql") } count, err := s.GetMaster().SelectInt(queryString, args...) if err != nil { - return false, model.NewAppError("SqlClusterDiscoveryStore.Exists", "store.sql_cluster_discovery.exists.app_error", nil, err.Error(), http.StatusInternalServerError) + return false, errors.Wrap(err, "failed to count ClusterDiscovery") } if count == 0 { return false, nil @@ -86,7 +86,7 @@ func (s sqlClusterDiscoveryStore) Exists(ClusterDiscovery *model.ClusterDiscover return true, nil } -func (s sqlClusterDiscoveryStore) GetAll(ClusterDiscoveryType, clusterName string) ([]*model.ClusterDiscovery, *model.AppError) { +func (s sqlClusterDiscoveryStore) GetAll(ClusterDiscoveryType, clusterName string) ([]*model.ClusterDiscovery, error) { query := s.getQueryBuilder(). Select("*"). From("ClusterDiscovery"). @@ -96,17 +96,17 @@ func (s sqlClusterDiscoveryStore) GetAll(ClusterDiscoveryType, clusterName strin queryString, args, err := query.ToSql() if err != nil { - return nil, model.NewAppError("SqlClusterDiscoveryStore.GetAllForType", "store.sql.build_query.app_error", nil, err.Error(), http.StatusInternalServerError) + return nil, errors.Wrap(err, "cluster_discovery_tosql") } var list []*model.ClusterDiscovery if _, err := s.GetMaster().Select(&list, queryString, args...); err != nil { - return nil, model.NewAppError("SqlClusterDiscoveryStore.GetAllForType", "store.sql_cluster_discovery.get_all.app_error", nil, err.Error(), http.StatusInternalServerError) + return nil, errors.Wrapf(err, "failed to find ClusterDiscovery") } return list, nil } -func (s sqlClusterDiscoveryStore) SetLastPingAt(ClusterDiscovery *model.ClusterDiscovery) *model.AppError { +func (s sqlClusterDiscoveryStore) SetLastPingAt(ClusterDiscovery *model.ClusterDiscovery) error { query := s.getQueryBuilder(). Update("ClusterDiscovery"). Set("LastPingAt", model.GetMillis()). @@ -116,27 +116,27 @@ func (s sqlClusterDiscoveryStore) SetLastPingAt(ClusterDiscovery *model.ClusterD queryString, args, err := query.ToSql() if err != nil { - return model.NewAppError("SqlClusterDiscoveryStore.SetLastPingAt", "store.sql.build_query.app_error", nil, err.Error(), http.StatusInternalServerError) + return errors.Wrap(err, "cluster_discovery_tosql") } if _, err := s.GetMaster().Exec(queryString, args...); err != nil { - return model.NewAppError("SqlClusterDiscoveryStore.SetLastPingAt", "store.sql_cluster_discovery.set_last_ping.app_error", nil, err.Error(), http.StatusInternalServerError) + return errors.Wrap(err, "failed to update ClusterDiscovery") } return nil } -func (s sqlClusterDiscoveryStore) Cleanup() *model.AppError { +func (s sqlClusterDiscoveryStore) Cleanup() error { query := s.getQueryBuilder(). Delete("ClusterDiscovery"). Where(sq.Lt{"LastPingAt": model.GetMillis() - model.CDS_OFFLINE_AFTER_MILLIS}) queryString, args, err := query.ToSql() if err != nil { - return model.NewAppError("SqlClusterDiscoveryStore.Cleanup", "store.sql.build_query.app_error", nil, err.Error(), http.StatusInternalServerError) + return errors.Wrap(err, "cluster_discovery_tosql") } if _, err := s.GetMaster().Exec(queryString, args...); err != nil { - return model.NewAppError("SqlClusterDiscoveryStore.Cleanup", "store.sql_cluster_discovery.cleanup.app_error", nil, err.Error(), http.StatusInternalServerError) + return errors.Wrap(err, "failed to delete ClusterDiscoveries") } return nil } diff --git a/store/store.go b/store/store.go index 7bf129c2a6..e87a3cc5a0 100644 --- a/store/store.go +++ b/store/store.go @@ -394,12 +394,12 @@ type AuditStore interface { } type ClusterDiscoveryStore interface { - Save(discovery *model.ClusterDiscovery) *model.AppError - Delete(discovery *model.ClusterDiscovery) (bool, *model.AppError) - Exists(discovery *model.ClusterDiscovery) (bool, *model.AppError) - GetAll(discoveryType, clusterName string) ([]*model.ClusterDiscovery, *model.AppError) - SetLastPingAt(discovery *model.ClusterDiscovery) *model.AppError - Cleanup() *model.AppError + Save(discovery *model.ClusterDiscovery) error + Delete(discovery *model.ClusterDiscovery) (bool, error) + Exists(discovery *model.ClusterDiscovery) (bool, error) + GetAll(discoveryType, clusterName string) ([]*model.ClusterDiscovery, error) + SetLastPingAt(discovery *model.ClusterDiscovery) error + Cleanup() error } type ComplianceStore interface { diff --git a/store/storetest/mocks/ClusterDiscoveryStore.go b/store/storetest/mocks/ClusterDiscoveryStore.go index 5e17fe52e5..b241a63d20 100644 --- a/store/storetest/mocks/ClusterDiscoveryStore.go +++ b/store/storetest/mocks/ClusterDiscoveryStore.go @@ -15,23 +15,21 @@ type ClusterDiscoveryStore struct { } // Cleanup provides a mock function with given fields: -func (_m *ClusterDiscoveryStore) Cleanup() *model.AppError { +func (_m *ClusterDiscoveryStore) Cleanup() error { ret := _m.Called() - var r0 *model.AppError - if rf, ok := ret.Get(0).(func() *model.AppError); ok { + var r0 error + if rf, ok := ret.Get(0).(func() error); ok { r0 = rf() } else { - if ret.Get(0) != nil { - r0 = ret.Get(0).(*model.AppError) - } + r0 = ret.Error(0) } return r0 } // Delete provides a mock function with given fields: discovery -func (_m *ClusterDiscoveryStore) Delete(discovery *model.ClusterDiscovery) (bool, *model.AppError) { +func (_m *ClusterDiscoveryStore) Delete(discovery *model.ClusterDiscovery) (bool, error) { ret := _m.Called(discovery) var r0 bool @@ -41,20 +39,18 @@ func (_m *ClusterDiscoveryStore) Delete(discovery *model.ClusterDiscovery) (bool r0 = ret.Get(0).(bool) } - var r1 *model.AppError - if rf, ok := ret.Get(1).(func(*model.ClusterDiscovery) *model.AppError); ok { + var r1 error + if rf, ok := ret.Get(1).(func(*model.ClusterDiscovery) error); ok { r1 = rf(discovery) } else { - if ret.Get(1) != nil { - r1 = ret.Get(1).(*model.AppError) - } + r1 = ret.Error(1) } return r0, r1 } // Exists provides a mock function with given fields: discovery -func (_m *ClusterDiscoveryStore) Exists(discovery *model.ClusterDiscovery) (bool, *model.AppError) { +func (_m *ClusterDiscoveryStore) Exists(discovery *model.ClusterDiscovery) (bool, error) { ret := _m.Called(discovery) var r0 bool @@ -64,20 +60,18 @@ func (_m *ClusterDiscoveryStore) Exists(discovery *model.ClusterDiscovery) (bool r0 = ret.Get(0).(bool) } - var r1 *model.AppError - if rf, ok := ret.Get(1).(func(*model.ClusterDiscovery) *model.AppError); ok { + var r1 error + if rf, ok := ret.Get(1).(func(*model.ClusterDiscovery) error); ok { r1 = rf(discovery) } else { - if ret.Get(1) != nil { - r1 = ret.Get(1).(*model.AppError) - } + r1 = ret.Error(1) } return r0, r1 } // GetAll provides a mock function with given fields: discoveryType, clusterName -func (_m *ClusterDiscoveryStore) GetAll(discoveryType string, clusterName string) ([]*model.ClusterDiscovery, *model.AppError) { +func (_m *ClusterDiscoveryStore) GetAll(discoveryType string, clusterName string) ([]*model.ClusterDiscovery, error) { ret := _m.Called(discoveryType, clusterName) var r0 []*model.ClusterDiscovery @@ -89,45 +83,39 @@ func (_m *ClusterDiscoveryStore) GetAll(discoveryType string, clusterName string } } - var r1 *model.AppError - if rf, ok := ret.Get(1).(func(string, string) *model.AppError); ok { + var r1 error + if rf, ok := ret.Get(1).(func(string, string) error); ok { r1 = rf(discoveryType, clusterName) } else { - if ret.Get(1) != nil { - r1 = ret.Get(1).(*model.AppError) - } + r1 = ret.Error(1) } return r0, r1 } // Save provides a mock function with given fields: discovery -func (_m *ClusterDiscoveryStore) Save(discovery *model.ClusterDiscovery) *model.AppError { +func (_m *ClusterDiscoveryStore) Save(discovery *model.ClusterDiscovery) error { ret := _m.Called(discovery) - var r0 *model.AppError - if rf, ok := ret.Get(0).(func(*model.ClusterDiscovery) *model.AppError); ok { + var r0 error + if rf, ok := ret.Get(0).(func(*model.ClusterDiscovery) error); ok { r0 = rf(discovery) } else { - if ret.Get(0) != nil { - r0 = ret.Get(0).(*model.AppError) - } + r0 = ret.Error(0) } return r0 } // SetLastPingAt provides a mock function with given fields: discovery -func (_m *ClusterDiscoveryStore) SetLastPingAt(discovery *model.ClusterDiscovery) *model.AppError { +func (_m *ClusterDiscoveryStore) SetLastPingAt(discovery *model.ClusterDiscovery) error { ret := _m.Called(discovery) - var r0 *model.AppError - if rf, ok := ret.Get(0).(func(*model.ClusterDiscovery) *model.AppError); ok { + var r0 error + if rf, ok := ret.Get(0).(func(*model.ClusterDiscovery) error); ok { r0 = rf(discovery) } else { - if ret.Get(0) != nil { - r0 = ret.Get(0).(*model.AppError) - } + r0 = ret.Error(0) } return r0 diff --git a/store/timer_layer.go b/store/timer_layer.go index dad3f457ed..d9983e36b1 100644 --- a/store/timer_layer.go +++ b/store/timer_layer.go @@ -2129,7 +2129,7 @@ func (s *TimerLayerChannelMemberHistoryStore) PermanentDeleteBatch(endTime int64 return resultVar0, resultVar1 } -func (s *TimerLayerClusterDiscoveryStore) Cleanup() *model.AppError { +func (s *TimerLayerClusterDiscoveryStore) Cleanup() error { start := timemodule.Now() resultVar0 := s.ClusterDiscoveryStore.Cleanup() @@ -2145,7 +2145,7 @@ func (s *TimerLayerClusterDiscoveryStore) Cleanup() *model.AppError { return resultVar0 } -func (s *TimerLayerClusterDiscoveryStore) Delete(discovery *model.ClusterDiscovery) (bool, *model.AppError) { +func (s *TimerLayerClusterDiscoveryStore) Delete(discovery *model.ClusterDiscovery) (bool, error) { start := timemodule.Now() resultVar0, resultVar1 := s.ClusterDiscoveryStore.Delete(discovery) @@ -2161,7 +2161,7 @@ func (s *TimerLayerClusterDiscoveryStore) Delete(discovery *model.ClusterDiscove return resultVar0, resultVar1 } -func (s *TimerLayerClusterDiscoveryStore) Exists(discovery *model.ClusterDiscovery) (bool, *model.AppError) { +func (s *TimerLayerClusterDiscoveryStore) Exists(discovery *model.ClusterDiscovery) (bool, error) { start := timemodule.Now() resultVar0, resultVar1 := s.ClusterDiscoveryStore.Exists(discovery) @@ -2177,7 +2177,7 @@ func (s *TimerLayerClusterDiscoveryStore) Exists(discovery *model.ClusterDiscove return resultVar0, resultVar1 } -func (s *TimerLayerClusterDiscoveryStore) GetAll(discoveryType string, clusterName string) ([]*model.ClusterDiscovery, *model.AppError) { +func (s *TimerLayerClusterDiscoveryStore) GetAll(discoveryType string, clusterName string) ([]*model.ClusterDiscovery, error) { start := timemodule.Now() resultVar0, resultVar1 := s.ClusterDiscoveryStore.GetAll(discoveryType, clusterName) @@ -2193,7 +2193,7 @@ func (s *TimerLayerClusterDiscoveryStore) GetAll(discoveryType string, clusterNa return resultVar0, resultVar1 } -func (s *TimerLayerClusterDiscoveryStore) Save(discovery *model.ClusterDiscovery) *model.AppError { +func (s *TimerLayerClusterDiscoveryStore) Save(discovery *model.ClusterDiscovery) error { start := timemodule.Now() resultVar0 := s.ClusterDiscoveryStore.Save(discovery) @@ -2209,7 +2209,7 @@ func (s *TimerLayerClusterDiscoveryStore) Save(discovery *model.ClusterDiscovery return resultVar0 } -func (s *TimerLayerClusterDiscoveryStore) SetLastPingAt(discovery *model.ClusterDiscovery) *model.AppError { +func (s *TimerLayerClusterDiscoveryStore) SetLastPingAt(discovery *model.ClusterDiscovery) error { start := timemodule.Now() resultVar0 := s.ClusterDiscoveryStore.SetLastPingAt(discovery)