add options

Signed-off-by: Pavel Okhlopkov <[email protected]>

pkg/module_manager/loader/fs/fs.go

@@ -64,7 +64,7 @@ func (fl *FileSystemLoader) getBasicModule(definition moduleDefinition, commonSt
 		return nil, fmt.Errorf("expect map[string]interface{} in module values")
 	}
 
-	m, err := modules.NewBasicModule(definition.Name, definition.Path, definition.Order, moduleValues, cb, vb, fl.logger.Named("basic-module"))
+	m, err := modules.NewBasicModule(definition.Name, definition.Path, definition.Order, moduleValues, cb, vb, modules.WithLogger(fl.logger.Named("basic-module")))
 	if err != nil {
 		return nil, fmt.Errorf("new basic module: %w", err)
 	}

pkg/module_manager/models/modules/basic.go

@@ -70,14 +70,14 @@ type BasicModule struct {
 // TODO: add options WithLogger
 // NewBasicModule creates new BasicModule
 // staticValues - are values from modules/values.yaml and /modules/<module-name>/values.yaml, they could not be changed during the runtime
-func NewBasicModule(name, path string, order uint32, staticValues utils.Values, configBytes, valuesBytes []byte, logger *log.Logger) (*BasicModule, error) {
+func NewBasicModule(name, path string, order uint32, staticValues utils.Values, configBytes, valuesBytes []byte, opts ...BasicModuleOption) (*BasicModule, error) {
 	valuesStorage, err := NewValuesStorage(name, staticValues, configBytes, valuesBytes)
 	if err != nil {
 		return nil, fmt.Errorf("new values storage: %w", err)
 	}
 
 	crdsFromPath := getCRDsFromPath(path, app.CRDsFilters)
-	return &BasicModule{
+	bmodule := &BasicModule{
 		Name:          name,
 		Order:         order,
 		Path:          path,
@@ -91,8 +91,21 @@ func NewBasicModule(name, path string, order uint32, staticValues utils.Values,
 		},
 		hooks:                  newHooksStorage(),
 		keepTemporaryHookFiles: shapp.DebugKeepTmpFiles,
-		logger:                 logger,
-	}, nil
+	}
+
+	for _, opt := range opts {
+		opt.Apply(bmodule)
+	}
+
+	if bmodule.logger == nil {
+		bmodule.logger = log.NewLogger(log.Options{}).Named("basic-module").Named(name)
+	}
+
+	return bmodule, nil
+}
+
+func (bm *BasicModule) WithLogger(logger *log.Logger) {
+	bm.logger = logger
 }
 
 // getCRDsFromPath scan path/crds directory and store yaml file in slice

pkg/module_manager/models/modules/basic_options.go

@@ -0,0 +1,23 @@
+package modules
+
+import "github.com/deckhouse/deckhouse/pkg/log"
+
+type basicModuleOption func(optionsApplier BasicModuleOptionApplier)
+
+func (opt basicModuleOption) Apply(o BasicModuleOptionApplier) {
+	opt(o)
+}
+
+func WithLogger(logger *log.Logger) basicModuleOption {
+	return func(optionsApplier BasicModuleOptionApplier) {
+		optionsApplier.WithLogger(logger)
+	}
+}
+
+type BasicModuleOption interface {
+	Apply(optsApplier BasicModuleOptionApplier)
+}
+
+type BasicModuleOptionApplier interface {
+	WithLogger(logger *log.Logger)
+}

pkg/module_manager/models/modules/basic_test.go

@@ -4,7 +4,6 @@ import (
 	"encoding/json"
 	"testing"
 
-	"github.com/deckhouse/deckhouse/pkg/log"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
@@ -18,7 +17,7 @@ foo:
 `
 	value, err := utils.NewValuesFromBytes([]byte(valuesStr))
 	require.NoError(t, err)
-	bm, err := NewBasicModule("test-1", "/tmp/test", 100, value, nil, nil, log.NewNop())
+	bm, err := NewBasicModule("test-1", "/tmp/test", 100, value, nil, nil)
 	require.NoError(t, err)
 
 	patch := utils.ValuesPatch{Operations: []*utils.ValuesPatchOperation{