Merge pull request #47 from castai/move_api_url_formation_to_config

sanitize api url in config
castai · Dec 13, 2021 · d57c2cd · d57c2cd
2 parents 80c2fd9 + b2b26b9
commit d57c2cd
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 10 deletions.
diff --git a/internal/castai/castai.go b/internal/castai/castai.go
@@ -10,7 +10,6 @@ import (
 	"io"
 	"net/http"
 	"net/url"
-	"strings"
 	"time"
 
 	"github.com/go-resty/resty/v2"
@@ -67,12 +66,7 @@ func NewDefaultClient() *resty.Client {
 
 	client := resty.New()
 
-	apiURL := cfg.URL
-	if !strings.HasPrefix(apiURL, "https://") && !strings.HasPrefix(apiURL, "http://") {
-		apiURL = fmt.Sprintf("https://%s", apiURL)
-	}
-
-	client.SetHostURL(apiURL)
+	client.SetHostURL(cfg.URL)
 	client.SetRetryCount(defaultRetryCount)
 	client.SetTimeout(defaultTimeout)
 	client.Header.Set(hdrAPIKey, cfg.Key)
@@ -90,7 +84,7 @@ func (c *client) SendDelta(ctx context.Context, clusterID string, delta *Delta)
 
 	cfg := config.Get().API
 
-	uri, err := url.Parse(fmt.Sprintf("https://%s/v1/kubernetes/clusters/%s/agent-deltas", cfg.URL, clusterID))
+	uri, err := url.Parse(fmt.Sprintf("%s/v1/kubernetes/clusters/%s/agent-deltas", cfg.URL, clusterID))
 	if err != nil {
 		return fmt.Errorf("invalid url: %w", err)
 	}

diff --git a/internal/config/config.go b/internal/config/config.go
@@ -2,6 +2,7 @@ package config
 
 import (
 	"fmt"
+	"strings"
 
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/viper"
@@ -116,6 +117,10 @@ func Get() Config {
 		required("API_URL")
 	}
 
+	if !strings.HasPrefix(cfg.API.URL, "https://") && !strings.HasPrefix(cfg.API.URL, "http://") {
+		cfg.API.URL = fmt.Sprintf("https://%s", cfg.API.URL)
+	}
+
 	if cfg.CASTAI != nil {
 		if cfg.CASTAI.ClusterID == "" {
 			requiredWhenDiscoveryDisabled("CASTAI_CLUSTER_ID")

diff --git a/internal/config/config_test.go b/internal/config/config_test.go
@@ -9,7 +9,7 @@ import (
 
 func TestConfig(t *testing.T) {
 	require.NoError(t, os.Setenv("API_KEY", "abc"))
-	require.NoError(t, os.Setenv("API_URL", "cast.ai"))
+	require.NoError(t, os.Setenv("API_URL", "api.cast.ai"))
 
 	require.NoError(t, os.Setenv("KUBECONFIG", "~/.kube/config"))
 
@@ -22,7 +22,7 @@ func TestConfig(t *testing.T) {
 	cfg := Get()
 
 	require.Equal(t, "abc", cfg.API.Key)
-	require.Equal(t, "cast.ai", cfg.API.URL)
+	require.Equal(t, "https://api.cast.ai", cfg.API.URL)
 
 	require.Equal(t, "~/.kube/config", cfg.Kubeconfig)