[sync] Code refactoring

essentialkaos · Jan 17, 2025 · 083ab1c · 083ab1c
1 parent a0d0100
commit 083ab1c
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 17 deletions.
diff --git a/api/api.go b/api/api.go
@@ -8,8 +8,6 @@ package api
 // ////////////////////////////////////////////////////////////////////////////////// //
 
 import (
-	"github.com/essentialkaos/ek/v13/req"
-
 	CORE "github.com/essentialkaos/rds/core"
 )
 
@@ -151,13 +149,15 @@ type HelloResponse struct {
 	Version       string              `json:"version"`
 	CID           string              `json:"cid"`
 	Auth          *CORE.SuperuserAuth `json:"auth"`
+	Instances     uint16              `json:"instances_num"`
+	MemoryUsage   uint64              `json:"mem_usage"`
 	SentinelWorks bool                `json:"sentinel_works"`
 }
 
 type InfoRequest struct {
 	CID  string `json:"cid"`
 	ID   int    `json:"id"`
-	UUID string `json:"UUID"`
+	UUID string `json:"uuid"`
 }
 
 type InfoResponse struct {
@@ -198,15 +198,6 @@ type ByeRequest struct {
 
 // ////////////////////////////////////////////////////////////////////////////////// //
 
-// GetAuthHeader return API authentication header
-func GetAuthHeader(token string) req.Headers {
-	return req.Headers{
-		"Authorization": "Bearer " + token,
-	}
-}
-
-// ////////////////////////////////////////////////////////////////////////////////// //
-
 // String returns string representation of client status
 func (s ClientState) String() string {
 	switch s {

diff --git a/sync/client/sync_client.go b/sync/client/sync_client.go
@@ -28,7 +28,7 @@ func PropagateCommand(command API.MasterCommand, id int, uuid string) error {
 
 	resp, err := req.Request{
 		URL:         getURL(API.METHOD_PUSH),
-		Headers:     API.GetAuthHeader(CORE.Config.GetS(CORE.REPLICATION_AUTH_TOKEN)),
+		Auth:        req.AuthBearer{CORE.Config.GetS(CORE.REPLICATION_AUTH_TOKEN)},
 		ContentType: req.CONTENT_TYPE_JSON,
 		AutoDiscard: true,
 		Body: &API.PushRequest{
@@ -66,8 +66,8 @@ func GetReplicationInfo() (*API.ReplicationInfo, error) {
 	var err error
 
 	resp, err := req.Request{
-		Headers:     API.GetAuthHeader(CORE.Config.GetS(CORE.REPLICATION_AUTH_TOKEN)),
 		URL:         getURL(API.METHOD_REPLICATION),
+		Auth:        req.AuthBearer{CORE.Config.GetS(CORE.REPLICATION_AUTH_TOKEN)},
 		AutoDiscard: true,
 	}.Get()
 
@@ -98,8 +98,8 @@ func GetStatsInfo() (*API.StatsInfo, error) {
 	var err error
 
 	resp, err := req.Request{
-		Headers:     API.GetAuthHeader(CORE.Config.GetS(CORE.REPLICATION_AUTH_TOKEN)),
 		URL:         getURL(API.METHOD_STATS),
+		Auth:        req.AuthBearer{CORE.Config.GetS(CORE.REPLICATION_AUTH_TOKEN)},
 		AutoDiscard: true,
 	}.Get()
 

diff --git a/sync/minion/minion.go b/sync/minion/minion.go
@@ -900,7 +900,7 @@ func getURL(method API.Method) string {
 func sendRequest(method API.Method, reqData, respData any) error {
 	resp, err := req.Request{
 		URL:         getURL(method),
-		Headers:     API.GetAuthHeader(CORE.Config.GetS(CORE.REPLICATION_AUTH_TOKEN)),
+		Auth:        req.AuthBearer{CORE.Config.GetS(CORE.REPLICATION_AUTH_TOKEN)},
 		ContentType: req.CONTENT_TYPE_JSON,
 		Body:        reqData,
 		AutoDiscard: true,

diff --git a/sync/sentinel/sentinel.go b/sync/sentinel/sentinel.go
@@ -734,7 +734,7 @@ func getURL(method API.Method) string {
 func sendRequest(method API.Method, reqData, respData any) error {
 	resp, err := req.Request{
 		URL:         getURL(method),
-		Headers:     API.GetAuthHeader(CORE.Config.GetS(CORE.REPLICATION_AUTH_TOKEN)),
+		Auth:        req.AuthBearer{CORE.Config.GetS(CORE.REPLICATION_AUTH_TOKEN)},
 		ContentType: req.CONTENT_TYPE_JSON,
 		Body:        reqData,
 		AutoDiscard: true,