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.

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

Fixing bug with minimumOrigins=0 #1338

Merged
merged 4 commits into from
Aug 1, 2023
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions .changelog/1338.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:bug
load_balancing: Fix pool creation with MinimumOrigins set to 0
```
2 changes: 1 addition & 1 deletion load_balancing.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ type LoadBalancerPool struct {
Description string `json:"description"`
Name string `json:"name"`
Enabled bool `json:"enabled"`
MinimumOrigins int `json:"minimum_origins,omitempty"`
MinimumOrigins *int `json:"minimum_origins,omitempty"`
Monitor string `json:"monitor,omitempty"`
Origins []LoadBalancerOrigin `json:"origins"`
NotificationEmail string `json:"notification_email,omitempty"`
Expand Down
67 changes: 66 additions & 1 deletion load_balancing_test.go
indeed-kelvin marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ func TestCreateLoadBalancerPool(t *testing.T) {
Description: "Primary data center - Provider XYZ",
Name: "primary-dc-1",
Enabled: true,
MinimumOrigins: 1,
MinimumOrigins: IntPtr(1),
Monitor: "f1aba936b94213e5b8dca0c0dbf1f9cc",
Latitude: fptr(55),
Longitude: fptr(-12.5),
Expand Down Expand Up @@ -183,6 +183,71 @@ func TestCreateLoadBalancerPool(t *testing.T) {
}
}

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

handler := func(w http.ResponseWriter, r *http.Request) {
assert.Equal(t, http.MethodPost, r.Method, "Expected method 'POST', got %s", r.Method)
w.Header().Set("content-type", "application/json")
b, err := io.ReadAll(r.Body)
defer r.Body.Close()
if assert.NoError(t, err) {
assert.JSONEq(t, `{
"description": "Primary data center - Provider XYZ",
"name": "primary-dc-2",
"minimum_origins": 0,
"enabled": true,
"check_regions": null,
"origins": null
}`, string(b))
}
fmt.Fprint(w, `{
"success": true,
"errors": [],
"messages": [],
"result": {
"description": "Primary data center - Provider XYZ",
"created_on": "2014-01-01T05:20:00.12345Z",
"modified_on": "2014-02-01T05:20:00.12345Z",
"id": "f6fea70e5154b4c563bd549ef405b7d7",
"enabled": true,
"minimum_origins": 0,
"name": "primary-dc-2",
"notification_email": "",
"check_regions": null,
"origins": []
}
}`)
}

mux.HandleFunc("/accounts/"+testAccountID+"/load_balancers/pools", handler)
createdOn, _ := time.Parse(time.RFC3339, "2014-01-01T05:20:00.12345Z")
modifiedOn, _ := time.Parse(time.RFC3339, "2014-02-01T05:20:00.12345Z")
want := LoadBalancerPool{
ID: "f6fea70e5154b4c563bd549ef405b7d7",
CreatedOn: &createdOn,
ModifiedOn: &modifiedOn,
Description: "Primary data center - Provider XYZ",
Name: "primary-dc-2",
Enabled: true,
MinimumOrigins: IntPtr(0),
Origins: []LoadBalancerOrigin{},
NotificationEmail: "",
}
request := LoadBalancerPool{
Description: "Primary data center - Provider XYZ",
Name: "primary-dc-2",
Enabled: true,
MinimumOrigins: IntPtr(0),
}

actual, err := client.CreateLoadBalancerPool(context.Background(), AccountIdentifier(testAccountID), CreateLoadBalancerPoolParams{LoadBalancerPool: request})
if assert.NoError(t, err) {
assert.Equal(t, want, actual)
}
}

func TestCreateLoadBalancerPool_ZoneIsNotSupported(t *testing.T) {
setup()
defer teardown()
Expand Down