From 0b51a402548c9734539d196a6f49035cc1b05e96 Mon Sep 17 00:00:00 2001 From: Taha Yassine Kraiem Date: Fri, 28 Jan 2022 11:56:51 +0100 Subject: [PATCH] feat(integrations): changed response marshaling --- .../integrations/integration/elasticsearch.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/backend/services/integrations/integration/elasticsearch.go b/backend/services/integrations/integration/elasticsearch.go index f70d3ee53..28f03a3b5 100644 --- a/backend/services/integrations/integration/elasticsearch.go +++ b/backend/services/integrations/integration/elasticsearch.go @@ -8,7 +8,6 @@ import ( "fmt" elasticlib "github.com/elastic/go-elasticsearch/v7" "log" - "reflect" "strconv" "time" @@ -37,10 +36,9 @@ type elasticResponce struct { Hits []struct { Id string `json:"_id"` Source json.RawMessage `json:"_source"` - } - } + } `json:"hits"` + } `json:"hits"` ScrollId string `json:"_scroll_id"` - Error map[string]interface{} } func (es *elasticsearch) Request(c *client) error { @@ -57,6 +55,8 @@ func (es *elasticsearch) Request(c *client) error { esC, err := elasticlib.NewClient(cfg) if err != nil { + log.Println("Error while creating new ES client") + log.Println(err) return err } // TODO: ping/versions/ client host check @@ -140,15 +140,15 @@ func (es *elasticsearch) Request(c *client) error { } for { - var mapResp map[string]interface{} - if err := json.NewDecoder(res.Body).Decode(&mapResp); err != nil { - log.Fatalf("Error parsing raw response body: %s", err) - - // If no error, then convert response to a map[string]interface - } else { - log.Println("mapResp TYPE:", reflect.TypeOf(mapResp), "\n") - log.Println(mapResp) - } + //var mapResp map[string]interface{} + //if err := json.NewDecoder(res.Body).Decode(&mapResp); err != nil { + // log.Fatalf("Error parsing raw response body: %s", err) + // + // // If no error, then convert response to a map[string]interface + //} else { + // log.Println("mapResp TYPE:", reflect.TypeOf(mapResp), "\n") + // log.Println(mapResp) + //} var esResp elasticResponce if err := json.NewDecoder(res.Body).Decode(&esResp); err != nil {