Feature/nelm log singleton

pkg/helm/nelm/logger.go

@@ -12,7 +12,7 @@ import (
 
 var _ nelmlog.Logger = (*NelmLogger)(nil)
 
-func NewNelmLogger(logger *log.Logger) *NelmLogger {
+func newNelmLogger(logger *log.Logger) *NelmLogger {
 	return &NelmLogger{
 		logger: logger,
 	}

pkg/helm/nelm/nelm.go

@@ -11,6 +11,7 @@ import (
 	"sort"
 	"strconv"
 	"strings"
+	"sync"
 	"time"
 
 	"github.com/deckhouse/deckhouse/pkg/log"
@@ -28,7 +29,10 @@ import (
 	"github.com/flant/addon-operator/pkg/utils"
 )
 
-var _ client.HelmClient = (*NelmClient)(nil)
+var (
+	_   client.HelmClient = (*NelmClient)(nil)
+	one sync.Once
+)
 
 type CommonOptions struct {
 	genericclioptions.ConfigFlags
@@ -165,7 +169,10 @@ func (s *SafeNelmActions) ChartRender(ctx context.Context, opts action.ChartRend
 }
 
 func NewNelmClient(opts *CommonOptions, logger *log.Logger, labels map[string]string) *NelmClient {
-	nelmLog.Default = NewNelmLogger(logger)
+	// singleton
+	one.Do(func() {
+		nelmLog.Default = newNelmLogger(logger)
+	})
 
 	if opts == nil {
 		opts = &CommonOptions{}

pkg/helm/nelm/nelm_test.go

@@ -0,0 +1,20 @@
+package nelm
+
+import (
+	"testing"
+
+	"github.com/deckhouse/deckhouse/pkg/log"
+	"github.com/stretchr/testify/assert"
+	nelmLog "github.com/werf/nelm/pkg/log"
+)
+
+func Test_NewNelmClient(t *testing.T) {
+	logger := log.NewNop()
+	cl := NewNelmClient(&CommonOptions{}, logger.Named("nelm"), map[string]string{})
+	assert.NotNil(t, cl)
+	singleLogger := nelmLog.Default
+
+	logger2 := log.NewNop()
+	_ = NewNelmClient(&CommonOptions{}, logger2.Named("test"), map[string]string{})
+	assert.Equal(t, singleLogger, nelmLog.Default) // logger has not changed
+}

pkg/module_manager/models/modules/basic.go

@@ -292,7 +292,7 @@ func (bm *BasicModule) searchModuleHooks() (*searchModuleHooksResult, error) {
 
 	if len(shellHooks)+len(batchHooksResult.Hooks) > 0 {
 		if err := bm.AssembleEnvironmentForModule(environmentmanager.ShellHookEnvironment); err != nil {
-			return nil, fmt.Errorf("Assemble %q module's environment: %w", bm.GetName(), err)
+			return nil, fmt.Errorf("assemble %q module's environment: %w", bm.GetName(), err)
 		}
 	}