refactor: simplify HTTP client initialization by using TransportOptions directly

afzal442 · afzal442 · commit 0cc134796b92 · 2025-11-05T10:54:01.000Z
Signed-off-by: Afzal Ansari &lt;afzal442@gmail.com&gt;
diff --git a/pkg/services/alertmanager.go b/pkg/services/alertmanager.go
@@ -208,13 +208,7 @@ func (s alertmanagerService) Send(notification Notification, dest Destination) e
 func (s alertmanagerService) sendOneTarget(ctx context.Context, target string, rawBody []byte) (err error) {
 	rawURL := fmt.Sprintf("%v://%v%v", s.opts.Scheme, target, s.opts.APIPath)
 
-	tp := httputil.TransportOptions{
-		MaxIdleConns:        s.opts.MaxIdleConns,
-		MaxIdleConnsPerHost: s.opts.MaxIdleConnsPerHost,
-		MaxConnsPerHost:     s.opts.MaxConnsPerHost,
-		IdleConnTimeout:     s.opts.IdleConnTimeout,
-	}
-	client, err := httputil.NewServiceHTTPClient(tp, s.opts.InsecureSkipVerify, rawURL, "alertmanager")
+	client, err := httputil.NewServiceHTTPClient(s.opts.TransportOptions, s.opts.InsecureSkipVerify, rawURL, "alertmanager")
 	if err != nil {
 		return err
 	}
diff --git a/pkg/services/github.go b/pkg/services/github.go
@@ -396,14 +396,7 @@ func NewGitHubService(opts GitHubOptions) (*gitHubService, error) {
 		return nil, err
 	}
 
-	tp := httputil.TransportOptions{
-		MaxIdleConns:        opts.MaxIdleConns,
-		MaxIdleConnsPerHost: opts.MaxIdleConnsPerHost,
-		MaxConnsPerHost:     opts.MaxConnsPerHost,
-		IdleConnTimeout:     opts.IdleConnTimeout,
-	}
-
-	client, err := httputil.NewServiceHTTPClient(tp, opts.InsecureSkipVerify, url, "github")
+	client, err := httputil.NewServiceHTTPClient(opts.TransportOptions, opts.InsecureSkipVerify, url, "github")
 	if err != nil {
 		return nil, err
 	}
diff --git a/pkg/services/googlechat.go b/pkg/services/googlechat.go
@@ -108,13 +108,7 @@ func (s googleChatService) getClient(recipient string) (googlechatclient *google
 		return nil, fmt.Errorf("no Google chat webhook configured for recipient %s", recipient)
 	}
 
-	tp := httputil.TransportOptions{
-		MaxIdleConns:        s.opts.MaxIdleConns,
-		MaxIdleConnsPerHost: s.opts.MaxIdleConnsPerHost,
-		MaxConnsPerHost:     s.opts.MaxConnsPerHost,
-		IdleConnTimeout:     s.opts.IdleConnTimeout,
-	}
-	client, err := httputil.NewServiceHTTPClient(tp, s.opts.InsecureSkipVerify, webhookUrl, "googlechat")
+	client, err := httputil.NewServiceHTTPClient(s.opts.TransportOptions, s.opts.InsecureSkipVerify, webhookUrl, "googlechat")
 	if err != nil {
 		return nil, err
 	}
diff --git a/pkg/services/grafana.go b/pkg/services/grafana.go
@@ -50,13 +50,7 @@ func (s *grafanaService) Send(notification Notification, dest Destination) (err
 		log.Warnf("Message is an empty string or not provided in the notifications template")
 	}
 
-	tp := httputil.TransportOptions{
-		MaxIdleConns:        s.opts.MaxIdleConns,
-		MaxIdleConnsPerHost: s.opts.MaxIdleConnsPerHost,
-		MaxConnsPerHost:     s.opts.MaxConnsPerHost,
-		IdleConnTimeout:     s.opts.IdleConnTimeout,
-	}
-	client, err := httputil.NewServiceHTTPClient(tp, s.opts.InsecureSkipVerify, s.opts.ApiUrl, "grafana")
+	client, err := httputil.NewServiceHTTPClient(s.opts.TransportOptions, s.opts.InsecureSkipVerify, s.opts.ApiUrl, "grafana")
 	if err != nil {
 		return err
 	}
diff --git a/pkg/services/mattermost.go b/pkg/services/mattermost.go
@@ -50,13 +50,7 @@ func NewMattermostService(opts MattermostOptions) NotificationService {
 }
 
 func (m *mattermostService) Send(notification Notification, dest Destination) (err error) {
-	tp := httputil.TransportOptions{
-		MaxIdleConns:        m.opts.MaxIdleConns,
-		MaxIdleConnsPerHost: m.opts.MaxIdleConnsPerHost,
-		MaxConnsPerHost:     m.opts.MaxConnsPerHost,
-		IdleConnTimeout:     m.opts.IdleConnTimeout,
-	}
-	client, err := httputil.NewServiceHTTPClient(tp, m.opts.InsecureSkipVerify, m.opts.ApiURL, "mattermost")
+	client, err := httputil.NewServiceHTTPClient(m.opts.TransportOptions, m.opts.InsecureSkipVerify, m.opts.ApiURL, "mattermost")
 	if err != nil {
 		return err
 	}
diff --git a/pkg/services/newrelic.go b/pkg/services/newrelic.go
@@ -134,13 +134,7 @@ func (s newrelicService) Send(notification Notification, dest Destination) (err
 		},
 	}
 
-	tp := httputil.TransportOptions{
-		MaxIdleConns:        s.opts.MaxIdleConns,
-		MaxIdleConnsPerHost: s.opts.MaxIdleConnsPerHost,
-		MaxConnsPerHost:     s.opts.MaxConnsPerHost,
-		IdleConnTimeout:     s.opts.IdleConnTimeout,
-	}
-	client, err := httputil.NewServiceHTTPClient(tp, s.opts.InsecureSkipVerify, s.opts.ApiURL, "newrelic")
+	client, err := httputil.NewServiceHTTPClient(s.opts.TransportOptions, s.opts.InsecureSkipVerify, s.opts.ApiURL, "newrelic")
 	if err != nil {
 		return err
 	}
diff --git a/pkg/services/opsgenie.go b/pkg/services/opsgenie.go
@@ -250,13 +250,7 @@ func (s *opsgenieService) Send(notification Notification, dest Destination) (err
 		return fmt.Errorf("no API key configured for recipient %s", dest.Recipient)
 	}
 
-	tp := httputil.TransportOptions{
-		MaxIdleConns:        s.opts.MaxIdleConns,
-		MaxIdleConnsPerHost: s.opts.MaxIdleConnsPerHost,
-		MaxConnsPerHost:     s.opts.MaxConnsPerHost,
-		IdleConnTimeout:     s.opts.IdleConnTimeout,
-	}
-	opsclient, err := httputil.NewServiceHTTPClient(tp, s.opts.InsecureSkipVerify, s.opts.ApiUrl, "opsgenie")
+	opsclient, err := httputil.NewServiceHTTPClient(s.opts.TransportOptions, s.opts.InsecureSkipVerify, s.opts.ApiUrl, "opsgenie")
 	if err != nil {
 		return err
 	}
diff --git a/pkg/services/slack.go b/pkg/services/slack.go
@@ -202,13 +202,7 @@ func newSlackClient(opts SlackOptions) (slackclient *slack.Client, err error) {
 		apiURL = opts.ApiURL
 	}
 
-	tp := httputil.TransportOptions{
-		MaxIdleConns:        opts.MaxIdleConns,
-		MaxIdleConnsPerHost: opts.MaxIdleConnsPerHost,
-		MaxConnsPerHost:     opts.MaxConnsPerHost,
-		IdleConnTimeout:     opts.IdleConnTimeout,
-	}
-	client, err := httputil.NewServiceHTTPClient(tp, opts.InsecureSkipVerify, apiURL, "slack")
+	client, err := httputil.NewServiceHTTPClient(opts.TransportOptions, opts.InsecureSkipVerify, apiURL, "slack")
 	if err != nil {
 		return nil, err
 	}
diff --git a/pkg/services/teams.go b/pkg/services/teams.go
@@ -155,13 +155,7 @@ func (s teamsService) Send(notification Notification, dest Destination) (err err
 		return fmt.Errorf("no teams webhook configured for recipient %s", dest.Recipient)
 	}
 
-	tp := httputil.TransportOptions{
-		MaxIdleConns:        s.opts.MaxIdleConns,
-		MaxIdleConnsPerHost: s.opts.MaxIdleConnsPerHost,
-		MaxConnsPerHost:     s.opts.MaxConnsPerHost,
-		IdleConnTimeout:     s.opts.IdleConnTimeout,
-	}
-	client, err := httputil.NewServiceHTTPClient(tp, s.opts.InsecureSkipVerify, webhookUrl, "teams")
+	client, err := httputil.NewServiceHTTPClient(s.opts.TransportOptions, s.opts.InsecureSkipVerify, webhookUrl, "teams")
 	if err != nil {
 		return err
 	}
diff --git a/pkg/services/webex.go b/pkg/services/webex.go
@@ -43,13 +43,7 @@ var validEmail = regexp.MustCompile(`^\S+@\S+\.\S+$`)
 func (w webexService) Send(notification Notification, dest Destination) (err error) {
 	requestURL := fmt.Sprintf("%s/v1/messages", w.opts.ApiURL)
 
-	tp := httputil.TransportOptions{
-		MaxIdleConns:        w.opts.MaxIdleConns,
-		MaxIdleConnsPerHost: w.opts.MaxIdleConnsPerHost,
-		MaxConnsPerHost:     w.opts.MaxConnsPerHost,
-		IdleConnTimeout:     w.opts.IdleConnTimeout,
-	}
-	client, err := httputil.NewServiceHTTPClient(tp, w.opts.InsecureSkipVerify, requestURL, "webex")
+	client, err := httputil.NewServiceHTTPClient(w.opts.TransportOptions, w.opts.InsecureSkipVerify, requestURL, "webex")
 	if err != nil {
 		return err
 	}
diff --git a/pkg/services/webhook.go b/pkg/services/webhook.go
@@ -172,13 +172,7 @@ func (r *request) execute(service *webhookService) (*http.Response, error) {
 		return nil, err
 	}
 
-	tp := httputil.TransportOptions{
-		MaxIdleConns:        service.opts.MaxIdleConns,
-		MaxIdleConnsPerHost: service.opts.MaxIdleConnsPerHost,
-		MaxConnsPerHost:     service.opts.MaxConnsPerHost,
-		IdleConnTimeout:     service.opts.IdleConnTimeout,
-	}
-	whclient, err := httputil.NewServiceHTTPClient(tp, service.opts.InsecureSkipVerify, service.opts.URL, r.destService)
+	whclient, err := httputil.NewServiceHTTPClient(service.opts.TransportOptions, service.opts.InsecureSkipVerify, service.opts.URL, r.destService)
 	if err != nil {
 		return nil, err
 	}

Original file line number	Diff line number	Diff line change
`@@ -108,13 +108,7 @@ func (s googleChatService) getClient(recipient string) (googlechatclient *google`
`108`	`108`	`return nil, fmt.Errorf("no Google chat webhook configured for recipient %s", recipient)`
`109`	`109`	`}`
`110`	`110`
`111`		`- tp := httputil.TransportOptions{`
`112`		`- MaxIdleConns: s.opts.MaxIdleConns,`
`113`		`- MaxIdleConnsPerHost: s.opts.MaxIdleConnsPerHost,`
`114`		`- MaxConnsPerHost: s.opts.MaxConnsPerHost,`
`115`		`- IdleConnTimeout: s.opts.IdleConnTimeout,`
`116`		`- }`
`117`		`- client, err := httputil.NewServiceHTTPClient(tp, s.opts.InsecureSkipVerify, webhookUrl, "googlechat")`
	`111`	`+ client, err := httputil.NewServiceHTTPClient(s.opts.TransportOptions, s.opts.InsecureSkipVerify, webhookUrl, "googlechat")`
`118`	`112`	`if err != nil {`
`119`	`113`	`return nil, err`
`120`	`114`	`}`
Original file line number	Diff line number	Diff line change
`@@ -50,13 +50,7 @@ func (s *grafanaService) Send(notification Notification, dest Destination) (err`
`50`	`50`	`log.Warnf("Message is an empty string or not provided in the notifications template")`
`51`	`51`	`}`
`52`	`52`
`53`		`- tp := httputil.TransportOptions{`
`54`		`- MaxIdleConns: s.opts.MaxIdleConns,`
`55`		`- MaxIdleConnsPerHost: s.opts.MaxIdleConnsPerHost,`
`56`		`- MaxConnsPerHost: s.opts.MaxConnsPerHost,`
`57`		`- IdleConnTimeout: s.opts.IdleConnTimeout,`
`58`		`- }`
`59`		`- client, err := httputil.NewServiceHTTPClient(tp, s.opts.InsecureSkipVerify, s.opts.ApiUrl, "grafana")`
	`53`	`+ client, err := httputil.NewServiceHTTPClient(s.opts.TransportOptions, s.opts.InsecureSkipVerify, s.opts.ApiUrl, "grafana")`
`60`	`54`	`if err != nil {`
`61`	`55`	`return err`
`62`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -50,13 +50,7 @@ func NewMattermostService(opts MattermostOptions) NotificationService {`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`func (m *mattermostService) Send(notification Notification, dest Destination) (err error) {`
`53`		`- tp := httputil.TransportOptions{`
`54`		`- MaxIdleConns: m.opts.MaxIdleConns,`
`55`		`- MaxIdleConnsPerHost: m.opts.MaxIdleConnsPerHost,`
`56`		`- MaxConnsPerHost: m.opts.MaxConnsPerHost,`
`57`		`- IdleConnTimeout: m.opts.IdleConnTimeout,`
`58`		`- }`
`59`		`- client, err := httputil.NewServiceHTTPClient(tp, m.opts.InsecureSkipVerify, m.opts.ApiURL, "mattermost")`
	`53`	`+ client, err := httputil.NewServiceHTTPClient(m.opts.TransportOptions, m.opts.InsecureSkipVerify, m.opts.ApiURL, "mattermost")`
`60`	`54`	`if err != nil {`
`61`	`55`	`return err`
`62`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -134,13 +134,7 @@ func (s newrelicService) Send(notification Notification, dest Destination) (err`
`134`	`134`	`},`
`135`	`135`	`}`
`136`	`136`
`137`		`- tp := httputil.TransportOptions{`
`138`		`- MaxIdleConns: s.opts.MaxIdleConns,`
`139`		`- MaxIdleConnsPerHost: s.opts.MaxIdleConnsPerHost,`
`140`		`- MaxConnsPerHost: s.opts.MaxConnsPerHost,`
`141`		`- IdleConnTimeout: s.opts.IdleConnTimeout,`
`142`		`- }`
`143`		`- client, err := httputil.NewServiceHTTPClient(tp, s.opts.InsecureSkipVerify, s.opts.ApiURL, "newrelic")`
	`137`	`+ client, err := httputil.NewServiceHTTPClient(s.opts.TransportOptions, s.opts.InsecureSkipVerify, s.opts.ApiURL, "newrelic")`
`144`	`138`	`if err != nil {`
`145`	`139`	`return err`
`146`	`140`	`}`
Original file line number	Diff line number	Diff line change
`@@ -250,13 +250,7 @@ func (s *opsgenieService) Send(notification Notification, dest Destination) (err`
`250`	`250`	`return fmt.Errorf("no API key configured for recipient %s", dest.Recipient)`
`251`	`251`	`}`
`252`	`252`
`253`		`- tp := httputil.TransportOptions{`
`254`		`- MaxIdleConns: s.opts.MaxIdleConns,`
`255`		`- MaxIdleConnsPerHost: s.opts.MaxIdleConnsPerHost,`
`256`		`- MaxConnsPerHost: s.opts.MaxConnsPerHost,`
`257`		`- IdleConnTimeout: s.opts.IdleConnTimeout,`
`258`		`- }`
`259`		`- opsclient, err := httputil.NewServiceHTTPClient(tp, s.opts.InsecureSkipVerify, s.opts.ApiUrl, "opsgenie")`
	`253`	`+ opsclient, err := httputil.NewServiceHTTPClient(s.opts.TransportOptions, s.opts.InsecureSkipVerify, s.opts.ApiUrl, "opsgenie")`
`260`	`254`	`if err != nil {`
`261`	`255`	`return err`
`262`	`256`	`}`
Original file line number	Diff line number	Diff line change
`@@ -202,13 +202,7 @@ func newSlackClient(opts SlackOptions) (slackclient *slack.Client, err error) {`
`202`	`202`	`apiURL = opts.ApiURL`
`203`	`203`	`}`
`204`	`204`
`205`		`- tp := httputil.TransportOptions{`
`206`		`- MaxIdleConns: opts.MaxIdleConns,`
`207`		`- MaxIdleConnsPerHost: opts.MaxIdleConnsPerHost,`
`208`		`- MaxConnsPerHost: opts.MaxConnsPerHost,`
`209`		`- IdleConnTimeout: opts.IdleConnTimeout,`
`210`		`- }`
`211`		`- client, err := httputil.NewServiceHTTPClient(tp, opts.InsecureSkipVerify, apiURL, "slack")`
	`205`	`+ client, err := httputil.NewServiceHTTPClient(opts.TransportOptions, opts.InsecureSkipVerify, apiURL, "slack")`
`212`	`206`	`if err != nil {`
`213`	`207`	`return nil, err`
`214`	`208`	`}`
Original file line number	Diff line number	Diff line change
`@@ -155,13 +155,7 @@ func (s teamsService) Send(notification Notification, dest Destination) (err err`
`155`	`155`	`return fmt.Errorf("no teams webhook configured for recipient %s", dest.Recipient)`
`156`	`156`	`}`
`157`	`157`
`158`		`- tp := httputil.TransportOptions{`
`159`		`- MaxIdleConns: s.opts.MaxIdleConns,`
`160`		`- MaxIdleConnsPerHost: s.opts.MaxIdleConnsPerHost,`
`161`		`- MaxConnsPerHost: s.opts.MaxConnsPerHost,`
`162`		`- IdleConnTimeout: s.opts.IdleConnTimeout,`
`163`		`- }`
`164`		`- client, err := httputil.NewServiceHTTPClient(tp, s.opts.InsecureSkipVerify, webhookUrl, "teams")`
	`158`	`+ client, err := httputil.NewServiceHTTPClient(s.opts.TransportOptions, s.opts.InsecureSkipVerify, webhookUrl, "teams")`
`165`	`159`	`if err != nil {`
`166`	`160`	`return err`
`167`	`161`	`}`