Skip to content

Commit d72dd64

Browse files
yoink00yoink00
authored
Add go-vcr to test (#6)
* Add example that deletes all servers and all storage * Convert DeleteServerAndStorage and GetServers to use JSON API * Add JSON error unmarshalling for completeness of example * Correct error parsing for JSON API calls and add state transition wait to example * Convert CreateServer function to use JSON API * Change Error JSON unmarshal to avoid using maps * Fix JSON unmarshalling of SSH keys * Fix quoting of progress field in server test * Use a service per test and remove panics * Add failfast flag to tests * Add Client that allows HTTP client to be specified * Add go-vcr
1 parent b4de721 commit d72dd64

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
@@ -144,7 +144,7 @@ func (s *Service) GetServerDetails(r *request.GetServerDetailsRequest) (*upcloud
144144
func (s *Service) CreateServer(r *request.CreateServerRequest) (*upcloud.ServerDetails, error) {
145145
serverDetails := upcloud.ServerDetails{}
146146
requestBody, _ := json.Marshal(r)
147-
response, err := s.client.PerformJSONPostRequest(s.client.CreateRequestUrl(r.RequestURL()), requestBody)
147+
response, err := s.client.PerformJSONPostRequest(s.client.CreateRequestURL(r.RequestURL()), requestBody)
148148

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

203203
serverDetails := upcloud.ServerDetails{}
204-
response, err := s.client.PerformPostRequest(s.client.CreateRequestUrl(r.RequestURL()), nil)
204+
response, err := s.client.PerformPostRequest(s.client.CreateRequestURL(r.RequestURL()), nil)
205205

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

730731
if err != nil {

0 commit comments

Comments
 (0)