From 740b5aa7723246d5bd7af6d695711264eeee5348 Mon Sep 17 00:00:00 2001 From: dwertent Date: Mon, 25 Oct 2021 11:55:08 +0300 Subject: [PATCH 1/2] add full url --- cautils/customerloader.go | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/cautils/customerloader.go b/cautils/customerloader.go index 499e7630..4c839583 100644 --- a/cautils/customerloader.go +++ b/cautils/customerloader.go @@ -158,6 +158,7 @@ func (c *ClusterConfig) GetDefaultNS() string { return c.defau func (c *ClusterConfig) GetBackendAPI() getter.IBackend { return c.backendAPI } func (c *ClusterConfig) GenerateURL() { + message := "\nCheckout for more cool features: " u := url.URL{} u.Scheme = "https" @@ -165,9 +166,8 @@ func (c *ClusterConfig) GenerateURL() { if c.configObj == nil { return } - message := fmt.Sprintf("\nCheckout for more cool features: https://%s\n", getter.GetArmoAPIConnector().GetFrontendURL()) if c.configObj.CustomerAdminEMail != "" { - InfoTextDisplay(os.Stdout, message+"\n") + InfoTextDisplay(os.Stdout, message+u.String()+"\n") return } u.Path = "account/sign-up" @@ -176,8 +176,7 @@ func (c *ClusterConfig) GenerateURL() { q.Add("customerGUID", c.configObj.CustomerGUID) u.RawQuery = q.Encode() - InfoTextDisplay(os.Stdout, message+"\n") - + InfoTextDisplay(os.Stdout, message+u.String()+"\n") } func (c *ClusterConfig) GetCustomerGUID() string { From d72700acf6754a43c949b731e6d782b2451d383b Mon Sep 17 00:00:00 2001 From: dwertent Date: Mon, 25 Oct 2021 12:05:51 +0300 Subject: [PATCH 2/2] update submit --- cautils/customerloader.go | 8 +++++--- clihandler/initcli.go | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/cautils/customerloader.go b/cautils/customerloader.go index 4c839583..44b79930 100644 --- a/cautils/customerloader.go +++ b/cautils/customerloader.go @@ -109,8 +109,10 @@ func ClusterConfigSetup(scanInfo *ScanInfo, k8s *k8sinterface.KubernetesApi, beA return NewEmptyConfig() // local - Delete local config & Do not send report } if scanInfo.Local { + scanInfo.Submit = false return NewEmptyConfig() // local - Do not send report } + scanInfo.Submit = true return clusterConfig // submit/default - Submit report } @@ -158,7 +160,7 @@ func (c *ClusterConfig) GetDefaultNS() string { return c.defau func (c *ClusterConfig) GetBackendAPI() getter.IBackend { return c.backendAPI } func (c *ClusterConfig) GenerateURL() { - message := "\nCheckout for more cool features: " + message := "Checkout for more cool features: " u := url.URL{} u.Scheme = "https" @@ -167,7 +169,7 @@ func (c *ClusterConfig) GenerateURL() { return } if c.configObj.CustomerAdminEMail != "" { - InfoTextDisplay(os.Stdout, message+u.String()+"\n") + InfoTextDisplay(os.Stdout, "\n\n"+message+u.String()+"\n\n") return } u.Path = "account/sign-up" @@ -176,7 +178,7 @@ func (c *ClusterConfig) GenerateURL() { q.Add("customerGUID", c.configObj.CustomerGUID) u.RawQuery = q.Encode() - InfoTextDisplay(os.Stdout, message+u.String()+"\n") + InfoTextDisplay(os.Stdout, "\n\n"+message+u.String()+"\n\n") } func (c *ClusterConfig) GetCustomerGUID() string { diff --git a/clihandler/initcli.go b/clihandler/initcli.go index 0ac9289e..1fdaae44 100644 --- a/clihandler/initcli.go +++ b/clihandler/initcli.go @@ -34,7 +34,7 @@ type componentInterfaces struct { } func getReporter(scanInfo *cautils.ScanInfo) reporter.IReport { - if scanInfo.Local { + if !scanInfo.Submit { return reporter.NewReportMock() } if !scanInfo.FrameworkScan {