Formatting fixes

Milanka00 · Jun 21, 2024 · 79c110f · 79c110f
1 parent a2be836
commit 79c110f
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 15 deletions.
diff --git a/adapter/config/default_config.go b/adapter/config/default_config.go
@@ -76,7 +76,7 @@ var defaultConfig = &Config{
 		SecuredListenerHost:              "0.0.0.0",
 		SecuredListenerPort:              9095,
 		NewListenerHost:                  "0.0.0.0",
-		NewListenerPort:				  9096,
+		NewListenerPort:                  9096,
 		ClusterTimeoutInSeconds:          20,
 		EnforcerResponseTimeoutInSeconds: 20,
 		MaximumResourcePathLengthInKB:    -1,
@@ -166,7 +166,6 @@ var defaultConfig = &Config{
 		Enabled: true,
 		Host:    "varnish",
 		Port:     80,
-
 	},	
 	Enforcer: enforcer{
 		Management: management{

diff --git a/adapter/config/types.go b/adapter/config/types.go
@@ -80,7 +80,7 @@ type Config struct {
 	GlobalAdapter globalAdapter `toml:"globalAdapter"`
 	Analytics     analytics     `toml:"analytics"`
 	Tracing       tracing
-	Varnish 	  varnish
+	Varnish       varnish
 }
 
 // Adapter related Configurations
@@ -113,8 +113,8 @@ type envoy struct {
 	ListenerPort                     uint32
 	SecuredListenerHost              string
 	SecuredListenerPort              uint32
-	NewListenerHost   				 string
-	NewListenerPort                  uint32
+	NewListenerHost                   string
+	NewListenerPort                   uint32
 	ClusterTimeoutInSeconds          time.Duration
 	EnforcerResponseTimeoutInSeconds time.Duration `default:"20"`
 	KeyStore                         keystore
@@ -152,9 +152,9 @@ type rateLimit struct {
 }
 
 type varnish struct{
-	Enabled                bool
-	Host				   string
-	Port				   uint32
+	Enabled             bool
+	Host                string
+	Port                uint32
 }
 
 type xRateLimitHeaders struct {

diff --git a/adapter/internal/oasparser/envoyconf/constants.go b/adapter/internal/oasparser/envoyconf/constants.go
@@ -21,9 +21,9 @@ const (
 	accessLoggerClusterName string = "access-logger"
 	grpcAccessLogLogName    string = "mgw_access_logs"
 	tracingClusterName      string = "wso2_cc_trace"
-	extAuthzHTTPCluster     string = "ext_authz_http_cluster"
-	rateLimitClusterName    string = "rate-limit"
-	varnishClusterName 		string = "varnish"
+	extAuthzHTTPCluster		string = "ext_authz_http_cluster"
+	rateLimitClusterName	string = "rate-limit"
+	varnishClusterName		string = "varnish"
 )
 
 const (

diff --git a/adapter/internal/oasparser/envoyconf/listener.go b/adapter/internal/oasparser/envoyconf/listener.go
@@ -86,7 +86,7 @@ func createListeners(conf *config.Config) []*listenerv3.Listener {
 	var listeners []*listenerv3.Listener
 
 	//creating the manager for exisitng listener
-	manager := createHttpConnectionManager(httpFilters, upgradeFilters, accessLogs, conf)
+	manager := createHTTPConnectionManager(httpFilters, upgradeFilters, accessLogs, conf)
 	pbst, err := anypb.New(manager)
 	if err != nil {
 		logger.LoggerOasparser.Fatal(err)
@@ -101,7 +101,7 @@ func createListeners(conf *config.Config) []*listenerv3.Listener {
 	filters = append(filters, &connectionManagerFilterP)
 
 	// Creating the new manager for new listener
-	newManager := createHttpConnectionManager(router, router, accessLogs, conf)
+	newManager := createHTTPConnectionManager(router, router, accessLogs, conf)
 	pbstNewManager, err := anypb.New(newManager)
 	if err != nil {
 		logger.LoggerOasparser.Fatal(err)
@@ -328,7 +328,7 @@ func getTracing(conf *config.Config) (*hcmv3.HttpConnectionManager_Tracing, erro
 }
 
 // function to create http managers
-func createHttpConnectionManager(httpFilters []*hcmv3.HttpFilter, upgradeFilters []*hcmv3.HttpFilter, accessLogs []*config_access_logv3.AccessLog, conf *config.Config) *hcmv3.HttpConnectionManager {
+func createHTTPConnectionManager(httpFilters []*hcmv3.HttpFilter, upgradeFilters []*hcmv3.HttpFilter, accessLogs []*config_access_logv3.AccessLog, conf *config.Config) *hcmv3.HttpConnectionManager {
     manager := &hcmv3.HttpConnectionManager{
         CodecType:  hcmv3.HttpConnectionManager_AUTO,
         StatPrefix: httpConManagerStartPrefix,

diff --git a/adapter/internal/oasparser/envoyconf/listener_test.go b/adapter/internal/oasparser/envoyconf/listener_test.go
@@ -31,7 +31,7 @@ func TestCreateListenerWithRds(t *testing.T) {
 	// TODO: (Vajira) Add more test scenarios
 	listeners := CreateListenersWithRds()
 	assert.NotEmpty(t, listeners, "Listeners creation has been failed")
-	assert.Equal(t, 2, len(listeners), "Two listeners are not created.")
+	assert.Equal(t, 3, len(listeners), "Two listeners are not created.")
 
 	securedListener := listeners[0]
 	if securedListener.Validate() != nil {