From b4e1663cd11de8c268b85e3f0995dc2da8281e1c Mon Sep 17 00:00:00 2001
From: DanielGrunbergerCA <danielg@armosec.io>
Date: Tue, 3 May 2022 16:24:19 +0300
Subject: [PATCH] make parse func

---
 .../reporter/v1/reporteventreceiverutils.go   | 22 +++++++++++--------
 .../reporter/v2/reporteventreceiver.go        | 11 +---------
 .../reporter/v2/reporteventreceiverutils.go   | 20 ++++++++++-------
 3 files changed, 26 insertions(+), 27 deletions(-)

diff --git a/core/pkg/resultshandling/reporter/v1/reporteventreceiverutils.go b/core/pkg/resultshandling/reporter/v1/reporteventreceiverutils.go
index 43d334b1..b5269b28 100644
--- a/core/pkg/resultshandling/reporter/v1/reporteventreceiverutils.go
+++ b/core/pkg/resultshandling/reporter/v1/reporteventreceiverutils.go
@@ -11,14 +11,8 @@ import (
 )
 
 func (report *ReportEventReceiver) initEventReceiverURL() {
-	urlObj := url.URL{}
-	urlObj.Host = getter.GetArmoAPIConnector().GetReportReceiverURL()
-	if strings.Contains(urlObj.Host, "http://") {
-		urlObj.Scheme = "http"
-		urlObj.Host = strings.Replace(urlObj.Host, "http://", "", 1)
-	} else {
-		urlObj.Scheme = "https"
-	}
+	urlObj := parseHost(getter.GetArmoAPIConnector().GetReportReceiverURL())
+
 	urlObj.Path = "/k8s/postureReport"
 	q := urlObj.Query()
 	q.Add("customerGUID", uuid.MustParse(report.customerGUID).String())
@@ -28,7 +22,17 @@ func (report *ReportEventReceiver) initEventReceiverURL() {
 
 	report.eventReceiverURL = &urlObj
 }
-
+func parseHost(host string) url.URL {
+	urlObj := url.URL{}
+	if strings.Contains(host, "http://") {
+		urlObj.Scheme = "http"
+		urlObj.Host = strings.Replace(host, "http://", "", 1)
+	} else {
+		urlObj.Scheme = "https"
+		urlObj.Host = host
+	}
+	return urlObj
+}
 func hostToString(host *url.URL, reportID string) string {
 	q := host.Query()
 	q.Add("reportID", reportID) // TODO - do we add the reportID?
diff --git a/core/pkg/resultshandling/reporter/v2/reporteventreceiver.go b/core/pkg/resultshandling/reporter/v2/reporteventreceiver.go
index de3165c0..1531704e 100644
--- a/core/pkg/resultshandling/reporter/v2/reporteventreceiver.go
+++ b/core/pkg/resultshandling/reporter/v2/reporteventreceiver.go
@@ -6,7 +6,6 @@ import (
 	"net/http"
 	"net/url"
 	"os"
-	"strings"
 
 	"github.com/armosec/k8s-interface/workloadinterface"
 	"github.com/armosec/kubescape/v2/core/cautils"
@@ -89,15 +88,7 @@ func (report *ReportEventReceiver) prepareReport(opaSessionObj *cautils.OPASessi
 }
 
 func (report *ReportEventReceiver) GetURL() string {
-	u := url.URL{}
-	u.Host = getter.GetArmoAPIConnector().GetFrontendURL()
-	if strings.Contains(u.Host, "http://") {
-		u.Scheme = "http"
-		u.Host = strings.Replace(u.Host, "http://", "", 1)
-	} else {
-		u.Scheme = "https"
-	}
-
+	u := parseHost(getter.GetArmoAPIConnector().GetFrontendURL())
 	q := u.Query()
 
 	if report.customerAdminEMail != "" || report.token == "" { // data has been submitted
diff --git a/core/pkg/resultshandling/reporter/v2/reporteventreceiverutils.go b/core/pkg/resultshandling/reporter/v2/reporteventreceiverutils.go
index 11689ce2..9d9e95b0 100644
--- a/core/pkg/resultshandling/reporter/v2/reporteventreceiverutils.go
+++ b/core/pkg/resultshandling/reporter/v2/reporteventreceiverutils.go
@@ -11,14 +11,7 @@ import (
 )
 
 func (report *ReportEventReceiver) initEventReceiverURL() {
-	urlObj := url.URL{}
-	urlObj.Host = getter.GetArmoAPIConnector().GetReportReceiverURL()
-	if strings.Contains(urlObj.Host, "http://") {
-		urlObj.Scheme = "http"
-		urlObj.Host = strings.Replace(urlObj.Host, "http://", "", 1)
-	} else {
-		urlObj.Scheme = "https"
-	}
+	urlObj := parseHost(getter.GetArmoAPIConnector().GetReportReceiverURL())
 	urlObj.Path = "/k8s/v2/postureReport"
 
 	q := urlObj.Query()
@@ -30,6 +23,17 @@ func (report *ReportEventReceiver) initEventReceiverURL() {
 	report.eventReceiverURL = &urlObj
 }
 
+func parseHost(host string) url.URL {
+	urlObj := url.URL{}
+	if strings.Contains(host, "http://") {
+		urlObj.Scheme = "http"
+		urlObj.Host = strings.Replace(host, "http://", "", 1)
+	} else {
+		urlObj.Scheme = "https"
+		urlObj.Host = host
+	}
+	return urlObj
+}
 func hostToString(host *url.URL, reportID string) string {
 	q := host.Query()
 	q.Add("reportGUID", reportID) // TODO - do we add the reportID?