Skip to content

Commit

Permalink
Merge branch 'main' into net-2904-apigw-http-route-service-weight-div…
Browse files Browse the repository at this point in the history
…ision-error
  • Loading branch information
missylbytes authored Mar 3, 2023
2 parents c49776e + 129eca8 commit bc830dd
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 2 deletions.
3 changes: 3 additions & 0 deletions .changelog/16512.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:bug
gateways: fix HTTPRoute bug where service weights could be less than or equal to 0 and result in a downstream envoy protocol error
```
4 changes: 3 additions & 1 deletion agent/structs/config_entry_routes.go
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,9 @@ func (e *HTTPRouteConfigEntry) Normalize() error {

func normalizeHTTPService(service HTTPService) HTTPService {
service.EnterpriseMeta.Normalize()

if service.Weight <= 0 {
service.Weight = 1
}
return service
}

Expand Down
22 changes: 22 additions & 0 deletions agent/structs/config_entry_routes_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -262,6 +262,28 @@ func TestHTTPRoute(t *testing.T) {
}},
},
},
"rule normalizes service weight": {
entry: &HTTPRouteConfigEntry{
Kind: HTTPRoute,
Name: "route-one",
Rules: []HTTPRouteRule{{
Services: []HTTPService{
{
Name: "test",
Weight: 0,
},
{
Name: "test2",
Weight: -1,
}},
}},
},
check: func(t *testing.T, entry ConfigEntry) {
route := entry.(*HTTPRouteConfigEntry)
require.Equal(t, 1, route.Rules[0].Services[0].Weight)
require.Equal(t, 1, route.Rules[0].Services[1].Weight)
},
},
}
testConfigEntryNormalizeAndValidate(t, cases)
}
Original file line number Diff line number Diff line change
Expand Up @@ -630,7 +630,8 @@ Specifies the Enterprise [admin partition](/consul/docs/enterprise/admin-partiti

### `Rules[].Services[].Weight`

Specifies the proportion of requests forwarded to the specified service. The
Specifies the proportion of requests forwarded to the specified service. If no weight is specified, or if the specified
weight is set to less than or equal to `0`, the weight is normalized to `1`. The
proportion is determined by dividing the value of the weight by the sum of all
weights in the service list. For non-zero values, there may be some deviation
from the exact proportion depending on the precision an implementation
Expand Down

0 comments on commit bc830dd

Please sign in to comment.