From 72dda4f9fd8dd2f01f67802a37bdea4cbe445c23 Mon Sep 17 00:00:00 2001
From: Ben Sarmiento <ben.sarmiento@forto.com>
Date: Thu, 11 Jan 2024 01:49:38 +0100
Subject: [PATCH] Reorder logic

---
 pkg/http/client.go | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/pkg/http/client.go b/pkg/http/client.go
index d4218b8..a2cf6d2 100644
--- a/pkg/http/client.go
+++ b/pkg/http/client.go
@@ -108,19 +108,17 @@ func NewHTTPClient(token string, maxRetries int, timeoutSecs int, cfg config.Con
 	if cfg.ShouldForceIPv6() {
 		dialer := &net.Dialer{}
 		dialContext := func(ctx context.Context, network, address string) (net.Conn, error) {
+			if ipv6Address, ok := client.ipv6.Get(address); ok {
+				return dialer.DialContext(ctx, network, ipv6Address)
+			}
 			host, port, err := net.SplitHostPort(address)
 			if err != nil {
 				return nil, err
 			}
-			if ipv6Address, ok := client.ipv6.Get(address); ok {
-				return dialer.DialContext(ctx, network, ipv6Address)
-			}
-
 			ips, err := net.DefaultResolver.LookupIPAddr(ctx, host)
 			if err != nil {
 				return nil, err
 			}
-
 			for _, ip := range ips {
 				if ip.IP.To4() == nil { // IPv6 address found
 					ip6Host := ip.IP.String()
@@ -131,7 +129,6 @@ func NewHTTPClient(token string, maxRetries int, timeoutSecs int, cfg config.Con
 			}
 			return dialer.DialContext(ctx, network, address)
 		}
-
 		transport := &http.Transport{
 			DialContext: dialContext,
 		}