Merge pull request #19455 from k8s-infra-cherrypick-robot/cherry-pick-19342-to-release-3.6

[release-3.6] Move interface `AlarmBackend` from `server/etcdserver/api/v3alarm` to `server/storage/schema` to fix the `unexported-return` lint error

Author: ahrtr

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()
 	}

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,