feat: refactor OpenSearch integration with new connection model

Author: elmilan06

plugins/compliance-orchestrator/client/backend.go

@@ -123,8 +123,10 @@ func (c *BackendClient) GetRequest(ctx context.Context, url string) ([]byte, err
 }
 
 func (b *BackendClient) IndexEvaluationResult(ctx context.Context, index string, doc any) error {
-	baseURL := plugins.PluginCfg("org.opensearch", false).Get("opensearch").String()
-	endpoint := fmt.Sprintf("%s/%s/_doc", baseURL, index)
+	osCfg := LoadOpenSearchConfig()
+	client := NewOpenSearchHTTPClient()
+
+	endpoint := fmt.Sprintf("%s/%s/_doc", osCfg.URL, index)
 
 	jsonBody, err := json.Marshal(doc)
 	if err != nil {
@@ -137,15 +139,17 @@ func (b *BackendClient) IndexEvaluationResult(ctx context.Context, index string,
 	}
 
 	req.Header.Set("Content-Type", "application/json")
+	req.SetBasicAuth(osCfg.User, osCfg.Pass)
 
-	resp, err := b.httpClient.Do(req)
+	resp, err := client.Do(req)
 	if err != nil {
 		return fmt.Errorf("index request failed: %w", err)
 	}
 	defer resp.Body.Close()
 
 	if resp.StatusCode >= 300 {
-		return fmt.Errorf("indexing failed with status %d", resp.StatusCode)
+		body, _ := io.ReadAll(resp.Body)
+		return fmt.Errorf("indexing failed with status %d: %s", resp.StatusCode, string(body))
 	}
 
 	return nil

plugins/compliance-orchestrator/client/opensearch.go

@@ -9,40 +9,32 @@ import (
 
 	"github.com/threatwinds/go-sdk/catcher"
 	sdkos "github.com/threatwinds/go-sdk/os"
-	"github.com/threatwinds/go-sdk/plugins"
 )
 
 func ConnectOpenSearch() error {
-	osUrl := plugins.PluginCfg("org.opensearch", false).Get("opensearch").String()
+	osCfg := LoadOpenSearchConfig()
 
-	err := sdkos.Connect([]string{osUrl}, "", "")
+	err := sdkos.Connect([]string{osCfg.URL}, osCfg.User, osCfg.Pass)
 	if err != nil {
 		return catcher.Error("failed to connect to OpenSearch", err, map[string]any{
-			"url": osUrl,
+			"url":  osCfg.URL,
+			"user": osCfg.User,
 		})
 	}
 
 	catcher.Info("Connected to OpenSearch", map[string]any{
-		"url": osUrl,
+		"url": osCfg.URL,
 	})
-
 	return nil
 }
 
-type SQLResponse struct {
-	Schema   []any   `json:"schema"`
-	DataRows [][]any `json:"datarows"`
-	Total    int     `json:"total"`
-}
-
 func (b *BackendClient) ExecuteSQLQuery(ctx context.Context, sql string) (SQLResult, error) {
-	baseURL := plugins.PluginCfg("org.opensearch", false).Get("opensearch").String()
-	sqlEndpoint := fmt.Sprintf("%s/_plugins/_sql", baseURL)
+	osCfg := LoadOpenSearchConfig()
+	client := NewOpenSearchHTTPClient()
 
-	body := map[string]string{
-		"query": sql,
-	}
+	sqlEndpoint := fmt.Sprintf("%s/_plugins/_sql", osCfg.URL)
 
+	body := map[string]string{"query": sql}
 	jsonBody, err := json.Marshal(body)
 	if err != nil {
 		return SQLResult{}, fmt.Errorf("failed to marshal SQL body: %w", err)
@@ -54,8 +46,9 @@ func (b *BackendClient) ExecuteSQLQuery(ctx context.Context, sql string) (SQLRes
 	}
 
 	req.Header.Set("Content-Type", "application/json")
+	req.SetBasicAuth(osCfg.User, osCfg.Pass)
 
-	resp, err := b.httpClient.Do(req)
+	resp, err := client.Do(req)
 	if err != nil {
 		return SQLResult{}, fmt.Errorf("SQL request failed: %w", err)
 	}

plugins/compliance-orchestrator/client/opensearch_config.go

@@ -0,0 +1,42 @@
+package client
+
+import (
+	"crypto/tls"
+	"fmt"
+	"net/http"
+
+	"github.com/threatwinds/go-sdk/plugins"
+)
+
+type OpenSearchConfig struct {
+	Host string
+	Port string
+	User string
+	Pass string
+	URL  string
+}
+
+func LoadOpenSearchConfig() OpenSearchConfig {
+	cfg := plugins.PluginCfg("org.opensearch", false).Get("opensearch")
+
+	host := cfg.Get("host").String()
+	port := cfg.Get("port").String()
+	user := cfg.Get("user").String()
+	pass := cfg.Get("password").String()
+
+	return OpenSearchConfig{
+		Host: host,
+		Port: port,
+		User: user,
+		Pass: pass,
+		URL:  fmt.Sprintf("https://%s:%s", host, port),
+	}
+}
+
+func NewOpenSearchHTTPClient() *http.Client {
+	return &http.Client{
+		Transport: &http.Transport{
+			TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
+		},
+	}
+}

plugins/compliance-orchestrator/client/opensearch_result.go

@@ -0,0 +1,12 @@
+package client
+
+type SQLResult struct {
+	Rows  [][]any
+	Count int
+}
+
+type SQLResponse struct {
+	Schema   []any   `json:"schema"`
+	DataRows [][]any `json:"datarows"`
+	Total    int     `json:"total"`
+}