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

Jump to bottom

Basic support for account load balancers #3027

Merged
merged 2 commits into from
Sep 16, 2024
Merged

Basic support for account load balancers #3027

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
53fad58
added basic support for upcomming account level load balancers
Sep 5, 2024
3df27db
refactor(load_balancing): collapse check and reuse rc.Level
jacobbednarz Sep 11, 2024
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
3 changes: 3 additions & 0 deletions .changelog/3027.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:enhancement
load_balancing: add account load balancer support
```
55 changes: 39 additions & 16 deletions load_balancing.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ type LoadBalancer struct {
CreatedOn *time.Time `json:"created_on,omitempty"`
ModifiedOn *time.Time `json:"modified_on,omitempty"`
Description string `json:"description"`
Name string `json:"name"`
Name string `json:"name,omitempty"`
TTL int `json:"ttl,omitempty"`
FallbackPool string `json:"fallback_pool"`
DefaultPools []string `json:"default_pools"`
Expand Down Expand Up @@ -144,6 +144,11 @@ type LoadBalancer struct {
//
// "": Maps to "geo" if RegionPools or PopPools or CountryPools have entries otherwise "off".
SteeringPolicy string `json:"steering_policy,omitempty"`

// TunnelID is the ID of the tunnel associated with this load balancer.
// It is only used for account load balancers and has no relation to any
// tunnels used as origins for this load balancer.
TunnelID string `json:"tunnel_id,omitempty"`
}

// LoadBalancerLoadShedding contains the settings for controlling load shedding.
Expand Down Expand Up @@ -681,12 +686,15 @@ func (api *API) UpdateLoadBalancerMonitor(ctx context.Context, rc *ResourceConta
//
// API reference: https://api.cloudflare.com/#load-balancers-create-load-balancer
func (api *API) CreateLoadBalancer(ctx context.Context, rc *ResourceContainer, params CreateLoadBalancerParams) (LoadBalancer, error) {
if rc.Level != ZoneRouteLevel {

var uri string
switch rc.Level {
case AccountRouteLevel, ZoneRouteLevel:
uri = fmt.Sprintf("/%s/%s/load_balancers", rc.Level, rc.Identifier)
default:
return LoadBalancer{}, fmt.Errorf(errInvalidResourceContainerAccess, rc.Level)
}

uri := fmt.Sprintf("/zones/%s/load_balancers", rc.Identifier)

res, err := api.makeRequestContext(ctx, http.MethodPost, uri, params.LoadBalancer)
if err != nil {
return LoadBalancer{}, err
Expand All @@ -702,11 +710,17 @@ func (api *API) CreateLoadBalancer(ctx context.Context, rc *ResourceContainer, p
//
// API reference: https://api.cloudflare.com/#load-balancers-list-load-balancers
func (api *API) ListLoadBalancers(ctx context.Context, rc *ResourceContainer, params ListLoadBalancerParams) ([]LoadBalancer, error) {
if rc.Level != ZoneRouteLevel {
return []LoadBalancer{}, fmt.Errorf(errInvalidResourceContainerAccess, rc.Level)

var uri string
switch rc.Level {
case AccountRouteLevel, ZoneRouteLevel:
uri = fmt.Sprintf("/%s/%s/load_balancers", rc.Level, rc.Identifier)
default:
return nil, fmt.Errorf(errInvalidResourceContainerAccess, rc.Level)
}

uri := buildURI(fmt.Sprintf("/zones/%s/load_balancers", rc.Identifier), params.PaginationOptions)
// add pagination options to the URI
uri = buildURI(uri, params.PaginationOptions)

res, err := api.makeRequestContext(ctx, http.MethodGet, uri, nil)
if err != nil {
Expand All @@ -723,16 +737,19 @@ func (api *API) ListLoadBalancers(ctx context.Context, rc *ResourceContainer, pa
//
// API reference: https://api.cloudflare.com/#load-balancers-load-balancer-details
func (api *API) GetLoadBalancer(ctx context.Context, rc *ResourceContainer, loadbalancerID string) (LoadBalancer, error) {
if rc.Level != ZoneRouteLevel {

var uri string
switch rc.Level {
case AccountRouteLevel, ZoneRouteLevel:
uri = fmt.Sprintf("/%s/%s/load_balancers/%s", rc.Level, rc.Identifier, loadbalancerID)
default:
return LoadBalancer{}, fmt.Errorf(errInvalidResourceContainerAccess, rc.Level)
}

if loadbalancerID == "" {
return LoadBalancer{}, ErrMissingLoadBalancerID
}

uri := fmt.Sprintf("/zones/%s/load_balancers/%s", rc.Identifier, loadbalancerID)

res, err := api.makeRequestContext(ctx, http.MethodGet, uri, nil)
if err != nil {
return LoadBalancer{}, err
Expand All @@ -748,16 +765,19 @@ func (api *API) GetLoadBalancer(ctx context.Context, rc *ResourceContainer, load
//
// API reference: https://api.cloudflare.com/#load-balancers-delete-load-balancer
func (api *API) DeleteLoadBalancer(ctx context.Context, rc *ResourceContainer, loadbalancerID string) error {
if rc.Level != ZoneRouteLevel {

var uri string
switch rc.Level {
case AccountRouteLevel, ZoneRouteLevel:
uri = fmt.Sprintf("/%s/%s/load_balancers/%s", rc.Level, rc.Identifier, loadbalancerID)
default:
return fmt.Errorf(errInvalidResourceContainerAccess, rc.Level)
}

if loadbalancerID == "" {
return ErrMissingLoadBalancerID
}

uri := fmt.Sprintf("/zones/%s/load_balancers/%s", rc.Identifier, loadbalancerID)

if _, err := api.makeRequestContext(ctx, http.MethodDelete, uri, nil); err != nil {
return err
}
Expand All @@ -768,16 +788,19 @@ func (api *API) DeleteLoadBalancer(ctx context.Context, rc *ResourceContainer, l
//
// API reference: https://api.cloudflare.com/#load-balancers-update-load-balancer
func (api *API) UpdateLoadBalancer(ctx context.Context, rc *ResourceContainer, params UpdateLoadBalancerParams) (LoadBalancer, error) {
if rc.Level != ZoneRouteLevel {

var uri string
switch rc.Level {
case AccountRouteLevel, ZoneRouteLevel:
uri = fmt.Sprintf("/%s/%s/load_balancers/%s", rc.Level, rc.Identifier, params.LoadBalancer.ID)
default:
return LoadBalancer{}, fmt.Errorf(errInvalidResourceContainerAccess, rc.Level)
}

if params.LoadBalancer.ID == "" {
return LoadBalancer{}, ErrMissingLoadBalancerID
}

uri := fmt.Sprintf("/zones/%s/load_balancers/%s", rc.Identifier, params.LoadBalancer.ID)

res, err := api.makeRequestContext(ctx, http.MethodPut, uri, params.LoadBalancer)
if err != nil {
return LoadBalancer{}, err
Expand Down
Loading
Loading