11package serverscom
22
33import (
4- "bytes"
54 "context"
65 "encoding/json"
76 "fmt"
8- "io/ioutil"
97 "net/http"
108 "net/url"
119 "strings"
10+
11+ "github.com/go-resty/resty/v2"
1212)
1313
1414const defaultAPIEndpoint string = "https://api.servers.com/v1"
@@ -40,9 +40,7 @@ type Client struct {
4040
4141 KubernetesClusters KubernetesClustersService
4242
43- token string
44-
45- client * http.Client
43+ client * resty.Client
4644}
4745
4846// NewClient builds a new client with token
@@ -56,13 +54,15 @@ func NewClientWithEndpoint(token, baseURL string) *Client {
5654 Proxy : http .ProxyFromEnvironment ,
5755 }
5856
59- client := & http.Client {Transport : tr }
57+ rClient := resty .NewWithClient (& http.Client {Transport : tr })
58+
59+ rClient .SetAuthToken (token )
60+ rClient .SetHeader ("Content-Type" , "application/json" )
61+ rClient .SetHeader ("User-Agent" , "go-serverscom-client" )
6062
6163 scClient := & Client {
62- baseURL : baseURL ,
63- UserAgent : "go-serverscom-client" ,
64- token : token ,
65- client : client ,
64+ baseURL : baseURL ,
65+ client : rClient ,
6666 }
6767
6868 scClient .configureResources ()
@@ -75,6 +75,11 @@ func (cli *Client) SetupUserAgent(userAgent string) {
7575 cli .UserAgent = userAgent
7676}
7777
78+ // SetVerbose sets debug mode for client
79+ func (cli * Client ) SetVerbose (verbose bool ) {
80+ cli .client .SetDebug (verbose )
81+ }
82+
7883func (cli * Client ) configureResources () {
7984 cli .CloudComputingInstances = & CloudComputingInstancesHandler {cli }
8085 cli .Hosts = & HostsHandler {cli }
@@ -122,51 +127,31 @@ func (cli *Client) applyParams(endpointURL string, params map[string]string) str
122127 )
123128}
124129
125- func (cli * Client ) buildAndExecRequestWithResponse (ctx context.Context , method , endpointURL string , body []byte ) (* http.Response , []byte , error ) {
126- var req * http.Request
127- var err error
130+ func (cli * Client ) buildAndExecRequestWithResponse (ctx context.Context , method , endpointURL string , body []byte ) (* resty.Response , []byte , error ) {
131+ request := cli .client .R ().SetContext (ctx )
128132
129133 if body != nil {
130- reader := bytes .NewReader (body )
131- req , err = http .NewRequest (method , endpointURL , reader )
132- } else {
133- req , err = http .NewRequest (method , endpointURL , nil )
134- }
135-
136- if err != nil {
137- return nil , nil , err
134+ request .SetBody (body )
138135 }
139136
140- req .Header .Add ("Authorization" , fmt .Sprintf ("Bearer %s" , cli .token ))
141- req .Header .Add ("Content-Type" , "application/json" )
142- req .Header .Set ("User-Agent" , cli .UserAgent )
143-
144- resp , err := cli .client .Do (req .WithContext (ctx ))
145-
137+ resp , err := request .Execute (method , endpointURL )
146138 if err != nil {
147139 return nil , nil , fmt .Errorf ("Client request error: %q" , err )
148140 }
149141
150- defer resp .Body .Close ()
151-
152- contents , err := ioutil .ReadAll (resp .Body )
142+ contents := resp .Body ()
153143
154- if err != nil {
155- return nil , nil , fmt .Errorf ("Client can't read body: %q" , err )
156- }
157-
158- if resp .StatusCode < 400 {
144+ if resp .StatusCode () < 400 {
159145 return resp , contents , nil
160146 }
161147
162- contentType := resp .Header .Get ("Content-Type" )
163-
164- var responseError = responseErrorWrapper {}
148+ contentType := resp .Header ().Get ("Content-Type" )
149+ var responseError responseErrorWrapper
165150
166151 if strings .HasPrefix (contentType , "application/json" ) {
167152 if err := json .Unmarshal (contents , & responseError ); err != nil {
168153 return nil , nil , newParsingError (
169- resp .StatusCode ,
154+ resp .StatusCode () ,
170155 string (contents ),
171156 err ,
172157 )
@@ -176,23 +161,23 @@ func (cli *Client) buildAndExecRequestWithResponse(ctx context.Context, method,
176161 responseError .Message = string (contents )
177162 }
178163
179- switch resp .StatusCode {
164+ switch resp .StatusCode () {
180165 case 400 :
181- return nil , nil , newBadRequestError (resp .StatusCode , responseError .Code , responseError .Message )
166+ return nil , nil , newBadRequestError (resp .StatusCode () , responseError .Code , responseError .Message )
182167 case 401 :
183- return nil , nil , newUnauthorizedError (resp .StatusCode , responseError .Code , responseError .Message )
168+ return nil , nil , newUnauthorizedError (resp .StatusCode () , responseError .Code , responseError .Message )
184169 case 403 :
185- return nil , nil , newForbiddenError (resp .StatusCode , responseError .Code , responseError .Message )
170+ return nil , nil , newForbiddenError (resp .StatusCode () , responseError .Code , responseError .Message )
186171 case 404 :
187- return nil , nil , newNotFoundError (resp .StatusCode , responseError .Code , responseError .Message )
172+ return nil , nil , newNotFoundError (resp .StatusCode () , responseError .Code , responseError .Message )
188173 case 409 :
189- return nil , nil , newConflictError (resp .StatusCode , responseError .Code , responseError .Message )
174+ return nil , nil , newConflictError (resp .StatusCode () , responseError .Code , responseError .Message )
190175 case 422 :
191- return nil , nil , newUnprocessableEntityError (resp .StatusCode , responseError .Code , responseError .Message , responseError .Errors )
176+ return nil , nil , newUnprocessableEntityError (resp .StatusCode () , responseError .Code , responseError .Message , responseError .Errors )
192177 case 500 :
193- return nil , nil , newInternalServerError (resp .StatusCode , responseError .Code , responseError .Message )
178+ return nil , nil , newInternalServerError (resp .StatusCode () , responseError .Code , responseError .Message )
194179 default :
195- return nil , nil , fmt .Errorf ("Unexpected response code: %d, with body: %s" , resp .StatusCode , string (contents ))
180+ return nil , nil , fmt .Errorf ("Unexpected response code: %d, with body: %s" , resp .StatusCode () , string (contents ))
196181 }
197182}
198183
0 commit comments