Merge pull request #246 from deploymenttheory/dev-jl-version2

Adjusted full URL construction logic in integration

Author: thejoeker12

httpclient/client.go

@@ -56,7 +56,7 @@ func BuildClient(config ClientConfig, populateDefaultValues bool, log logger.Log
 		return nil, fmt.Errorf("invalid configuration: %v", err)
 	}
 
-	log.Info(fmt.Sprintf("initializing new http client, auth: %s", config.Integration.Domain()))
+	log.Info(fmt.Sprintf("initializing new http client, auth: %s", config.Integration.GetFQDN()))
 
 	httpClient := &http.Client{
 		Timeout: config.CustomTimeout,

httpclient/cookies.go

@@ -13,7 +13,7 @@ func (c *Client) loadCustomCookies(cookiesList []*http.Cookie) error {
 		return err
 	}
 
-	cookieUrl, err := url.Parse((*c.Integration).Domain())
+	cookieUrl, err := url.Parse((*c.Integration).GetFQDN())
 
 	if err != nil {
 		return err

httpclient/integration.go

@@ -7,7 +7,8 @@ import (
 
 // TODO comment
 type APIIntegration interface {
-	Domain() string
+	GetFQDN() string
+	ConstructURL(endpoint string) string
 	GetAuthMethodDescriptor() string
 	CheckRefreshToken() error
 	PrepRequestParamsAndAuth(req *http.Request) error

httpclient/multipartrequest.go

@@ -76,7 +76,7 @@ func (c *Client) DoMultiPartRequest(method, endpoint string, files map[string][]
 
 	log.Info("Executing multipart file upload request", zap.String("method", method), zap.String("endpoint", endpoint))
 
-	url := (*c.Integration).Domain() + endpoint
+	url := (*c.Integration).GetFQDN() + endpoint
 
 	// Create a context with timeout based on the custom timeout duration
 	ctx, cancel := context.WithTimeout(context.Background(), c.config.CustomTimeout)

httpclient/request.go

@@ -259,7 +259,7 @@ func (c *Client) doRequest(ctx context.Context, method, endpoint string, body in
 	}
 	requestDataBytes := bytes.NewBuffer(requestData)
 
-	url := (*c.Integration).Domain() + endpoint
+	url := (*c.Integration).ConstructURL(endpoint)
 
 	req, err := http.NewRequest(method, url, requestDataBytes)
 	if err != nil {