CR comment - move the cache into the watcher and expose only the cache.Get method

Author: weilerN

pkg/dlx/dlx.go

@@ -24,7 +24,6 @@ import (
 	"context"
 	"net/http"
 
-	"github.com/v3io/scaler/pkg/ingresscache"
 	"github.com/v3io/scaler/pkg/kube"
 	"github.com/v3io/scaler/pkg/scalertypes"
 
@@ -53,23 +52,10 @@ func NewDLX(parentLogger logger.Logger,
 		return nil, errors.Wrap(err, "Failed to create function starter")
 	}
 
-	cache := ingresscache.NewIngressCache(childLogger)
-	handler, err := NewHandler(childLogger,
-		resourceStarter,
-		resourceScaler,
-		options.TargetNameHeader,
-		options.TargetPathHeader,
-		options.TargetPort,
-		options.MultiTargetStrategy)
-	if err != nil {
-		return nil, errors.Wrap(err, "Failed to create handler")
-	}
-
 	watcher, err := kube.NewIngressWatcher(
 		context.Background(),
 		childLogger,
 		options.KubeClientSet,
-		cache,
 		options.ResolveTargetsFromIngressCallback,
 		options.ResyncInterval,
 		options.Namespace,
@@ -79,6 +65,17 @@ func NewDLX(parentLogger logger.Logger,
 		return nil, errors.Wrap(err, "Failed to create ingress watcher")
 	}
 
+	handler, err := NewHandler(childLogger,
+		resourceStarter,
+		resourceScaler,
+		options.TargetNameHeader,
+		options.TargetPathHeader,
+		options.TargetPort,
+		options.MultiTargetStrategy)
+	if err != nil {
+		return nil, errors.Wrap(err, "Failed to create handler")
+	}
+
 	return &DLX{
 		logger:  childLogger,
 		handler: handler,

pkg/ingresscache/types.go

@@ -20,15 +20,19 @@ such restriction.
 
 package ingresscache
 
+type IngressHostCacheReader interface {
+	// Get retrieves all target names for the given host and path
+	Get(host string, path string) ([]string, error)
+}
+
 type IngressHostCache interface {
+	IngressHostCacheReader
+
 	// Set adds a new item to the cache for the given host, path and targets. Will overwrite existing values if any
 	Set(host string, path string, targets []string) error
 
 	// Delete removes the specified targets from the cache for the given host and path. Will do nothing if host, path or targets do not exist
 	Delete(host string, path string, targets []string) error
-
-	// Get retrieves all target names for the given host and path
-	Get(host string, path string) ([]string, error)
 }
 
 type IngressHostsTree interface {

pkg/kube/ingress.go

@@ -57,7 +57,6 @@ func NewIngressWatcher(
 	dlxCtx context.Context,
 	dlxLogger logger.Logger,
 	kubeClient kubernetes.Interface,
-	ingressCache ingresscache.IngressHostCache,
 	resolveTargetsCallback scalertypes.ResolveTargetsFromIngressCallback,
 	resyncInterval scalertypes.Duration,
 	namespace string,
@@ -83,7 +82,7 @@ func NewIngressWatcher(
 		ctx:                    ctxWithCancel,
 		cancel:                 cancel,
 		logger:                 dlxLogger.GetChild("watcher"),
-		cache:                  ingressCache,
+		cache:                  ingresscache.NewIngressCache(dlxLogger),
 		factory:                factory,
 		informer:               ingressInformer,
 		resolveTargetsCallback: resolveTargetsCallback,
@@ -119,6 +118,11 @@ func (iw *IngressWatcher) Stop() {
 	iw.factory.Shutdown()
 }
 
+// GetIngressHostCacheReader expose read-only access to the ingress cache
+func (iw *IngressWatcher) GetIngressHostCacheReader() ingresscache.IngressHostCacheReader {
+	return iw.cache
+}
+
 // --- ResourceEventHandler methods ---
 
 func (iw *IngressWatcher) AddHandler(obj interface{}) {

pkg/kube/ingress_test.go

@@ -25,7 +25,6 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/v3io/scaler/pkg/ingresscache"
 	"github.com/v3io/scaler/pkg/scalertypes"
 
 	"github.com/nuclio/logger"
@@ -562,7 +561,6 @@ func (suite *IngressWatcherTestSuite) createTestIngressWatcher() (*IngressWatche
 	return NewIngressWatcher(ctx,
 		suite.logger,
 		suite.kubeClientSet,
-		ingresscache.NewIngressCache(suite.logger),
 		suite.createMockResolveFunc(),
 		scalertypes.Duration{},
 		"test-namespace",