From 99dd65a739cb5ce7b262410ad8907e724efdb6d5 Mon Sep 17 00:00:00 2001
From: Benoit Tigeot <benoit.tigeot@lifen.fr>
Date: Thu, 10 Apr 2025 15:06:03 +0200
Subject: [PATCH] Call slog directly instead of using a wrapper

Signed-off-by: Benoit Tigeot <benoit.tigeot@lifen.fr>
---
 pkg/action/action.go            |  2 ++
 pkg/cmd/helpers_test.go         |  1 -
 pkg/kube/client_test.go         |  1 -
 pkg/kube/ready_test.go          |  2 --
 pkg/kube/statuswait_test.go     |  2 --
 pkg/kube/wait.go                | 12 ++++++------
 pkg/storage/driver/mock_test.go |  2 --
 7 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/pkg/action/action.go b/pkg/action/action.go
index 1aa9f9d19..17f050b6e 100644
--- a/pkg/action/action.go
+++ b/pkg/action/action.go
@@ -473,6 +473,8 @@ func (cfg *Configuration) Init(getter genericclioptions.RESTClientGetter, namesp
 		clientFn:  kc.Factory.KubernetesClientSet,
 	}
 
+	// slog.SetDefault()
+
 	var store *storage.Storage
 	switch helmDriver {
 	case "secret", "secrets", "":
diff --git a/pkg/cmd/helpers_test.go b/pkg/cmd/helpers_test.go
index a67267fc9..96bf6434b 100644
--- a/pkg/cmd/helpers_test.go
+++ b/pkg/cmd/helpers_test.go
@@ -19,7 +19,6 @@ package cmd
 import (
 	"bytes"
 	"io"
-	"log/slog"
 	"os"
 	"strings"
 	"testing"
diff --git a/pkg/kube/client_test.go b/pkg/kube/client_test.go
index 8b509a3f9..f246fbd66 100644
--- a/pkg/kube/client_test.go
+++ b/pkg/kube/client_test.go
@@ -21,7 +21,6 @@ import (
 	"errors"
 	"fmt"
 	"io"
-	"log/slog"
 	"net/http"
 	"strings"
 	"sync"
diff --git a/pkg/kube/ready_test.go b/pkg/kube/ready_test.go
index e89e74a57..db0d02cbe 100644
--- a/pkg/kube/ready_test.go
+++ b/pkg/kube/ready_test.go
@@ -17,8 +17,6 @@ package kube // import "helm.sh/helm/v4/pkg/kube"
 
 import (
 	"context"
-	"io"
-	"log/slog"
 	"testing"
 
 	appsv1 "k8s.io/api/apps/v1"
diff --git a/pkg/kube/statuswait_test.go b/pkg/kube/statuswait_test.go
index ed13e1b33..4b06da896 100644
--- a/pkg/kube/statuswait_test.go
+++ b/pkg/kube/statuswait_test.go
@@ -18,8 +18,6 @@ package kube // import "helm.sh/helm/v3/pkg/kube"
 
 import (
 	"errors"
-	"io"
-	"log/slog"
 	"testing"
 	"time"
 
diff --git a/pkg/kube/wait.go b/pkg/kube/wait.go
index 30980fafe..de6fa5199 100644
--- a/pkg/kube/wait.go
+++ b/pkg/kube/wait.go
@@ -153,7 +153,7 @@ func (hw *legacyWaiter) WaitForDelete(deleted ResourceList, timeout time.Duratio
 	if err != nil {
 		hw.log.Debug("wait for resources failed", "elapsed", elapsed, "error", err)
 	} else {
-		hw.log.Debug("wait for resources succeeded", "elapsed", elapsed)
+		slog.Debug("wait for resources succeeded", "elapsed", elapsed)
 	}
 
 	return err
@@ -397,7 +397,7 @@ func (hw *legacyWaiter) watchUntilReady(timeout time.Duration, info *resource.In
 		return nil
 	}
 
-	hw.log.Debug("watching for resource changes", "kind", kind, "resource", info.Name, "timeout", timeout)
+	slog.Debug("watching for resource changes", "kind", kind, "resource", info.Name, "timeout", timeout)
 
 	// Use a selector on the name of the resource. This should be unique for the
 	// given version and kind
@@ -425,7 +425,7 @@ func (hw *legacyWaiter) watchUntilReady(timeout time.Duration, info *resource.In
 			// we get. We care mostly about jobs, where what we want to see is
 			// the status go into a good state. For other types, like ReplicaSet
 			// we don't really do anything to support these as hooks.
-			hw.log.Debug("add/modify event received", "resource", info.Name, "eventType", e.Type)
+			slog.Debug("add/modify event received", "resource", info.Name, "eventType", e.Type)
 
 			switch kind {
 			case "Job":
@@ -435,11 +435,11 @@ func (hw *legacyWaiter) watchUntilReady(timeout time.Duration, info *resource.In
 			}
 			return true, nil
 		case watch.Deleted:
-			hw.log.Debug("deleted event received", "resource", info.Name)
+			slog.Debug("deleted event received", "resource", info.Name)
 			return true, nil
 		case watch.Error:
 			// Handle error and return with an error.
-			hw.log.Error("error event received", "resource", info.Name)
+			slog.Error("error event received", "resource", info.Name)
 			return true, errors.Errorf("failed to deploy %s", info.Name)
 		default:
 			return false, nil
@@ -465,7 +465,7 @@ func (hw *HelmWaiter) waitForJob(obj runtime.Object, name string) (bool, error)
 		}
 	}
 
-	hw.log.Debug("job status update", "job", name, "active", o.Status.Active, "failed", o.Status.Failed, "succeeded", o.Status.Succeeded)
+	slog.Debug("job status update", "job", name, "active", o.Status.Active, "failed", o.Status.Failed, "succeeded", o.Status.Succeeded)
 	return false, nil
 }
 
diff --git a/pkg/storage/driver/mock_test.go b/pkg/storage/driver/mock_test.go
index 6f8e651e5..7dba5fea2 100644
--- a/pkg/storage/driver/mock_test.go
+++ b/pkg/storage/driver/mock_test.go
@@ -19,8 +19,6 @@ package driver // import "helm.sh/helm/v4/pkg/storage/driver"
 import (
 	"context"
 	"fmt"
-	"io"
-	"log/slog"
 	"testing"
 
 	sqlmock "github.com/DATA-DOG/go-sqlmock"