Skip to content

Commit fa87c0b

Browse files
TrdlsTrdls
authored
Merge pull request #53 from opencredo/add_go_vcr_upcloud
Add go-vcr to tests
2 parents dfa680a + d72dd64 commit fa87c0b

File tree

6 files changed

+590
-473
lines changed

6 files changed

+590
-473
lines changed

‎go.mod‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,10 @@ require (
66
git.sr.ht/~yoink00/goflenfig v0.1.0
77
github.com/blang/semver v3.5.1+incompatible
88
github.com/davecgh/go-spew v1.1.1
9+
github.com/dnaeon/go-vcr v1.0.1
910
github.com/hashicorp/go-cleanhttp v0.5.1
1011
github.com/kr/pretty v0.1.0 // indirect
1112
github.com/stretchr/testify v1.6.1
1213
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect
14+
gopkg.in/yaml.v2 v2.3.0 // indirect
1315
)

‎go.sum‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8
66
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
77
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
88
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
9+
github.com/dnaeon/go-vcr v1.0.1 h1:r8L/HqC0Hje5AXMu1ooW8oyQyOFv4GxqpL0nRP7SLLY=
10+
github.com/dnaeon/go-vcr v1.0.1/go.mod h1:aBB1+wY4s93YsC3HHjMBMrwTj2R9FHDzUr9KyGc8n1E=
911
github.com/hashicorp/go-cleanhttp v0.5.1 h1:dH3aiDG9Jvb5r5+bYHsikaOUIpcM0xvgMXVoDkXMzJM=
1012
github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
1113
github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
@@ -21,5 +23,7 @@ github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
2123
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
2224
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
2325
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
26+
gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
27+
gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
2428
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
2529
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

‎scripts/build.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,5 +40,5 @@ go vet ./...
4040
staticcheck ./...
4141

4242
# Run tests
43-
go test ./... -v -parallel 1 -timeout 60m
43+
go test ./... -v -failfast -parallel 1 -timeout 60m $*
4444

‎upcloud/client/client.go‎

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,20 +28,27 @@ type Client struct {
2828
httpClient *http.Client
2929

3030
apiVersion string
31-
apiBaseUrl string
31+
apiBaseURL string
3232
}
3333

3434
// New creates ands returns a new client configured with the specified user and password
3535
func New(userName, password string) *Client {
36+
37+
return NewWithHTTPClient(userName, password, cleanhttp.DefaultClient())
38+
}
39+
40+
// NewWithHTTPClient creates ands returns a new client configured with the specified user and password and
41+
// using a supplied `http.Client`.
42+
func NewWithHTTPClient(userName string, password string, httpClient *http.Client) *Client {
3643
client := Client{}
3744

3845
client.userName = userName
3946
client.password = password
40-
client.httpClient = cleanhttp.DefaultClient()
47+
client.httpClient = httpClient
4148
client.SetTimeout(time.Second * DEFAULT_TIMEOUT)
4249

4350
client.apiVersion = DEFAULT_API_VERSION
44-
client.apiBaseUrl = DEFAULT_API_BASEURL
51+
client.apiBaseURL = DEFAULT_API_BASEURL
4552

4653
return &client
4754
}
@@ -56,9 +63,9 @@ func (c *Client) GetTimeout() time.Duration {
5663
return c.httpClient.Timeout
5764
}
5865

