From 1fd8887a6f0a698b1b1c4bbeb5959d2c4d7afacc Mon Sep 17 00:00:00 2001 From: adeyemi Date: Tue, 4 Feb 2025 21:12:50 -0800 Subject: [PATCH] Move AlarmBackend interface to fix unexported-return Signed-off-by: adeyemi --- server/etcdserver/api/v3alarm/alarms.go | 13 +++---------- server/storage/schema/alarm.go | 10 +++++++++- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/server/etcdserver/api/v3alarm/alarms.go b/server/etcdserver/api/v3alarm/alarms.go index e0480da081c1..bf17929d7944 100644 --- a/server/etcdserver/api/v3alarm/alarms.go +++ b/server/etcdserver/api/v3alarm/alarms.go @@ -23,20 +23,13 @@ import ( pb "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/client/pkg/v3/types" "go.etcd.io/etcd/server/v3/storage/backend" + "go.etcd.io/etcd/server/v3/storage/schema" ) type BackendGetter interface { Backend() backend.Backend } -type AlarmBackend interface { - CreateAlarmBucket() - MustPutAlarm(member *pb.AlarmMember) - MustDeleteAlarm(alarm *pb.AlarmMember) - GetAllAlarms() ([]*pb.AlarmMember, error) - ForceCommit() -} - type alarmSet map[types.ID]*pb.AlarmMember // AlarmStore persists alarms to the backend. @@ -45,10 +38,10 @@ type AlarmStore struct { mu sync.Mutex types map[pb.AlarmType]alarmSet - be AlarmBackend + be schema.AlarmBackend } -func NewAlarmStore(lg *zap.Logger, be AlarmBackend) (*AlarmStore, error) { +func NewAlarmStore(lg *zap.Logger, be schema.AlarmBackend) (*AlarmStore, error) { if lg == nil { lg = zap.NewNop() } diff --git a/server/storage/schema/alarm.go b/server/storage/schema/alarm.go index 6e81d0f46712..929fbd4cebdb 100644 --- a/server/storage/schema/alarm.go +++ b/server/storage/schema/alarm.go @@ -21,12 +21,20 @@ import ( "go.etcd.io/etcd/server/v3/storage/backend" ) +type AlarmBackend interface { + CreateAlarmBucket() + MustPutAlarm(member *etcdserverpb.AlarmMember) + MustDeleteAlarm(alarm *etcdserverpb.AlarmMember) + GetAllAlarms() ([]*etcdserverpb.AlarmMember, error) + ForceCommit() +} + type alarmBackend struct { lg *zap.Logger be backend.Backend } -func NewAlarmBackend(lg *zap.Logger, be backend.Backend) *alarmBackend { +func NewAlarmBackend(lg *zap.Logger, be backend.Backend) AlarmBackend { return &alarmBackend{ lg: lg, be: be,