Passing logger to updater (#698)

passing logger to updater
kyma-project · Apr 22, 2024 · 222402b · 222402b
1 parent 9faa660
commit 222402b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/internal/kymacustomresource/kyma_cr_updater.go b/internal/kymacustomresource/kyma_cr_updater.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"fmt"
 	"log/slog"
-	"os"
 	"time"
 
 	"github.com/kyma-project/kyma-environment-broker/internal/syncqueues"
@@ -29,8 +28,7 @@ type Updater struct {
 	logger        *slog.Logger
 }
 
-func NewUpdater(k8sClient dynamic.Interface, queue syncqueues.MultiConsumerPriorityQueue, gvr schema.GroupVersionResource, sleepDuration time.Duration, labelKey string) (*Updater, error) {
-	logger := slog.New(slog.NewJSONHandler(os.Stdout, nil))
+func NewUpdater(k8sClient dynamic.Interface, queue syncqueues.MultiConsumerPriorityQueue, gvr schema.GroupVersionResource, sleepDuration time.Duration, labelKey string, logger *slog.Logger) (*Updater, error) {
 
 	logger.Info(fmt.Sprintf("Creating Kyma CR updater for label: %s", labelKey))
 

diff --git a/internal/kymacustomresource/kyma_cr_updater_test.go b/internal/kymacustomresource/kyma_cr_updater_test.go
@@ -61,7 +61,7 @@ func TestUpdater(t *testing.T) {
 
 		queue := syncqueues.NewPriorityQueueWithCallbacksForSize(log, nil, 4)
 		fakeK8sClient := fake.NewSimpleDynamicClient(scheme, mockKymaCR)
-		updater, err := NewUpdater(fakeK8sClient, queue, gvr, timeout, betaEnabledLabelKey)
+		updater, err := NewUpdater(fakeK8sClient, queue, gvr, timeout, betaEnabledLabelKey, log)
 		require.NoError(t, err)
 
 		// when
@@ -96,7 +96,7 @@ func TestUpdater(t *testing.T) {
 		assert.False(t, queue.IsEmpty())
 
 		fakeK8sClient := fake.NewSimpleDynamicClient(scheme, mockKymaCR)
-		updater, err := NewUpdater(fakeK8sClient, queue, gvr, timeout, betaEnabledLabelKey)
+		updater, err := NewUpdater(fakeK8sClient, queue, gvr, timeout, betaEnabledLabelKey, log)
 		require.NoError(t, err)
 
 		// when
@@ -140,7 +140,7 @@ func TestUpdater(t *testing.T) {
 		assert.False(t, queue.IsEmpty())
 
 		fakeK8sClient := fake.NewSimpleDynamicClient(scheme, mockKymaCR1, mockKymaCR2)
-		updater, err := NewUpdater(fakeK8sClient, queue, gvr, timeout, betaEnabledLabelKey)
+		updater, err := NewUpdater(fakeK8sClient, queue, gvr, timeout, betaEnabledLabelKey, log)
 		require.NoError(t, err)
 
 		// when
@@ -190,7 +190,7 @@ func TestUpdater(t *testing.T) {
 		assert.False(t, queue.IsEmpty())
 
 		fakeK8sClient := fake.NewSimpleDynamicClient(scheme, mockKymaCR1, mockKymaCR2)
-		updater, err := NewUpdater(fakeK8sClient, queue, gvr, timeout, betaEnabledLabelKey)
+		updater, err := NewUpdater(fakeK8sClient, queue, gvr, timeout, betaEnabledLabelKey, log)
 		require.NoError(t, err)
 
 		// when

diff --git a/internal/subaccountsync/subaccount_sync_service.go b/internal/subaccountsync/subaccount_sync_service.go
@@ -122,7 +122,7 @@ func (s *SyncService) Run() {
 	var err error
 	if s.cfg.UpdateResources {
 		logger.Debug("Resource update is enabled, creating updater")
-		updater, err = kymacustomresource.NewUpdater(s.k8sClient, priorityQueue, s.kymaGVR, s.cfg.SyncQueueSleepInterval, betaEnabledLabel)
+		updater, err = kymacustomresource.NewUpdater(s.k8sClient, priorityQueue, s.kymaGVR, s.cfg.SyncQueueSleepInterval, betaEnabledLabel, logger.With("component", "updater"))
 		fatalOnError(err)
 	}