From 7b84271ab35e882dc003382712890fe01d1b4617 Mon Sep 17 00:00:00 2001
From: medcl <m@medcl.net>
Date: Fri, 20 Oct 2023 20:31:23 +0800
Subject: [PATCH] refactoring agent proxy

---
 modules/agent/api/elasticsearch.go | 73 +++++++-----------------------
 1 file changed, 17 insertions(+), 56 deletions(-)

diff --git a/modules/agent/api/elasticsearch.go b/modules/agent/api/elasticsearch.go
index 101492b6..d7ca9ffa 100644
--- a/modules/agent/api/elasticsearch.go
+++ b/modules/agent/api/elasticsearch.go
@@ -6,20 +6,16 @@ package api
 
 import (
 	"context"
-	"errors"
 	"fmt"
 	log "github.com/cihub/seelog"
 	httprouter "infini.sh/framework/core/api/router"
 	"infini.sh/framework/core/elastic"
-	"infini.sh/framework/core/global"
 	"infini.sh/framework/core/model"
 	"infini.sh/framework/core/orm"
 	"infini.sh/framework/core/util"
 	"infini.sh/framework/modules/elastic/common"
 	"infini.sh/framework/plugins/managed/server"
 	"net/http"
-	"net/url"
-	"sync"
 	"time"
 )
 
@@ -113,7 +109,7 @@ func GetElasticsearchNodesViaAgent(ctx context.Context, instance *model.Instance
 	}
 
 	obj := elastic.DiscoveryResult{}
-	err := doRequest(instance, req, &obj)
+	_,err := server.ProxyAgentRequest(instance.GetEndpoint(), req, &obj)
 	if err != nil {
 		return nil, err
 	}
@@ -149,7 +145,7 @@ func GetElasticLogFiles(ctx context.Context, instance *model.Instance, logsPath
 	}
 
 	resBody := map[string]interface{}{}
-	err := doRequest(instance, req, &resBody)
+	_,err := server.ProxyAgentRequest(instance.GetEndpoint(), req, &resBody)
 	if err != nil {
 		return nil, err
 	}
@@ -168,7 +164,7 @@ func GetElasticLogFileContent(ctx context.Context, instance *model.Instance, bod
 		Body:    util.MustToJSONBytes(body),
 	}
 	resBody := map[string]interface{}{}
-	err := doRequest(instance, req, &resBody)
+	_,err := server.ProxyAgentRequest(instance.GetEndpoint(), req, &resBody)
 	if err != nil {
 		return nil, err
 	}
@@ -397,17 +393,23 @@ func (h *APIHandler) discoveryESNodesInfo(w http.ResponseWriter, req *http.Reque
 func (h *APIHandler) getESNodeInfoViaProxy(host string, schema string, auth *model.BasicAuth, instance model.Instance) (success, tryAgain bool, info *elastic.LocalNodeInfo) {
 	esConfig := elastic.ElasticsearchConfig{Host: host, Schema: schema, BasicAuth: auth}
 	body := util.MustToJSONBytes(esConfig)
-	res, err := server.ProxyRequestToRuntimeInstance(instance.GetEndpoint(), "POST", "/elasticsearch/node/_info",
-		body, int64(len(body)), auth)
 
-	if err != nil {
-		panic(err)
+	ctx, cancel := context.WithTimeout(context.Background(), time.Second*10)
+	defer cancel()
+	req := &util.Request{
+		Method:  http.MethodPost,
+		Path:    "/elasticsearch/node/_info",
+		Context: ctx,
+		Body: body,
+	}
+	if auth != nil {
+		req.SetBasicAuth(auth.Username, auth.Password)
 	}
 
-	if global.Env().IsDebug {
-		if res != nil { // && res.StatusCode==http.StatusOK
-			log.Debug(string(res.Body))
-		}
+	obj :=  elastic.LocalNodeInfo{}
+	res,err := server.ProxyAgentRequest(instance.GetEndpoint(), req, &obj)
+	if err != nil {
+		panic(err)
 	}
 
 	if res != nil && res.StatusCode == http.StatusForbidden {
@@ -539,44 +541,3 @@ func (h *APIHandler) enrollESNode(w http.ResponseWriter, req *http.Request, ps h
 
 	h.WriteAckOKJSON(w)
 }
-
-var mTLSClient *http.Client //TODO get mTLSClient
-var initOnce = sync.Once{}
-
-func doRequest(instance *model.Instance, req *util.Request, obj interface{}) error {
-	var err error
-	var res *util.Result
-
-	initOnce.Do(func() {
-		if global.Env().SystemConfig.Configs.TLSConfig.TLSEnabled && global.Env().SystemConfig.Configs.TLSConfig.TLSCAFile != "" {
-
-			//init client
-			hClient, err := util.NewMTLSClient(
-				global.Env().SystemConfig.Configs.TLSConfig.TLSCAFile,
-				global.Env().SystemConfig.Configs.TLSConfig.TLSCertFile,
-				global.Env().SystemConfig.Configs.TLSConfig.TLSKeyFile)
-			if err != nil {
-				panic(err)
-			}
-			mTLSClient = hClient
-		}
-	})
-
-	req.Url, err = url.JoinPath(instance.GetEndpoint(), req.Path)
-	res, err = util.ExecuteRequestWithCatchFlag(mTLSClient, req, true)
-	if err != nil || res.StatusCode != 200 {
-		body := ""
-		if res != nil {
-			body = string(res.Body)
-		}
-		return errors.New(fmt.Sprintf("request error: %v, %v", err, body))
-	}
-
-	if res != nil {
-		if res.Body != nil {
-			return util.FromJSONBytes(res.Body, obj)
-		}
-	}
-
-	return nil
-}