Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
.idea/
.env
/vendor/
bin/
12 changes: 9 additions & 3 deletions router.go
Original file line number Diff line number Diff line change
Expand Up @@ -43,14 +43,20 @@ type RouterCreateRequest struct {
InternetGateway bool `json:"internet_gateway"`
}

// RouterUpdateRequest is not implemented yet because the API is not implemented yet
type RouterUpdateRequest struct{}
type RouterUpdateRequest struct {
ZonalResourceRequest
TaggedResourceRequest
Name string `json:"name,omitempty"`
// bool + omitempty: If we don't use a pointer to bool here, the value `false` causes the attribute to be omitted.
// This means setting the `internet_gateway` to false would cause an empty request body and thus a 400 Bad Request.
InternetGateway *bool `json:"internet_gateway,omitempty"`
}

type RouterService interface {
GenericCreateService[Router, RouterCreateRequest]
GenericGetService[Router]
GenericListService[Router]
// GenericUpdateService[Router, RouterUpdateRequest]
GenericUpdateService[Router, RouterUpdateRequest]
GenericDeleteService[Router]
GenericWaitForService[Router]
// CreateInterface creates a new interface attached to this router
Expand Down
35 changes: 35 additions & 0 deletions router_test.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package cloudscale

import (
"context"
"encoding/json"
"fmt"
"net/http"
Expand Down Expand Up @@ -48,6 +49,40 @@ func TestRouters_Create(t *testing.T) {
}
}

func TestRouters_Update(t *testing.T) {
setup()
defer teardown()

routerID := "cfde831a-4e87-4a75-960f-89b0148aa2cc"
newRouterName := "new-router-name"
updateRouterRequest := &RouterUpdateRequest{
Name: newRouterName,
}

mux.HandleFunc("/v1/routers/cfde831a-4e87-4a75-960f-89b0148aa2cc", func(w http.ResponseWriter, r *http.Request) {
testHTTPMethod(t, r, http.MethodPatch)

expected := map[string]any{
"name": newRouterName,
}

var v map[string]any
err := json.NewDecoder(r.Body).Decode(&v)
if err != nil {
t.Fatalf("decode json: %v", err)
}

if !reflect.DeepEqual(v, expected) {
t.Errorf("Request body = %#v, expected %#v", v, expected)
}
})

err := client.Routers.Update(context.TODO(), routerID, updateRouterRequest)
if err != nil {
t.Errorf("Routers.Update returned error: %v", err)
}
}

func TestRouters_Get(t *testing.T) {
setup()
defer teardown()
Expand Down
2 changes: 1 addition & 1 deletion test/integration/cloudscale_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ func DeleteRemainingRouters() bool {
}
err = client.Routers.Delete(context.Background(), router.UUID)
if err != nil {
log.Fatalf("Routers.Delete returned error %s\n", err)
log.Fatalf("Routers.Delete returned error: %s\n", err)
}
}
}
Expand Down
24 changes: 0 additions & 24 deletions test/integration/helper_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,9 @@ package integration

import (
"context"
"errors"
"math/rand"
"reflect"
"testing"
"time"

"github.com/cenkalti/backoff/v5"

"github.com/cloudscale-ch/cloudscale-go-sdk/v10"
)
Expand Down Expand Up @@ -50,23 +46,3 @@ func assertEqual(t *testing.T, expected any, actual any) {
t.Errorf("Assertion failed:\nexpected: %#v\n actual: %#v", expected, actual)
}
}

// waitForDeleted calls existsFunc in a backoff loop until exists is false.
func waitForDeleted(ctx context.Context, existsFunc func() (exists bool, err error)) error {
options := []backoff.RetryOption{
backoff.WithBackOff(backoff.NewConstantBackOff(2 * time.Second)),
backoff.WithMaxElapsedTime(5 * time.Minute),
}

_, err := backoff.Retry(ctx, func() (struct{}, error) {
exists, err := existsFunc()
if !exists {
return struct{}{}, nil
}
if err == nil {
return struct{}{}, errors.New("resource not deleted yet")
}
return struct{}{}, err
}, options...)
return err
}
Loading
Loading