59-
// CreateRequestUrl creates and returns a complete request URL for the specified API location
60-
func (c *Client) CreateRequestUrl(location string) string {
61-
return fmt.Sprintf("%s%s", c.getBaseUrl(), location)
66+
// CreateRequestURL creates and returns a complete request URL for the specified API location
67+
func (c *Client) CreateRequestURL(location string) string {
68+
return fmt.Sprintf("%s%s", c.getBaseURL(), location)
6269
}
6370

6471
// PerformGetRequest performs a GET request to the specified URL and returns the response body and eventual errors
@@ -100,7 +107,7 @@ func (c *Client) PerformPostRequest(url string, requestBody []byte) ([]byte, err
100107
return c.performRequest(request)
101108
}
102109

103-
// PerformPostRequest performs a POST request to the specified URL and returns the response body and eventual errors
110+
// PerformJSONPostRequest performs a POST request to the specified URL and returns the response body and eventual errors
104111
func (c *Client) PerformJSONPostRequest(url string, requestBody []byte) ([]byte, error) {
105112
var bodyReader io.Reader
106113

@@ -201,10 +208,10 @@ func (c *Client) performJSONRequest(request *http.Request) ([]byte, error) {
201208
}
202209

203210
// Returns the base URL to use for API requests
204-
func (c *Client) getBaseUrl() string {
211+
func (c *Client) getBaseURL() string {
205212
urlVersion, _ := semver.Make(c.apiVersion)
206213

207-
return fmt.Sprintf("%s/%d.%d", c.apiBaseUrl, urlVersion.Major, urlVersion.Minor)
214+
return fmt.Sprintf("%s/%d.%d", c.apiBaseURL, urlVersion.Major, urlVersion.Minor)
208215
}
209216

210217
// Parses the response and returns either the response body or an error

‎upcloud/service/service.go‎

Lines changed: 31 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ func (s *Service) GetServerDetails(r *request.GetServerDetailsRequest) (*upcloud
143143
func (s *Service) CreateServer(r *request.CreateServerRequest) (*upcloud.ServerDetails, error) {
144144
serverDetails := upcloud.ServerDetails{}
145145
requestBody, _ := json.Marshal(r)
146-
response, err := s.client.PerformJSONPostRequest(s.client.CreateRequestUrl(r.RequestURL()), requestBody)
146+
response, err := s.client.PerformJSONPostRequest(s.client.CreateRequestURL(r.RequestURL()), requestBody)
147147

148148
if err != nil {
149149
return nil, parseJSONServiceError(err)
@@ -200,7 +200,7 @@ func (s *Service) StartServer(r *request.StartServerRequest) (*upcloud.ServerDet
200200
s.client.SetTimeout(r.Timeout)
201201

202202
serverDetails := upcloud.ServerDetails{}
203-
response, err := s.client.PerformPostRequest(s.client.CreateRequestUrl(r.RequestURL()), nil)
203+
response, err := s.client.PerformPostRequest(s.client.CreateRequestURL(r.RequestURL()), nil)
204204

205205
// Restore previous timout
206206
s.client.SetTimeout(prevTimeout)
@@ -221,7 +221,7 @@ func (s *Service) StopServer(r *request.StopServerRequest) (*upcloud.ServerDetai
221221

222222
serverDetails := upcloud.ServerDetails{}
223223
requestBody, _ := xml.Marshal(r)
224-
response, err := s.client.PerformPostRequest(s.client.CreateRequestUrl(r.RequestURL()), requestBody)
224+
response, err := s.client.PerformPostRequest(s.client.CreateRequestURL(r.RequestURL()), requestBody)
225225

226226
if err != nil {
227227
return nil, parseServiceError(err)
@@ -239,7 +239,7 @@ func (s *Service) RestartServer(r *request.RestartServerRequest) (*upcloud.Serve
239239

240240
serverDetails := upcloud.ServerDetails{}
241241
requestBody, _ := xml.Marshal(r)
242-
response, err := s.client.PerformPostRequest(s.client.CreateRequestUrl(r.RequestURL()), requestBody)
242+
response, err := s.client.PerformPostRequest(s.client.CreateRequestURL(r.RequestURL()), requestBody)
243243

244244
if err != nil {
245245
return nil, parseServiceError(err)
@@ -255,7 +255,7 @@ func (s *Service) RestartServer(r *request.RestartServerRequest) (*upcloud.Serve
255255
func (s *Service) ModifyServer(r *request.ModifyServerRequest) (*upcloud.ServerDetails, error) {
256256
serverDetails := upcloud.ServerDetails{}
257257
requestBody, _ := xml.Marshal(r)
258-
response, err := s.client.PerformPutRequest(s.client.CreateRequestUrl(r.RequestURL()), requestBody)
258+
response, err := s.client.PerformPutRequest(s.client.CreateRequestURL(r.RequestURL()), requestBody)
259259

260260
if err != nil {
261261
return nil, parseServiceError(err)
@@ -268,7 +268,7 @@ func (s *Service) ModifyServer(r *request.ModifyServerRequest) (*upcloud.ServerD
268268

269269
// DeleteServer deletes the specified server
270270
func (s *Service) DeleteServer(r *request.DeleteServerRequest) error {
271-
err := s.client.PerformDeleteRequest(s.client.CreateRequestUrl(r.RequestURL()))
271+
err := s.client.PerformDeleteRequest(s.client.CreateRequestURL(r.RequestURL()))
272272

273273
if err != nil {
274274
return parseServiceError(err)
@@ -279,7 +279,7 @@ func (s *Service) DeleteServer(r *request.DeleteServerRequest) error {
279279

280280
// DeleteServerAndStorages deletes the specified server and all attached storages
281281
func (s *Service) DeleteServerAndStorages(r *request.DeleteServerAndStoragesRequest) error {
282-
err := s.client.PerformJSONDeleteRequest(s.client.CreateRequestUrl(r.RequestURL()))
282+
err := s.client.PerformJSONDeleteRequest(s.client.CreateRequestURL(r.RequestURL()))
283283

284284
if err != nil {
285285
return parseJSONServiceError(err)
@@ -291,7 +291,7 @@ func (s *Service) DeleteServerAndStorages(r *request.DeleteServerAndStoragesRequ
291291
// TagServer tags a server with with one or more tags
292292
func (s *Service) TagServer(r *request.TagServerRequest) (*upcloud.ServerDetails, error) {
293293
serverDetails := upcloud.ServerDetails{}
294-
response, err := s.client.PerformPostRequest(s.client.CreateRequestUrl(r.RequestURL()), nil)
294+
response, err := s.client.PerformPostRequest(s.client.CreateRequestURL(r.RequestURL()), nil)
295295

296296
if err != nil {
297297
return nil, parseServiceError(err)
@@ -305,7 +305,7 @@ func (s *Service) TagServer(r *request.TagServerRequest) (*upcloud.ServerDetails
305305
// UntagServer removes one or more tags from a server
306306
func (s *Service) UntagServer(r *request.UntagServerRequest) (*upcloud.ServerDetails, error) {
307307
serverDetails := upcloud.ServerDetails{}
308-
response, err := s.client.PerformPostRequest(s.client.CreateRequestUrl(r.RequestURL()), nil)
308+
response, err := s.client.PerformPostRequest(s.client.CreateRequestURL(r.RequestURL()), nil)
309309

310310
if err != nil {
311311
return nil, parseServiceError(err)
@@ -320,7 +320,7 @@ func (s *Service) UntagServer(r *request.UntagServerRequest) (*upcloud.ServerDet
320320
func (s *Service) CreateTag(r *request.CreateTagRequest) (*upcloud.Tag, error) {
321321
tagDetails := upcloud.Tag{}
322322
requestBody, _ := xml.Marshal(r)
323-
response, err := s.client.PerformPostRequest(s.client.CreateRequestUrl(r.RequestURL()), requestBody)
323+
response, err := s.client.PerformPostRequest(s.client.CreateRequestURL(r.RequestURL()), requestBody)
324324

325325
if err != nil {
326326
return nil, parseServiceError(err)
@@ -335,7 +335,7 @@ func (s *Service) CreateTag(r *request.CreateTagRequest) (*upcloud.Tag, error) {
335335
func (s *Service) ModifyTag(r *request.ModifyTagRequest) (*upcloud.Tag, error) {
336336
tagDetails := upcloud.Tag{}
337337
requestBody, _ := xml.Marshal(r)
338-
response, err := s.client.PerformPutRequest(s.client.CreateRequestUrl(r.RequestURL()), requestBody)
338+
response, err := s.client.PerformPutRequest(s.client.CreateRequestURL(r.RequestURL()), requestBody)
339339

340340
if err != nil {
341341
return nil, parseServiceError(err)
@@ -348,7 +348,7 @@ func (s *Service) ModifyTag(r *request.ModifyTagRequest) (*upcloud.Tag, error) {
348348

349349
// DeleteTag deletes the specified tag
350350
func (s *Service) DeleteTag(r *request.DeleteTagRequest) error {
351-
err := s.client.PerformDeleteRequest(s.client.CreateRequestUrl(r.RequestURL()))
351+
err := s.client.PerformDeleteRequest(s.client.CreateRequestURL(r.RequestURL()))
352352

353353
if err != nil {
354354
return parseServiceError(err)
@@ -389,7 +389,7 @@ func (s *Service) GetStorageDetails(r *request.GetStorageDetailsRequest) (*upclo
389389
func (s *Service) CreateStorage(r *request.CreateStorageRequest) (*upcloud.StorageDetails, error) {
390390
storageDetails := upcloud.StorageDetails{}
391391
requestBody, _ := xml.Marshal(r)
392-
response, err := s.client.PerformPostRequest(s.client.CreateRequestUrl(r.RequestURL()), requestBody)
392+
response, err := s.client.PerformPostRequest(s.client.CreateRequestURL(r.RequestURL()), requestBody)
393393

394394
if err != nil {
395395
return nil, parseServiceError(err)
@@ -404,7 +404,7 @@ func (s *Service) CreateStorage(r *request.CreateStorageRequest) (*upcloud.Stora
404404
func (s *Service) ModifyStorage(r *request.ModifyStorageRequest) (*upcloud.StorageDetails, error) {
405405
storageDetails := upcloud.StorageDetails{}
406406
requestBody, _ := xml.Marshal(r)
407-
response, err := s.client.PerformPutRequest(s.client.CreateRequestUrl(r.RequestURL()), requestBody)
407+
response, err := s.client.PerformPutRequest(s.client.CreateRequestURL(r.RequestURL()), requestBody)
408408

409409
if err != nil {
410410
return nil, parseServiceError(err)
@@ -419,7 +419,7 @@ func (s *Service) ModifyStorage(r *request.ModifyStorageRequest) (*upcloud.Stora
419419
func (s *Service) AttachStorage(r *request.AttachStorageRequest) (*upcloud.ServerDetails, error) {
420420
serverDetails := upcloud.ServerDetails{}
421421
requestBody, _ := xml.Marshal(r)
422-
response, err := s.client.PerformPostRequest(s.client.CreateRequestUrl(r.RequestURL()), requestBody)
422+
response, err := s.client.PerformPostRequest(s.client.CreateRequestURL(r.RequestURL()), requestBody)
423423

424424
if err != nil {
425425
return nil, parseServiceError(err)
@@ -434,7 +434,7 @@ func (s *Service) AttachStorage(r *request.AttachStorageRequest) (*upcloud.Serve
434434
func (s *Service) DetachStorage(r *request.DetachStorageRequest) (*upcloud.ServerDetails, error) {
435435
serverDetails := upcloud.ServerDetails{}
436436
requestBody, _ := xml.Marshal(r)
437-
response, err := s.client.PerformPostRequest(s.client.CreateRequestUrl(r.RequestURL()), requestBody)
437+
response, err := s.client.PerformPostRequest(s.client.CreateRequestURL(r.RequestURL()), requestBody)
438438

439439
if err != nil {
440440
return nil, parseServiceError(err)
@@ -447,7 +447,7 @@ func (s *Service) DetachStorage(r *request.DetachStorageRequest) (*upcloud.Serve
447447

448448
// DeleteStorage deletes the specified storage device
449449
func (s *Service) DeleteStorage(r *request.DeleteStorageRequest) error {
450-
err := s.client.PerformDeleteRequest(s.client.CreateRequestUrl(r.RequestURL()))
450+
err := s.client.PerformDeleteRequest(s.client.CreateRequestURL(r.RequestURL()))
451451

452452
if err != nil {
453453
return parseServiceError(err)
@@ -460,7 +460,7 @@ func (s *Service) DeleteStorage(r *request.DeleteStorageRequest) error {
460460
func (s *Service) CloneStorage(r *request.CloneStorageRequest) (*upcloud.StorageDetails, error) {
461461
storageDetails := upcloud.StorageDetails{}
462462
requestBody, _ := xml.Marshal(r)
463-
response, err := s.client.PerformPostRequest(s.client.CreateRequestUrl(r.RequestURL()), requestBody)
463+
response, err := s.client.PerformPostRequest(s.client.CreateRequestURL(r.RequestURL()), requestBody)
464464

465465
if err != nil {
466466
return nil, parseServiceError(err)
@@ -475,7 +475,7 @@ func (s *Service) CloneStorage(r *request.CloneStorageRequest) (*upcloud.Storage
475475
func (s *Service) TemplatizeStorage(r *request.TemplatizeStorageRequest) (*upcloud.StorageDetails, error) {
476476
storageDetails := upcloud.StorageDetails{}
477477
requestBody, _ := xml.Marshal(r)
478-
response, err := s.client.PerformPostRequest(s.client.CreateRequestUrl(r.RequestURL()), requestBody)
478+
response, err := s.client.PerformPostRequest(s.client.CreateRequestURL(r.RequestURL()), requestBody)
479479

480480
if err != nil {
481481
return nil, parseServiceError(err)
@@ -519,7 +519,7 @@ func (s *Service) WaitForStorageState(r *request.WaitForStorageStateRequest) (*u
519519
func (s *Service) LoadCDROM(r *request.LoadCDROMRequest) (*upcloud.ServerDetails, error) {
520520
serverDetails := upcloud.ServerDetails{}
521521
requestBody, _ := xml.Marshal(r)
522-
response, err := s.client.PerformPostRequest(s.client.CreateRequestUrl(r.RequestURL()), requestBody)
522+
response, err := s.client.PerformPostRequest(s.client.CreateRequestURL(r.RequestURL()), requestBody)
523523

524524
if err != nil {
525525
return nil, parseServiceError(err)
@@ -534,7 +534,7 @@ func (s *Service) LoadCDROM(r *request.LoadCDROMRequest) (*upcloud.ServerDetails
534534
func (s *Service) EjectCDROM(r *request.EjectCDROMRequest) (*upcloud.ServerDetails, error) {
535535
serverDetails := upcloud.ServerDetails{}
536536
requestBody, _ := xml.Marshal(r)
537-
response, err := s.client.PerformPostRequest(s.client.CreateRequestUrl(r.RequestURL()), requestBody)
537+
response, err := s.client.PerformPostRequest(s.client.CreateRequestURL(r.RequestURL()), requestBody)
538538

539539
if err != nil {
540540
return nil, parseServiceError(err)
@@ -549,7 +549,7 @@ func (s *Service) EjectCDROM(r *request.EjectCDROMRequest) (*upcloud.ServerDetai
549549
func (s *Service) CreateBackup(r *request.CreateBackupRequest) (*upcloud.StorageDetails, error) {
550550
storageDetails := upcloud.StorageDetails{}
551551
requestBody, _ := xml.Marshal(r)
552-
response, err := s.client.PerformPostRequest(s.client.CreateRequestUrl(r.RequestURL()), requestBody)
552+
response, err := s.client.PerformPostRequest(s.client.CreateRequestURL(r.RequestURL()), requestBody)
553553

554554
if err != nil {
555555
return nil, parseServiceError(err)
@@ -563,7 +563,7 @@ func (s *Service) CreateBackup(r *request.CreateBackupRequest) (*upcloud.Storage
563563
// RestoreBackup creates a backup of the specified storage
564564
func (s *Service) RestoreBackup(r *request.RestoreBackupRequest) error {
565565
requestBody, _ := xml.Marshal(r)
566-
_, err := s.client.PerformPostRequest(s.client.CreateRequestUrl(r.RequestURL()), requestBody)
566+
_, err := s.client.PerformPostRequest(s.client.CreateRequestURL(r.RequestURL()), requestBody)
567567

568568
if err != nil {
569569
return parseServiceError(err)
@@ -604,7 +604,7 @@ func (s *Service) GetIPAddressDetails(r *request.GetIPAddressDetailsRequest) (*u
604604
func (s *Service) AssignIPAddress(r *request.AssignIPAddressRequest) (*upcloud.IPAddress, error) {
605605
ipAddress := upcloud.IPAddress{}
606606
requestBody, _ := xml.Marshal(r)
607-
response, err := s.client.PerformPostRequest(s.client.CreateRequestUrl(r.RequestURL()), requestBody)
607+
response, err := s.client.PerformPostRequest(s.client.CreateRequestURL(r.RequestURL()), requestBody)
608608

609609
if err != nil {
610610
return nil, parseServiceError(err)
@@ -619,7 +619,7 @@ func (s *Service) AssignIPAddress(r *request.AssignIPAddressRequest) (*upcloud.I
619619
func (s *Service) ModifyIPAddress(r *request.ModifyIPAddressRequest) (*upcloud.IPAddress, error) {
620620
ipAddress := upcloud.IPAddress{}
621621
requestBody, _ := xml.Marshal(r)
622-
response, err := s.client.PerformPutRequest(s.client.CreateRequestUrl(r.RequestURL()), requestBody)
622+
response, err := s.client.PerformPutRequest(s.client.CreateRequestURL(r.RequestURL()), requestBody)
623623

624624
if err != nil {
625625
return nil, parseServiceError(err)
@@ -632,7 +632,7 @@ func (s *Service) ModifyIPAddress(r *request.ModifyIPAddressRequest) (*upcloud.I
632632

633633
// ReleaseIPAddress releases the specified IP address from the server it is attached to
634634
func (s *Service) ReleaseIPAddress(r *request.ReleaseIPAddressRequest) error {
635-
err := s.client.PerformDeleteRequest(s.client.CreateRequestUrl(r.RequestURL()))
635+
err := s.client.PerformDeleteRequest(s.client.CreateRequestURL(r.RequestURL()))
636636

637637
if err != nil {
638638
return parseServiceError(err)
@@ -673,7 +673,7 @@ func (s *Service) GetFirewallRuleDetails(r *request.GetFirewallRuleDetailsReques
673673
func (s *Service) CreateFirewallRule(r *request.CreateFirewallRuleRequest) (*upcloud.FirewallRule, error) {
674674
firewallRule := upcloud.FirewallRule{}
675675
requestBody, _ := xml.Marshal(r)
676-
response, err := s.client.PerformPostRequest(s.client.CreateRequestUrl(r.RequestURL()), requestBody)
676+
response, err := s.client.PerformPostRequest(s.client.CreateRequestURL(r.RequestURL()), requestBody)
677677

678678
if err != nil {
679679
return nil, parseServiceError(err)
@@ -686,7 +686,7 @@ func (s *Service) CreateFirewallRule(r *request.CreateFirewallRuleRequest) (*upc
686686

687687
// DeleteFirewallRule deletes the specified firewall rule
688688
func (s *Service) DeleteFirewallRule(r *request.DeleteFirewallRuleRequest) error {
689-
err := s.client.PerformDeleteRequest(s.client.CreateRequestUrl(r.RequestURL()))
689+
err := s.client.PerformDeleteRequest(s.client.CreateRequestURL(r.RequestURL()))
690690

691691
if err != nil {
692692
return parseServiceError(err)
@@ -711,7 +711,7 @@ func (s *Service) GetTags() (*upcloud.Tags, error) {
711711

712712
// Wrapper that performs a GET request to the specified location and returns the response or a service error
713713
func (s *Service) basicGetRequest(location string) ([]byte, error) {
714-
requestUrl := s.client.CreateRequestUrl(location)
714+
requestUrl := s.client.CreateRequestURL(location)
715715
response, err := s.client.PerformGetRequest(requestUrl)
716716

717717
if err != nil {
@@ -723,7 +723,8 @@ func (s *Service) basicGetRequest(location string) ([]byte, error) {
723723

724724
// Wrapper that performs a GET request to the specified location and returns the response or a service error
725725
func (s *Service) basicJSONGetRequest(location string) ([]byte, error) {
726-
requestURL := s.client.CreateRequestUrl(location)
726+
requestURL := s.client.CreateRequestURL(location)
727+
727728
response, err := s.client.PerformJSONGetRequest(requestURL)
728729

729730
if err != nil {

0 commit comments

Comments
 (0)