Undo dependency injection, refactor httpclient into struct

Author: Alex-CD

goal/goal.go

@@ -64,8 +64,8 @@ func putGoalHttp(goal string, configuration config.Configuration) error {
 	if err != nil {
 		return err
 	}
-	httpClient := httpclient.GetHttpClient(configuration.TimerInsecure)
-	_, err = httpclient.SendRequest(requestBody, "PUT", getGoalUrl(configuration), httpClient)
+	client := httpclient.CreateHttpClient(configuration.TimerInsecure)
+	_, err = client.SendRequest(requestBody, "PUT", getGoalUrl(configuration))
 	return err
 }
 
@@ -88,8 +88,8 @@ func deleteGoalHttp(room string, user string, timerService string, disableSslVer
 	if err != nil {
 		return err
 	}
-	httpClient := httpclient.GetHttpClient(disableSslVerification)
-	_, err = httpclient.SendRequest(requestBody, "DELETE", timerService+room+"/goal", httpClient)
+	client := httpclient.CreateHttpClient(disableSslVerification)
+	_, err = client.SendRequest(requestBody, "DELETE", timerService+room+"/goal")
 	return err
 }
 
@@ -108,7 +108,7 @@ func showGoal(configuration config.Configuration) error {
 }
 func getGoalHttp(room string, timerService string, disableSslVerification bool) (string, error) {
 	url := timerService + room + "/goal"
-	response, err := httpclient.GetHttpClient(disableSslVerification).Get(url)
+	response, err := httpclient.GetNetHttpClient(disableSslVerification).Get(url)
 	if err != nil {
 		say.Debug(err.Error())
 		return "", err

httpclient/httpclient.go

@@ -12,7 +12,21 @@ import (
 	"net/url"
 )
 
-func GetHttpClient(disableSSLVerification bool) *http.Client {
+type Client interface {
+	SendRequest(method string, url string, body []byte) error
+}
+
+type HttpClient struct {
+	netHttpClient *http.Client
+}
+
+func CreateHttpClient(disableSSLVerification bool) HttpClient {
+	return HttpClient{
+		netHttpClient: GetNetHttpClient(disableSSLVerification),
+	}
+}
+
+func GetNetHttpClient(disableSSLVerification bool) *http.Client {
 	if disableSSLVerification {
 		transCfg := &http.Transport{
 			TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
@@ -22,7 +36,7 @@ func GetHttpClient(disableSSLVerification bool) *http.Client {
 	return http.DefaultClient
 }
 
-func SendRequest(requestBody []byte, requestMethod string, requestUrl string, httpClient *http.Client) (string, error) {
+func (c HttpClient) SendRequest(requestBody []byte, requestMethod string, requestUrl string) (string, error) {
 	say.Info(requestMethod + " " + requestUrl + " " + string(requestBody))
 
 	responseBody := bytes.NewBuffer(requestBody)
@@ -33,7 +47,7 @@ func SendRequest(requestBody []byte, requestMethod string, requestUrl string, ht
 	}
 
 	request.Header.Set("Content-Type", "application/json")
-	response, responseErr := httpClient.Do(request)
+	response, responseErr := c.netHttpClient.Do(request)
 	if e, ok := responseErr.(*url.Error); ok {
 		switch e.Err.(type) {
 		case x509.UnknownAuthorityError:

timer.go

@@ -157,8 +157,8 @@ func httpPutTimer(timeoutInMinutes int, room string, user string, timerService s
 		"timer": timeoutInMinutes,
 		"user":  user,
 	})
-	httpClient := httpclient.GetHttpClient(disableSSLVerification)
-	_, err := httpclient.SendRequest(putBody, "PUT", timerService+room, httpClient)
+	client := httpclient.CreateHttpClient(disableSSLVerification)
+	_, err := client.SendRequest(putBody, "PUT", timerService+room)
 	return err
 }
 
@@ -167,8 +167,8 @@ func httpPutBreakTimer(timeoutInMinutes int, room string, user string, timerServ
 		"breaktimer": timeoutInMinutes,
 		"user":       user,
 	})
-	httpClient := httpclient.GetHttpClient(disableSSLVerification)
-	_, err := httpclient.SendRequest(putBody, "PUT", timerService+room, httpClient)
+	client := httpclient.CreateHttpClient(disableSSLVerification)
+	_, err := client.SendRequest(putBody, "PUT", timerService+room)
 	return err
 }