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

feat(lb): support projects #504

Merged
merged 3 commits into from
Aug 4, 2020
Merged

feat(lb): support projects #504

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
493ddb0
feat: update generated apis
scaleway-bot Jul 29, 2020
26f5be2
Merge branch 'master' into 1.1190.0
kindermoumoute Jul 30, 2020
3410dc0
fix example
kindermoumoute Aug 4, 2020
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
72 changes: 56 additions & 16 deletions api/lb/v1/lb_sdk.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1232,6 +1232,8 @@ type IP struct {

Reverse string `json:"reverse"`

ProjectID string `json:"project_id"`

Region scw.Region `json:"region"`
}

Expand Down Expand Up @@ -1279,6 +1281,8 @@ type LB struct {
// Default value: ssl_compatibility_level_unknown
SslCompatibilityLevel SSLCompatibilityLevel `json:"ssl_compatibility_level"`

ProjectID string `json:"project_id"`

Region scw.Region `json:"region"`
}

Expand Down Expand Up @@ -1458,8 +1462,10 @@ type ListLBsRequest struct {
PageSize *uint32 `json:"-"`

Page *int32 `json:"-"`

// OrganizationID: filter LBs by organization ID
OrganizationID *string `json:"-"`
// ProjectID: filter LBs by project ID
ProjectID *string `json:"-"`
}

