add review comments

Signed-off-by: Mario Fernandez <[email protected]>

Author: marioferh

pkg/manifests/amcfg.go

@@ -2,7 +2,9 @@ package manifests
 
 import (
 	"fmt"
+	"net/url"
 
+	"golang.org/x/net/http/httpproxy"
 	v1 "k8s.io/api/core/v1"
 )
 
@@ -183,16 +185,30 @@ func (f *Factory) ConvertToThanosAlertmanagerConfiguration(ta []AdditionalAlertm
 
 		cfg.StaticConfigs = a.StaticConfigs
 
-		switch cfg.Scheme {
-		case "http":
-			if proxy := f.proxy.HTTPProxy(); proxy != "" {
-				cfg.ProxyURL = proxy
+		httpConfig := httpproxy.Config{
+			HTTPProxy:  f.proxy.HTTPProxy(),
+			HTTPSProxy: f.proxy.HTTPSProxy(),
+			NoProxy:    f.proxy.NoProxy(),
+		}
+
+		proxyFunc := httpConfig.ProxyFunc()
+
+		if len(cfg.StaticConfigs) > 0 && cfg.StaticConfigs[0] != "" {
+			u := &url.URL{
+				Scheme: cfg.Scheme,
+				Host:   cfg.StaticConfigs[0],
 			}
-		case "https":
-			if proxy := f.proxy.HTTPSProxy(); proxy != "" {
-				cfg.ProxyURL = proxy
+
+			proxyURL, err := proxyFunc(u)
+			if err != nil {
+				return nil, err
+			}
+
+			if proxyURL != nil {
+				cfg.ProxyURL = proxyURL.String()
 			}
 		}
+
 		result[i] = cfg
 	}
 

pkg/manifests/manifests_test.go

@@ -2533,6 +2533,33 @@ func TestThanosRulerAdditionalAlertManagerConfigsSecret(t *testing.T) {
   - alertmanager1-remote.com
   - alertmanager1-remotex.com
   proxy_url: http://example.com:8080/
+`,
+		},
+		{
+			name: "no proxy",
+			userWorkloadConfig: `thanosRuler:
+  additionalAlertmanagerConfigs:
+  - apiVersion: v2
+    pathPrefix: /path-prefix
+    scheme: http
+    staticConfigs:
+    - local.example.com
+`,
+			expected: `alertmanagers:
+- scheme: https
+  api_version: v2
+  http_config:
+    bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token
+    tls_config:
+      ca_file: /etc/prometheus/configmaps/serving-certs-ca-bundle/service-ca.crt
+      server_name: alertmanager-main.openshift-monitoring.svc
+  static_configs:
+  - dnssrv+_web._tcp.alertmanager-operated.openshift-monitoring.svc
+- scheme: http
+  path_prefix: /path-prefix
+  api_version: v2
+  static_configs:
+  - local.example.com
 `,
 		},
 	}