[refactor] Passing down logger for FailureMode Setting

Signed-off-by: dd di cesare <[email protected]>
Kuadrant · Nov 20, 2024 · b70d785 · b70d785
1 parent eb66d70
commit b70d785
Show file tree

Hide file tree

Showing 5 changed files with 66 additions and 42 deletions.
diff --git a/controllers/envoy_gateway_extension_reconciler.go b/controllers/envoy_gateway_extension_reconciler.go
@@ -209,7 +209,7 @@ func (r *EnvoyGatewayExtensionReconciler) buildWasmConfigs(ctx context.Context,
 	wasmConfigs := lo.MapValues(wasmActionSets.Sorted(), func(configs kuadrantgatewayapi.SortableHTTPRouteMatchConfigs, _ string) wasm.Config {
 		return wasm.BuildConfigForActionSet(lo.Map(configs, func(c kuadrantgatewayapi.HTTPRouteMatchConfig, _ int) wasm.ActionSet {
 			return c.Config.(wasm.ActionSet)
-		}))
+		}), &logger)
 	})
 
 	return wasmConfigs, nil

diff --git a/controllers/istio_extension_reconciler.go b/controllers/istio_extension_reconciler.go
@@ -212,7 +212,7 @@ func (r *IstioExtensionReconciler) buildWasmConfigs(ctx context.Context, state *
 	wasmConfigs := lo.MapValues(wasmActionSets.Sorted(), func(configs kuadrantgatewayapi.SortableHTTPRouteMatchConfigs, _ string) wasm.Config {
 		return wasm.BuildConfigForActionSet(lo.Map(configs, func(c kuadrantgatewayapi.HTTPRouteMatchConfig, _ int) wasm.ActionSet {
 			return c.Config.(wasm.ActionSet)
-		}))
+		}), &logger)
 	})
 
 	return wasmConfigs, nil