// ListLBs: list load balancers
Expand All @@ -1482,6 +1488,7 @@ func (s *API) ListLBs(req *ListLBsRequest, opts ...scw.RequestOption) (*ListLBsR
parameter.AddToQuery(query, "page_size", req.PageSize)
parameter.AddToQuery(query, "page", req.Page)
parameter.AddToQuery(query, "organization_id", req.OrganizationID)
parameter.AddToQuery(query, "project_id", req.ProjectID)

if fmt.Sprint(req.Region) == "" {
return nil, errors.New("field Region cannot be empty in request")
Expand Down Expand Up @@ -1525,7 +1532,11 @@ func (r *ListLBsResponse) UnsafeAppend(res interface{}) (uint32, error) {
type CreateLBRequest struct {
Region scw.Region `json:"-"`
// OrganizationID: owner of resources
OrganizationID string `json:"organization_id"`
// Precisely one of OrganizationID, ProjectID must be set.
OrganizationID *string `json:"organization_id,omitempty"`
// ProjectID: assign the resource to a project ID
// Precisely one of OrganizationID, ProjectID must be set.
ProjectID *string `json:"project_id,omitempty"`
// Name: resource names
Name string `json:"name"`
// Description: resource description
Expand All @@ -1551,9 +1562,14 @@ type CreateLBRequest struct {
func (s *API) CreateLB(req *CreateLBRequest, opts ...scw.RequestOption) (*LB, error) {
var err error

if req.OrganizationID == "" {
defaultOrganizationID, _ := s.client.GetDefaultOrganizationID()
req.OrganizationID = defaultOrganizationID
defaultProjectID, exist := s.client.GetDefaultProjectID()
if exist && req.OrganizationID == nil && req.ProjectID == nil {
req.ProjectID = &defaultProjectID
}

defaultOrganizationID, exist := s.client.GetDefaultOrganizationID()
if exist && req.OrganizationID == nil && req.ProjectID == nil {
req.OrganizationID = &defaultOrganizationID
}

if req.Region == "" {
Expand Down Expand Up @@ -1780,8 +1796,10 @@ type ListIPsRequest struct {
PageSize *uint32 `json:"-"`
// IPAddress: use this to search by IP address
IPAddress *string `json:"-"`

// OrganizationID: filter IPs by organization id
OrganizationID *string `json:"-"`
// ProjectID: filter IPs by project ID
ProjectID *string `json:"-"`
}

// ListIPs: list IPs
Expand All @@ -1803,6 +1821,7 @@ func (s *API) ListIPs(req *ListIPsRequest, opts ...scw.RequestOption) (*ListIPsR
parameter.AddToQuery(query, "page_size", req.PageSize)
parameter.AddToQuery(query, "ip_address", req.IPAddress)
parameter.AddToQuery(query, "organization_id", req.OrganizationID)
parameter.AddToQuery(query, "project_id", req.ProjectID)

if fmt.Sprint(req.Region) == "" {
return nil, errors.New("field Region cannot be empty in request")
Expand Down Expand Up @@ -1846,7 +1865,11 @@ func (r *ListIPsResponse) UnsafeAppend(res interface{}) (uint32, error) {
type CreateIPRequest struct {
Region scw.Region `json:"-"`
// OrganizationID: owner of resources
OrganizationID string `json:"organization_id"`
// Precisely one of OrganizationID, ProjectID must be set.
OrganizationID *string `json:"organization_id,omitempty"`
// ProjectID: assign the resource to a project ID
// Precisely one of OrganizationID, ProjectID must be set.
ProjectID *string `json:"project_id,omitempty"`
// Reverse: reverse domain name
Reverse *string `json:"reverse"`
}
Expand All @@ -1855,9 +1878,14 @@ type CreateIPRequest struct {
func (s *API) CreateIP(req *CreateIPRequest, opts ...scw.RequestOption) (*IP, error) {
var err error

if req.OrganizationID == "" {
defaultOrganizationID, _ := s.client.GetDefaultOrganizationID()
req.OrganizationID = defaultOrganizationID
defaultProjectID, exist := s.client.GetDefaultProjectID()
if exist && req.OrganizationID == nil && req.ProjectID == nil {
req.ProjectID = &defaultProjectID
}

defaultOrganizationID, exist := s.client.GetDefaultOrganizationID()
if exist && req.OrganizationID == nil && req.ProjectID == nil {
req.OrganizationID = &defaultOrganizationID
}

if req.Region == "" {
Expand Down Expand Up @@ -3690,16 +3718,25 @@ type CreateSubscriberRequest struct {
// Precisely one of EmailConfig, WebhookConfig must be set.
WebhookConfig *SubscriberWebhookConfig `json:"webhook_config,omitempty"`
// OrganizationID: owner of resources
OrganizationID string `json:"organization_id"`
// Precisely one of OrganizationID, ProjectID must be set.
OrganizationID *string `json:"organization_id,omitempty"`
// ProjectID: assign the resource to a project ID
// Precisely one of OrganizationID, ProjectID must be set.
ProjectID *string `json:"project_id,omitempty"`
}

// CreateSubscriber: create a subscriber, webhook or email
func (s *API) CreateSubscriber(req *CreateSubscriberRequest, opts ...scw.RequestOption) (*Subscriber, error) {
var err error

if req.OrganizationID == "" {
defaultOrganizationID, _ := s.client.GetDefaultOrganizationID()
req.OrganizationID = defaultOrganizationID
defaultProjectID, exist := s.client.GetDefaultProjectID()
if exist && req.OrganizationID == nil && req.ProjectID == nil {
req.ProjectID = &defaultProjectID
}

defaultOrganizationID, exist := s.client.GetDefaultOrganizationID()
if exist && req.OrganizationID == nil && req.ProjectID == nil {
req.OrganizationID = &defaultOrganizationID
}

if req.Region == "" {
Expand Down Expand Up @@ -3781,8 +3818,10 @@ type ListSubscriberRequest struct {
PageSize *uint32 `json:"-"`
// Name: use this to search by name
Name *string `json:"-"`
// OrganizationID: owner of resources
// OrganizationID: filter Subscribers by organization ID
OrganizationID *string `json:"-"`
// ProjectID: filter Subscribers by project ID
ProjectID *string `json:"-"`
}

// ListSubscriber: list all subscriber
Expand All @@ -3805,6 +3844,7 @@ func (s *API) ListSubscriber(req *ListSubscriberRequest, opts ...scw.RequestOpti
parameter.AddToQuery(query, "page_size", req.PageSize)
parameter.AddToQuery(query, "name", req.Name)
parameter.AddToQuery(query, "organization_id", req.OrganizationID)
parameter.AddToQuery(query, "project_id", req.ProjectID)

if fmt.Sprint(req.Region) == "" {
return nil, errors.New("field Region cannot be empty in request")
Expand Down Expand Up @@ -3847,7 +3887,7 @@ func (r *ListSubscriberResponse) UnsafeAppend(res interface{}) (uint32, error) {

type UpdateSubscriberRequest struct {
Region scw.Region `json:"-"`
// SubscriberID: subscriber ID
// SubscriberID: assign the resource to a project IDs
SubscriberID string `json:"-"`
// Name: subscriber name
Name string `json:"name"`
Expand Down
2 changes: 1 addition & 1 deletion example_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ func Example_createLoadBalancer() {
newLB, err := lbAPI.CreateLB(&lb.CreateLBRequest{
Name: "My new load balancer",
Description: "This is a example of a load balancer",
OrganizationID: "000a115d-2852-4b0a-9ce8-47f1134ba95a",
OrganizationID: scw.StringPtr("000a115d-2852-4b0a-9ce8-47f1134ba95a"),
Region: scw.RegionFrPar,
})

Expand Down