delete util.go

Author: pooknull

cmd/mongodb-healthcheck/healthcheck/health.go

@@ -73,7 +73,7 @@ func HealthCheckMongodLiveness(ctx context.Context, cnf *db.Config, startupDelay
 		return nil, errors.Wrap(err, "get isMaster response")
 	}
 
-	rsStatus, err := getStatus(ctx, client)
+	rsStatus, err := client.RSStatus(ctx)
 	if err != nil {
 		if err.Error() == ErrNoReplsetConfigStr {
 			state := mongo.MemberStateUnknown
@@ -119,14 +119,7 @@ type OplogRs struct {
 	StorageSize      int64 `bson:"storageSize" json:"storageSize"`
 }
 
-type ReplSetStatus struct {
-	InitialSyncStatus InitialSyncStatus `bson:"initialSyncStatus" json:"initialSyncStatus"`
-	mongo.Status      `bson:",inline"`
-}
-
-type InitialSyncStatus interface{}
-
-func CheckState(rs ReplSetStatus, startupDelaySeconds int64, oplogSize int64) error {
+func CheckState(rs mongo.Status, startupDelaySeconds int64, oplogSize int64) error {
 	if rs.GetSelf() == nil {
 		return errors.New("invalid replset status")
 	}

cmd/mongodb-healthcheck/healthcheck/readiness.go

@@ -44,7 +44,7 @@ func MongodReadinessCheck(ctx context.Context, cnf *db.Config) error {
 		return err
 	}
 
-	s, err := func() (*ReplSetStatus, error) {
+	s, err := func() (*mongo.Status, error) {
 		cnf.Timeout = time.Second
 		client, err := db.Dial(ctx, cnf)
 		if err != nil {
@@ -55,7 +55,7 @@ func MongodReadinessCheck(ctx context.Context, cnf *db.Config) error {
 				err = errors.Wrap(derr, "failed to disconnect")
 			}
 		}()
-		rs, err := getStatus(ctx, client)
+		rs, err := client.RSStatus(ctx)
 		if err != nil {
 			return nil, err
 		}

cmd/mongodb-healthcheck/healthcheck/util.go

@@ -136,6 +136,7 @@ type IsMasterResp struct {
 }
 
 type Status struct {
+	InitialSyncStatus       any            `bson:"initialSyncStatus" json:"initialSyncStatus"`
 	Set                     string         `bson:"set" json:"set"`
 	Date                    time.Time      `bson:"date" json:"date"`
 	MyState                 MemberState    `bson:"myState" json:"myState"`
@@ -188,8 +189,10 @@ type StatusOptimes struct {
 	DurableOptime       *Optime `bson:"durableOpTime" json:"durableOpTime"`
 }
 
-type MemberHealth int
-type MemberState int
+type (
+	MemberHealth int
+	MemberState  int
+)
 
 const (
 	MemberHealthDown MemberHealth = iota