Merge pull request #625 from fluxcd/helm-log-levels

runner: configure Helm action cfg log levels

Author: hiddeco

internal/runner/log_buffer.go

@@ -28,16 +28,10 @@ import (
 
 const defaultBufferSize = 5
 
-type DebugLog struct {
-	log logr.Logger
-}
-
-func NewDebugLog(log logr.Logger) *DebugLog {
-	return &DebugLog{log: log}
-}
-
-func (l *DebugLog) Log(format string, v ...interface{}) {
-	l.log.V(1).Info(fmt.Sprintf(format, v...))
+func NewDebugLog(log logr.Logger) action.DebugLog {
+	return func(format string, v ...interface{}) {
+		log.Info(fmt.Sprintf(format, v...))
+	}
 }
 
 type LogBuffer struct {

internal/runner/log_buffer_test.go

@@ -54,7 +54,7 @@ func TestLogBuffer_Log(t *testing.T) {
 
 func TestLogBuffer_Reset(t *testing.T) {
 	bufferSize := 10
-	l := NewLogBuffer(NewDebugLog(logr.Discard()).Log, bufferSize)
+	l := NewLogBuffer(NewDebugLog(logr.Discard()), bufferSize)
 
 	if got := l.buffer.Len(); got != bufferSize {
 		t.Errorf("Len() = %v, want %v", got, bufferSize)
@@ -91,7 +91,7 @@ func TestLogBuffer_String(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			l := NewLogBuffer(NewDebugLog(logr.Discard()).Log, tt.size)
+			l := NewLogBuffer(NewDebugLog(logr.Discard()), tt.size)
 			for _, v := range tt.fill {
 				l.Log("%s", v)
 			}

internal/runner/runner.go

@@ -42,6 +42,8 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 
+	runtimelogger "github.com/fluxcd/pkg/runtime/logger"
+
 	v2 "github.com/fluxcd/helm-controller/api/v2beta1"
 	"github.com/fluxcd/helm-controller/internal/features"
 )
@@ -74,12 +76,15 @@ type Runner struct {
 // namespace configured to the provided values.
 func NewRunner(getter genericclioptions.RESTClientGetter, storageNamespace string, logger logr.Logger) (*Runner, error) {
 	runner := &Runner{
-		logBuffer: NewLogBuffer(NewDebugLog(logger).Log, defaultBufferSize),
+		logBuffer: NewLogBuffer(NewDebugLog(logger.V(runtimelogger.DebugLevel)), defaultBufferSize),
 	}
-	runner.config = new(action.Configuration)
-	if err := runner.config.Init(getter, storageNamespace, "secret", runner.logBuffer.Log); err != nil {
+	cfg := new(action.Configuration)
+	if err := cfg.Init(getter, storageNamespace, "secret", NewDebugLog(logger.V(runtimelogger.TraceLevel))); err != nil {
 		return nil, err
 	}
+	// Override the logger used by the Helm actions with the log buffer.
+	cfg.Log = runner.logBuffer.Log
+	runner.config = cfg
 	return runner, nil
 }