feat(servergroup): add methods for adding/removing server to/from servergroup (#286)

Author: kangasta

CHANGELOG.md

@@ -5,6 +5,9 @@ See updating [Changelog example here](https://keepachangelog.com/en/1.0.0/)
 
 ## [Unreleased]
 
+### Added
+- Server groups: Add `AddServerToServerGroup` and `RemoveServerFromServerGroup` methods.
+
 ## [6.11.0]
 
 ### Added

upcloud/request/server_group.go

@@ -105,3 +105,35 @@ type DeleteServerGroupRequest struct {
 func (s DeleteServerGroupRequest) RequestURL() string {
 	return fmt.Sprintf("%s/%s", serverGroupBasePath, s.UUID)
 }
+
+// AddServerToServerGroupRequest represents a request to add server to a server group
+type AddServerToServerGroupRequest struct {
+	ServerUUID string `json:"uuid,omitempty"`
+	UUID       string `json:"-"`
+}
+
+func (s AddServerToServerGroupRequest) RequestURL() string {
+	return fmt.Sprintf("%s/%s/servers", serverGroupBasePath, s.UUID)
+}
+
+// MarshalJSON is a custom marshaller that deals with deeply embedded values.
+func (r AddServerToServerGroupRequest) MarshalJSON() ([]byte, error) {
+	type c AddServerToServerGroupRequest
+	v := struct {
+		Server c `json:"server"`
+	}{}
+
+	v.Server = c(r)
+
+	return json.Marshal(&v)
+}
+
+// RemoveServerFromServerGroupRequest represents a request to remove server from a server group
+type RemoveServerFromServerGroupRequest struct {
+	ServerUUID string `json:"-"`
+	UUID       string `json:"-"`
+}
+
+func (s RemoveServerFromServerGroupRequest) RequestURL() string {
+	return fmt.Sprintf("%s/%s/servers/%s", serverGroupBasePath, s.UUID, s.ServerUUID)
+}

upcloud/request/server_group_test.go

@@ -211,3 +211,22 @@ func TestModifyServerGroupRequest(t *testing.T) {
 
 	assert.Equal(t, "/server-group/id", r.RequestURL())
 }
+
+func TestAddServerToServerGroupRequest(t *testing.T) {
+	expected := `
+	{
+		"server": {
+			"uuid": "test"
+		}
+	}
+	`
+
+	r := AddServerToServerGroupRequest{
+		UUID:       "id",
+		ServerUUID: "test",
+	}
+
+	actual, err := json.Marshal(&r)
+	assert.NoError(t, err)
+	assert.JSONEq(t, expected, string(actual))
+}

upcloud/service/server_group.go

@@ -13,6 +13,8 @@ type ServerGroup interface {
 	CreateServerGroup(ctx context.Context, r *request.CreateServerGroupRequest) (*upcloud.ServerGroup, error)
 	ModifyServerGroup(ctx context.Context, r *request.ModifyServerGroupRequest) (*upcloud.ServerGroup, error)
 	DeleteServerGroup(ctx context.Context, r *request.DeleteServerGroupRequest) error
+	AddServerToServerGroup(ctx context.Context, r *request.AddServerToServerGroupRequest) error
+	RemoveServerFromServerGroup(ctx context.Context, r *request.RemoveServerFromServerGroupRequest) error
 }
 
 // GetServerGroups retrieves a list of server groups with context (EXPERIMENTAL).
@@ -49,3 +51,14 @@ func (s *Service) ModifyServerGroup(ctx context.Context, r *request.ModifyServer
 func (s *Service) DeleteServerGroup(ctx context.Context, r *request.DeleteServerGroupRequest) error {
 	return s.delete(ctx, r)
 }
+
+// AddServerToServerGroup adds a server to a server group with context (EXPERIMENTAL).
+func (s *Service) AddServerToServerGroup(ctx context.Context, r *request.AddServerToServerGroupRequest) error {
+	var v interface{}
+	return s.create(ctx, r, v)
+}
+
+// RemoveServerFromServerGroup removes a server from a server group with context (EXPERIMENTAL).
+func (s *Service) RemoveServerFromServerGroup(ctx context.Context, r *request.RemoveServerFromServerGroupRequest) error {
+	return s.delete(ctx, r)
+}