luxolus/open-consul
2
0
Fork 0
Code Issues 1 Pull requests Packages Releases Wiki Activity

Only lowercase the protocol when normalizing

Browse source
This commit is contained in:
freddygv 2021-03-15 14:12:15 -06:00
parent f584c2d7c5
commit 13cce3419a
2 changed files with 1 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
agent/structs/config_entry.go
View file

@ -706,11 +706,7 @@ func (cfg UpstreamConfig) MergeInto(dst map[string]interface{}, legacy bool) {
} }
func (cfg *UpstreamConfig) Normalize() { func (cfg *UpstreamConfig) Normalize() {
if cfg.Protocol == "" { cfg.Protocol = strings.ToLower(cfg.Protocol)
cfg.Protocol = "tcp"
} else {
cfg.Protocol = strings.ToLower(cfg.Protocol)
}
if cfg.ConnectTimeoutMs < 1 { if cfg.ConnectTimeoutMs < 1 {
cfg.ConnectTimeoutMs = 5000 cfg.ConnectTimeoutMs = 5000

12
agent/structs/config_entry_test.go
View file

@ -1575,12 +1575,10 @@ func TestServiceConfigEntry_Normalize(t *testing.T) {
ConnectTimeoutMs: 5000, ConnectTimeoutMs: 5000,
}, },
"memcached": { "memcached": {
Protocol: "tcp",
ConnectTimeoutMs: 5000, ConnectTimeoutMs: 5000,
}, },
}, },
UpstreamDefaults: &UpstreamConfig{ UpstreamDefaults: &UpstreamConfig{
Protocol: "tcp",
ConnectTimeoutMs: 5000, ConnectTimeoutMs: 5000,
}, },
}, },
@ -1771,7 +1769,6 @@ func TestParseUpstreamConfig(t *testing.T) {
input: nil, input: nil,
want: UpstreamConfig{ want: UpstreamConfig{
ConnectTimeoutMs: 5000, ConnectTimeoutMs: 5000,
Protocol: "tcp",
}, },
}, },
{ {
@ -1779,7 +1776,6 @@ func TestParseUpstreamConfig(t *testing.T) {
input: map[string]interface{}{}, input: map[string]interface{}{},
want: UpstreamConfig{ want: UpstreamConfig{
ConnectTimeoutMs: 5000, ConnectTimeoutMs: 5000,
Protocol: "tcp",
}, },
}, },
{ {
@ -1790,7 +1786,6 @@ func TestParseUpstreamConfig(t *testing.T) {
}, },
want: UpstreamConfig{ want: UpstreamConfig{
ConnectTimeoutMs: 5000, ConnectTimeoutMs: 5000,
Protocol: "tcp",
}, },
}, },
{ {
@ -1810,7 +1805,6 @@ func TestParseUpstreamConfig(t *testing.T) {
}, },
want: UpstreamConfig{ want: UpstreamConfig{
ConnectTimeoutMs: 1000, ConnectTimeoutMs: 1000,
Protocol: "tcp",
}, },
}, },
{ {
@ -1820,7 +1814,6 @@ func TestParseUpstreamConfig(t *testing.T) {
}, },
want: UpstreamConfig{ want: UpstreamConfig{
ConnectTimeoutMs: 1000, ConnectTimeoutMs: 1000,
Protocol: "tcp",
}, },
}, },
{ {
@ -1830,7 +1823,6 @@ func TestParseUpstreamConfig(t *testing.T) {
}, },
want: UpstreamConfig{ want: UpstreamConfig{
ConnectTimeoutMs: 1000, ConnectTimeoutMs: 1000,
Protocol: "tcp",
}, },
}, },
{ {
@ -1844,7 +1836,6 @@ func TestParseUpstreamConfig(t *testing.T) {
}, },
want: UpstreamConfig{ want: UpstreamConfig{
ConnectTimeoutMs: 5000, ConnectTimeoutMs: 5000,
Protocol: "tcp",
Limits: &UpstreamLimits{ Limits: &UpstreamLimits{
MaxConnections: intPointer(50), MaxConnections: intPointer(50),
MaxPendingRequests: intPointer(60), MaxPendingRequests: intPointer(60),
@ -1863,7 +1854,6 @@ func TestParseUpstreamConfig(t *testing.T) {
}, },
want: UpstreamConfig{ want: UpstreamConfig{
ConnectTimeoutMs: 5000, ConnectTimeoutMs: 5000,
Protocol: "tcp",
Limits: &UpstreamLimits{ Limits: &UpstreamLimits{
MaxConnections: intPointer(0), MaxConnections: intPointer(0),
MaxPendingRequests: intPointer(0), MaxPendingRequests: intPointer(0),
@ -1881,7 +1871,6 @@ func TestParseUpstreamConfig(t *testing.T) {
}, },
want: UpstreamConfig{ want: UpstreamConfig{
ConnectTimeoutMs: 5000, ConnectTimeoutMs: 5000,
Protocol: "tcp",
PassiveHealthCheck: &PassiveHealthCheck{ PassiveHealthCheck: &PassiveHealthCheck{
Interval: 22 * time.Second, Interval: 22 * time.Second,
MaxFailures: 7, MaxFailures: 7,
@ -1897,7 +1886,6 @@ func TestParseUpstreamConfig(t *testing.T) {
}, },
want: UpstreamConfig{ want: UpstreamConfig{
ConnectTimeoutMs: 5000, ConnectTimeoutMs: 5000,
Protocol: "tcp",
MeshGateway: MeshGatewayConfig{ MeshGateway: MeshGatewayConfig{
Mode: MeshGatewayModeRemote, Mode: MeshGatewayModeRemote,
}, },