transfer to *Options struct

Signed-off-by: Afzal Ansari <[email protected]>

Author: afzal442

pkg/services/alertmanager.go

@@ -33,13 +33,13 @@ type AlertmanagerNotification struct {
 
 // AlertmanagerOptions cluster configuration
 type AlertmanagerOptions struct {
-	Targets            []string   `json:"targets"`
-	Scheme             string     `json:"scheme"`
-	APIPath            string     `json:"apiPath"`
-	BasicAuth          *BasicAuth `json:"basicAuth"`
-	BearerToken        string     `json:"bearerToken"`
-	InsecureSkipVerify bool       `json:"insecureSkipVerify"`
-	Timeout            int        `json:"timeout"`
+	Targets     []string                       `json:"targets"`
+	Scheme      string                         `json:"scheme"`
+	APIPath     string                         `json:"apiPath"`
+	BasicAuth   *BasicAuth                     `json:"basicAuth"`
+	BearerToken string                         `json:"bearerToken"`
+	Transport   httputil.HTTPTransportSettings `json:"transport"`
+	Timeout     int                            `json:"timeout"`
 }
 
 // NewAlertmanagerService new service
@@ -207,7 +207,7 @@ func (s alertmanagerService) Send(notification Notification, dest Destination) e
 func (s alertmanagerService) sendOneTarget(ctx context.Context, target string, rawBody []byte) error {
 	rawURL := fmt.Sprintf("%v://%v%v", s.opts.Scheme, target, s.opts.APIPath)
 
-	transport := httputil.NewTransport(rawURL, s.opts.InsecureSkipVerify)
+	transport := httputil.NewTransport(rawURL, s.opts.Transport)
 	client := &http.Client{
 		Transport: httputil.NewLoggingRoundTripper(transport, s.entry),
 	}

pkg/services/github.go

@@ -26,10 +26,11 @@ var (
 )
 
 type GitHubOptions struct {
-	AppID             interface{} `json:"appID"`
-	InstallationID    interface{} `json:"installationID"`
-	PrivateKey        string      `json:"privateKey"`
-	EnterpriseBaseURL string      `json:"enterpriseBaseURL"`
+	AppID             interface{}                    `json:"appID"`
+	InstallationID    interface{}                    `json:"installationID"`
+	PrivateKey        string                         `json:"privateKey"`
+	EnterpriseBaseURL string                         `json:"enterpriseBaseURL"`
+	Transport         httputil.HTTPTransportSettings `json:"transport"`
 }
 
 type GitHubNotification struct {
@@ -396,7 +397,7 @@ func NewGitHubService(opts GitHubOptions) (*gitHubService, error) {
 	}
 
 	tr := httputil.NewLoggingRoundTripper(
-		httputil.NewTransport(url, false), log.WithField("service", "github"))
+		httputil.NewTransport(url, opts.Transport), log.WithField("service", "github"))
 	itr, err := ghinstallation.New(tr, appID, installationID, []byte(opts.PrivateKey))
 	if err != nil {
 		return nil, err

pkg/util/http/transport.go

@@ -5,23 +5,32 @@ import (
 	"crypto/x509"
 	"net/http"
 	"net/url"
+	"time"
 )
 
+type HTTPTransportSettings struct {
+	MaxIdleConns        int           `json:"maxIdleConns"`
+	MaxIdleConnsPerHost int           `json:"maxIdleConnsPerHost"`
+	MaxConnsPerHost     int           `json:"maxConnsPerHost"`
+	IdleConnTimeout     time.Duration `json:"idleConnTimeout"`
+	InsecureSkipVerify  bool          `json:"insecureSkipVerify"`
+}
+
 var certResolver func(serverName string) ([]string, error)
 
 func SetCertResolver(resolver func(serverName string) ([]string, error)) {
 	certResolver = resolver
 }
 
-func NewTransport(rawURL string, insecureSkipVerify bool) *http.Transport {
+func NewTransport(rawURL string, set HTTPTransportSettings) *http.Transport {
 	transport := &http.Transport{
 		Proxy:               http.ProxyFromEnvironment,
-		MaxIdleConns:        0,
-		MaxIdleConnsPerHost: 0,
-		MaxConnsPerHost:     0,
-		IdleConnTimeout:     0,
+		MaxIdleConns:        set.MaxIdleConns,
+		MaxIdleConnsPerHost: set.MaxIdleConnsPerHost,
+		MaxConnsPerHost:     set.MaxConnsPerHost,
+		IdleConnTimeout:     set.IdleConnTimeout,
 	}
-	if insecureSkipVerify {
+	if set.InsecureSkipVerify {
 		transport.TLSClientConfig = &tls.Config{
 			InsecureSkipVerify: true,
 		}