Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(instance): update placement-group now works #224

Merged
merged 1 commit into from
Oct 29, 2019
Merged

fix(instance): update placement-group now works #224

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
50 changes: 10 additions & 40 deletions api/instance/v1/instance_sdk.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1103,7 +1103,7 @@ type ServerTypeVolumeConstraintsByType struct {
}

type SetPlacementGroupResponse struct {
PlacementGroupID string `json:"placement_group_id"`
PlacementGroup *PlacementGroup `json:"placement_group"`
}

type SetPlacementGroupServersResponse struct {
Expand Down Expand Up @@ -1167,7 +1167,7 @@ type UpdateIPResponse struct {
}

type UpdatePlacementGroupResponse struct {
PlacementGroupID string `json:"placement_group_id"`
PlacementGroup *PlacementGroup `json:"placement_group"`
}

type UpdatePlacementGroupServersResponse struct {
Expand Down Expand Up @@ -3421,6 +3421,10 @@ func (s *API) CreatePlacementGroup(req *CreatePlacementGroupRequest, opts ...scw
req.Zone = defaultZone
}

if req.Name == "" {
req.Name = namegenerator.GetRandomName("pg")
}

if fmt.Sprint(req.Zone) == "" {
return nil, errors.New("field Zone cannot be empty in request")
}
Expand Down Expand Up @@ -3686,6 +3690,8 @@ type SetPlacementGroupServersRequest struct {
Zone scw.Zone `json:"-"`

PlacementGroupID string `json:"-"`

Servers []string `json:"servers"`
}

// SetPlacementGroupServers set placement group servers
Expand Down Expand Up @@ -3731,6 +3737,8 @@ type UpdatePlacementGroupServersRequest struct {
Zone scw.Zone `json:"-"`

PlacementGroupID string `json:"-"`

Servers []string `json:"servers,omitempty"`
}

// UpdatePlacementGroupServers update placement group servers
Expand Down Expand Up @@ -3772,44 +3780,6 @@ func (s *API) UpdatePlacementGroupServers(req *UpdatePlacementGroupServersReques
return &resp, nil
}

type DeletePlacementGroupServersRequest struct {
Zone scw.Zone `json:"-"`

PlacementGroupID string `json:"-"`
}

// DeletePlacementGroupServers delete placement group servers
//
// Delete all servers from the given placement group
func (s *API) DeletePlacementGroupServers(req *DeletePlacementGroupServersRequest, opts ...scw.RequestOption) error {
var err error

if req.Zone == "" {
defaultZone, _ := s.client.GetDefaultZone()
req.Zone = defaultZone
}

if fmt.Sprint(req.Zone) == "" {
return errors.New("field Zone cannot be empty in request")
}

if fmt.Sprint(req.PlacementGroupID) == "" {
return errors.New("field PlacementGroupID cannot be empty in request")
}

scwReq := &scw.ScalewayRequest{
Method: "DELETE",
Path: "/instance/v1/zones/" + fmt.Sprint(req.Zone) + "/placement_groups/" + fmt.Sprint(req.PlacementGroupID) + "/servers",
Headers: http.Header{},
}

err = s.client.Do(scwReq, nil, opts...)
if err != nil {
return err
}
return nil
}

type ListIPsRequest struct {
Zone scw.Zone `json:"-"`

Expand Down