Reverting httpsEndpoint for using https_port

internal/http_api/api_request.go

@@ -8,6 +8,7 @@ import (
 	"net"
 	"net/http"
 	"net/url"
+	"strconv"
 	"strings"
 	"time"
 )
@@ -120,7 +121,7 @@ retry:
 
 func httpsEndpoint(endpoint string, body []byte) (string, error) {
 	var forbiddenResp struct {
-		HTTPSAddr string `json:"https_addr"`
+		HTTPSPort int `json:"https_port"`
 	}
 	err := json.Unmarshal(body, &forbiddenResp)
 	if err != nil {
@@ -132,7 +133,12 @@ func httpsEndpoint(endpoint string, body []byte) (string, error) {
 		return "", err
 	}
 
+	host, _, err := net.SplitHostPort(u.Host)
+	if err != nil {
+		return "", err
+	}
+
 	u.Scheme = "https"
-	u.Host = forbiddenResp.HTTPSAddr
+	u.Host = net.JoinHostPort(host, strconv.Itoa(forbiddenResp.HTTPSPort))
 	return u.String(), nil
 }