From 5141d82e49e5f90704e4697718b6dceb32c42e07 Mon Sep 17 00:00:00 2001 From: Vlad Klokun Date: Wed, 17 Aug 2022 18:47:23 +0300 Subject: [PATCH] refactor!: rename NewArmoAPICustomized to NewKSCloudCustomized --- cmd/rootutils.go | 2 +- core/cautils/getter/armoapi.go | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/cmd/rootutils.go b/cmd/rootutils.go index e509a589..1010a278 100644 --- a/cmd/rootutils.go +++ b/cmd/rootutils.go @@ -84,6 +84,6 @@ func initEnvironment() { if len(urlSlices) >= 4 { ksAuthURL = urlSlices[3] } - getter.SetKSCloudAPIConnector(getter.NewARMOAPICustomized(ksEventReceiverURL, ksBackendURL, ksFrontendURL, ksAuthURL)) + getter.SetKSCloudAPIConnector(getter.NewKSCloudAPICustomized(ksEventReceiverURL, ksBackendURL, ksFrontendURL, ksAuthURL)) } } diff --git a/core/cautils/getter/armoapi.go b/core/cautils/getter/armoapi.go index 9beb0b35..bd6eb720 100644 --- a/core/cautils/getter/armoapi.go +++ b/core/cautils/getter/armoapi.go @@ -62,7 +62,7 @@ func GetKSCloudAPIConnector() *KSCloudAPI { } func NewKSCloudAPIDev() *KSCloudAPI { - apiObj := newArmoAPI() + apiObj := newKSCloudAPI() apiObj.apiURL = ksCloudDevBEURL apiObj.authURL = ksCloudDevAUTHURL @@ -73,7 +73,7 @@ func NewKSCloudAPIDev() *KSCloudAPI { } func NewKSCloudAPIProd() *KSCloudAPI { - apiObj := newArmoAPI() + apiObj := newKSCloudAPI() apiObj.apiURL = ksCloudBEURL apiObj.erURL = ksCloudERURL @@ -84,7 +84,7 @@ func NewKSCloudAPIProd() *KSCloudAPI { } func NewKSCloudAPIStaging() *KSCloudAPI { - apiObj := newArmoAPI() + apiObj := newKSCloudAPI() apiObj.apiURL = ksCloudStageBEURL apiObj.erURL = ksCloudStageERURL @@ -94,18 +94,18 @@ func NewKSCloudAPIStaging() *KSCloudAPI { return apiObj } -func NewARMOAPICustomized(armoERURL, armoBEURL, armoFEURL, armoAUTHURL string) *KSCloudAPI { - apiObj := newArmoAPI() +func NewKSCloudAPICustomized(ksCloudERURL, ksCloudBEURL, ksCloudFEURL, ksCloudAUTHURL string) *KSCloudAPI { + apiObj := newKSCloudAPI() - apiObj.erURL = armoERURL - apiObj.apiURL = armoBEURL - apiObj.feURL = armoFEURL - apiObj.authURL = armoAUTHURL + apiObj.erURL = ksCloudERURL + apiObj.apiURL = ksCloudBEURL + apiObj.feURL = ksCloudFEURL + apiObj.authURL = ksCloudAUTHURL return apiObj } -func newArmoAPI() *KSCloudAPI { +func newKSCloudAPI() *KSCloudAPI { return &KSCloudAPI{ httpClient: &http.Client{Timeout: time.Duration(61) * time.Second}, loggedIn: false,