diff --git a/pkg/wasm/utils.go b/pkg/wasm/utils.go
@@ -9,6 +9,8 @@ import (
 	"os"
 	"strings"
 
+	"github.com/go-logr/logr"
+
 	"github.com/kuadrant/policy-machinery/machinery"
 	"github.com/samber/lo"
 	"google.golang.org/protobuf/types/known/structpb"
@@ -31,19 +33,19 @@ func AuthServiceTimeout() string {
 	return env.GetString("AUTH_SERVICE_TIMEOUT", "200ms")
 }
 
-func AuthServiceFailureMode() FailureModeType {
-	return parseFailureModeValue("AUTH_SERVICE_FAILURE_MODE", FailureModeDeny)
+func AuthServiceFailureMode(logger *logr.Logger) FailureModeType {
+	return parseFailureModeValue("AUTH_SERVICE_FAILURE_MODE", FailureModeDeny, logger)
 }
 
 func RatelimitServiceTimeout() string {
 	return env.GetString("RATELIMIT_SERVICE_TIMEOUT", "100ms")
 }
 
-func RatelimitServiceFailureMode() FailureModeType {
-	return parseFailureModeValue("RATELIMIT_SERVICE_FAILURE_MODE", FailureModeAllow)
+func RatelimitServiceFailureMode(logger *logr.Logger) FailureModeType {
+	return parseFailureModeValue("RATELIMIT_SERVICE_FAILURE_MODE", FailureModeAllow, logger)
 }
 
-func parseFailureModeValue(envVarName string, defaultValue FailureModeType) FailureModeType {
+func parseFailureModeValue(envVarName string, defaultValue FailureModeType, logger *logr.Logger) FailureModeType {
 	value := os.Getenv(envVarName)
 	if value == "" {
 		return defaultValue
@@ -53,7 +55,7 @@ func parseFailureModeValue(envVarName string, defaultValue FailureModeType) Fail
 	case string(FailureModeAllow), string(FailureModeDeny):
 		return FailureModeType(value)
 	default:
-		fmt.Printf("Warning: Invalid value '%s' for %s. Using default value '%s'.\n", value, envVarName, defaultValue)
+		logger.Info("Warning: Invalid FailureMode value '%s' for %s. Using default value '%s'.\n", value, envVarName, defaultValue)
 		return defaultValue
 	}
 }
@@ -62,19 +64,19 @@ func ExtensionName(gatewayName string) string {
 	return fmt.Sprintf("kuadrant-%s", gatewayName)
 }
 
-func BuildConfigForActionSet(actionSets []ActionSet) Config {
+func BuildConfigForActionSet(actionSets []ActionSet, logger *logr.Logger) Config {
 	return Config{
 		Services: map[string]Service{
 			AuthServiceName: {
 				Type:        AuthServiceType,
 				Endpoint:    kuadrant.KuadrantAuthClusterName,
-				FailureMode: AuthServiceFailureMode(),
+				FailureMode: AuthServiceFailureMode(logger),
 				Timeout:     ptr.To(AuthServiceTimeout()),
 			},
 			RateLimitServiceName: {
 				Type:        RateLimitServiceType,
 				Endpoint:    kuadrant.KuadrantRateLimitClusterName,
-				FailureMode: RatelimitServiceFailureMode(),
+				FailureMode: RatelimitServiceFailureMode(logger),
 				Timeout:     ptr.To(RatelimitServiceTimeout()),
 			},
 		},

diff --git a/tests/envoygateway/extension_reconciler_test.go b/tests/envoygateway/extension_reconciler_test.go
@@ -7,7 +7,10 @@ import (
 	"strings"
 	"time"
 
+	"github.com/go-logr/logr"
+
 	egv1alpha1 "github.com/envoyproxy/gateway/api/v1alpha1"
+	"github.com/kuadrant/policy-machinery/controller"
 	"github.com/kuadrant/policy-machinery/machinery"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
@@ -37,6 +40,7 @@ var _ = Describe("wasm controller", func() {
 		gwHost        = fmt.Sprintf("*.toystore-%s.com", rand.String(4))
 		gatewayClass  *gatewayapiv1.GatewayClass
 		gateway       *gatewayapiv1.Gateway
+		logger        logr.Logger
 	)
 
 	BeforeEach(func(ctx SpecContext) {
@@ -49,6 +53,7 @@ var _ = Describe("wasm controller", func() {
 			Gateway
 		err = testClient().Create(ctx, gateway)
 		Expect(err).ToNot(HaveOccurred())
+		logger = controller.LoggerFromContext(ctx).WithName("EnvoyExtensionReconcilerTest")
 
 		Eventually(tests.GatewayIsReady(ctx, testClient(), gateway)).WithContext(ctx).Should(BeTrue())
 	})
@@ -171,13 +176,13 @@ var _ = Describe("wasm controller", func() {
 					wasm.AuthServiceName: {
 						Type:        wasm.AuthServiceType,
 						Endpoint:    kuadrant.KuadrantAuthClusterName,
-						FailureMode: wasm.AuthServiceFailureMode(),
+						FailureMode: wasm.AuthServiceFailureMode(&logger),
 						Timeout:     ptr.To(wasm.AuthServiceTimeout()),
 					},
 					wasm.RateLimitServiceName: {
 						Type:        wasm.RateLimitServiceType,
 						Endpoint:    kuadrant.KuadrantRateLimitClusterName,
-						FailureMode: wasm.RatelimitServiceFailureMode(),
+						FailureMode: wasm.RatelimitServiceFailureMode(&logger),
 						Timeout:     ptr.To(wasm.RatelimitServiceTimeout()),
 					},
 				},
@@ -337,13 +342,13 @@ var _ = Describe("wasm controller", func() {
 					wasm.AuthServiceName: {
 						Type:        wasm.AuthServiceType,
 						Endpoint:    kuadrant.KuadrantAuthClusterName,
-						FailureMode: wasm.AuthServiceFailureMode(),
+						FailureMode: wasm.AuthServiceFailureMode(&logger),
 						Timeout:     ptr.To(wasm.AuthServiceTimeout()),
 					},
 					wasm.RateLimitServiceName: {
 						Type:        wasm.RateLimitServiceType,
 						Endpoint:    kuadrant.KuadrantRateLimitClusterName,
-						FailureMode: wasm.RatelimitServiceFailureMode(),
+						FailureMode: wasm.RatelimitServiceFailureMode(&logger),
 						Timeout:     ptr.To(wasm.RatelimitServiceTimeout()),
 					},
 				},