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

Add config to modify the buffered payload limit in choreo connect #3463

Merged
merged 2 commits into from
Nov 21, 2023
+11 −0
Merged

Add config to modify the buffered payload limit in choreo connect #3463

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
d7d2914
Add config to modify the max payload size in choreo connect
RusJaI Nov 20, 2023
7fe2f6d
Add unit test for the added property "perConnectionBufferLimitBytes"
RusJaI Nov 21, 2023
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
1 change: 1 addition & 0 deletions adapter/config/default_config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,7 @@ var defaultConfig = &Config{
},
},
},
PerConnectionBufferLimitBytes: 1048576,
},
Enforcer: enforcer{
Management: management{
Expand Down
1 change: 1 addition & 0 deletions adapter/config/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@ type envoy struct {
AwsLambda awsLambda
UseRemoteAddress bool
Filters filters
PerConnectionBufferLimitBytes uint32
}

type connectionTimeouts struct {
Expand Down
3 changes: 3 additions & 0 deletions adapter/internal/oasparser/envoyconf/listener.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ import (
logger "github.com/wso2/product-microgateway/adapter/internal/loggers"
"google.golang.org/protobuf/types/known/anypb"
"google.golang.org/protobuf/types/known/durationpb"
"google.golang.org/protobuf/types/known/wrapperspb"
)

// CreateRoutesConfigForRds generates the default RouteConfiguration.
Expand Down Expand Up @@ -185,6 +186,7 @@ func createListeners(conf *config.Config) []*listenerv3.Listener {
Filters: filters,
},
},
PerConnectionBufferLimitBytes: wrapperspb.UInt32(conf.Envoy.PerConnectionBufferLimitBytes),
}

tlsCert := generateTLSCert(conf.Envoy.KeyStore.KeyPath, conf.Envoy.KeyStore.CertPath)
Expand Down Expand Up @@ -263,6 +265,7 @@ func createListeners(conf *config.Config) []*listenerv3.Listener {
Filters: filters,
},
},
PerConnectionBufferLimitBytes: wrapperspb.UInt32(conf.Envoy.PerConnectionBufferLimitBytes),
}
listeners = append(listeners, &listener)
logger.LoggerOasparser.Infof("Non-secured Listener is added. %s : %d", listenerHostAddress, conf.Envoy.ListenerPort)
Expand Down
4 changes: 4 additions & 0 deletions adapter/internal/oasparser/envoyconf/listener_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ func TestCreateListenerWithRds(t *testing.T) {
assert.NotEmpty(t, securedListener.FilterChains, "Filter chain for listener should not be null.")
assert.NotNil(t, securedListener.FilterChains[0].GetTransportSocket(),
"Transport Socket should not be null for secured listener")
assert.Equal(t, uint32(1048576), securedListener.PerConnectionBufferLimitBytes.GetValue(),
"Buffered payload limit mismatch for secured Listener.")

nonSecuredListener := listeners[1]
if nonSecuredListener.Validate() != nil {
Expand All @@ -58,6 +60,8 @@ func TestCreateListenerWithRds(t *testing.T) {
assert.NotEmpty(t, nonSecuredListener.FilterChains, "Filter chain for listener should not be null.")
assert.Nil(t, nonSecuredListener.FilterChains[0].GetTransportSocket(),
"Transport Socket should be null for non-secured listener")
assert.Equal(t, uint32(1048576), nonSecuredListener.PerConnectionBufferLimitBytes.GetValue(),
"Buffered payload limit mismatch for non-secured Listener.")
}

func TestCreateVirtualHost(t *testing.T) {
Expand Down
2 changes: 2 additions & 0 deletions resources/conf/config.toml.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,8 @@ soapErrorInXMLEnabled = false
systemHost = "localhost"
# If configured true, router appends the immediate downstream ip address to the x-forward-for header
useRemoteAddress = false
# If configured with a custom value, the buffer limit per connection will be set to the provided value.
perConnectionBufferLimitBytes = 1048576

# Configurations of key store used in Choreo Connect Router
[router.keystore]
Expand Down
Loading