Fixed failing tests related to Proxies and LoadBalancer

sinadarbouy · Jul 17, 2024 · f90c704 · f90c704
1 parent e44b0a8
commit f90c704
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 10 deletions.
diff --git a/config/config.go b/config/config.go
@@ -160,6 +160,8 @@ func (c *Config) LoadDefaults(ctx context.Context) *gerr.GatewayDError {
 		CertFile:         "",
 		KeyFile:          "",
 		HandshakeTimeout: DefaultHandshakeTimeout,
+		Proxies:          []string{Default},
+		LoadBalancer:     LoadBalancer{Strategy: DefaultLoadBalancerStrategy},
 	}
 
 	c.globalDefaults = GlobalConfig{
@@ -413,7 +415,7 @@ func (c *Config) ValidateGlobalConfig(ctx context.Context) *gerr.GatewayDError {
 	}
 
 	var errors []*gerr.GatewayDError
-	configObjects := []string{"loggers", "metrics", "clients", "pools", "proxies", "servers"}
+	configObjects := []string{"loggers", "metrics", "servers"}
 	sort.Strings(configObjects)
 	var seenConfigObjects []string
 

diff --git a/config/constants.go b/config/constants.go
@@ -89,10 +89,11 @@ const (
 	DefaultHealthCheckPeriod = 60 * time.Second // This must match PostgreSQL authentication timeout.
 
 	// Server constants.
-	DefaultListenNetwork    = "tcp"
-	DefaultListenAddress    = "0.0.0.0:15432"
-	DefaultTickInterval     = 5 * time.Second
-	DefaultHandshakeTimeout = 5 * time.Second
+	DefaultListenNetwork        = "tcp"
+	DefaultListenAddress        = "0.0.0.0:15432"
+	DefaultTickInterval         = 5 * time.Second
+	DefaultHandshakeTimeout     = 5 * time.Second
+	DefaultLoadBalancerStrategy = "ROUND_ROBIN"
 
 	// Utility constants.
 	DefaultSeed = 1000

diff --git a/network/server_test.go b/network/server_test.go
@@ -114,11 +114,12 @@ func TestRunServer(t *testing.T) {
 			Options: Option{
 				EnableTicker: true,
 			},
-			Proxies:          []IProxy{proxy},
-			Logger:           logger,
-			PluginRegistry:   pluginRegistry,
-			PluginTimeout:    config.DefaultPluginTimeout,
-			HandshakeTimeout: config.DefaultHandshakeTimeout,
+			Proxies:                  []IProxy{proxy},
+			Logger:                   logger,
+			PluginRegistry:           pluginRegistry,
+			PluginTimeout:            config.DefaultPluginTimeout,
+			HandshakeTimeout:         config.DefaultHandshakeTimeout,
+			LoadbalancerStrategyName: RoundRobinStrategy,
 		},
 	)
 	assert.NotNil(t, server)