Merge pull request #2913 from buildkite/override-tlsclientconfig-if-set

Only override TLSClientConfig if set
buildkite · Aug 1, 2024 · bc0689e · bc0689e
2 parents d9378e4 + dc92305
commit bc0689e
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/api/client.go b/api/client.go
@@ -89,7 +89,9 @@ func NewClient(l logger.Logger, conf Config) *Client {
 			tr.TLSClientConfig.NextProtos = []string{"http/1.1"}
 		}
 
-		tr.TLSClientConfig = conf.TLSConfig
+		if conf.TLSConfig != nil {
+			tr.TLSClientConfig = conf.TLSConfig
+		}
 
 		httpClient = &http.Client{
 			Timeout: 60 * time.Second,