Add support for flag overwriting

Signed-off-by: Valery Piashchynski <[email protected]>

3 files changed, 126 insertions, 0 deletions

diff --git a/tests/plugins/config/.rr.yaml b/tests/plugins/config/.rr.yaml
index a6e80921..f449dcf3 100755
--- a/tests/plugins/config/.rr.yaml
+++ b/tests/plugins/config/.rr.yaml
@@ -1,6 +1,10 @@
 rpc:
   listen: tcp://localhost:6060
 
+logs:
+  mode: development
+  level: error
+
 reload:
   interval: 1s
   patterns: [".php"]
diff --git a/tests/plugins/config/config_test.go b/tests/plugins/config/config_test.go
index 364960db..609b62ef 100755
--- a/tests/plugins/config/config_test.go
+++ b/tests/plugins/config/config_test.go
@@ -8,6 +8,8 @@ import (
 
 	endure "github.com/spiral/endure/pkg/container"
 	"github.com/spiral/roadrunner/v2/plugins/config"
+	"github.com/spiral/roadrunner/v2/plugins/logger"
+	"github.com/spiral/roadrunner/v2/plugins/rpc"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -62,3 +64,73 @@ func TestViperProvider_Init(t *testing.T) {
 		}
 	}
 }
+
+func TestConfigOverwriteFail(t *testing.T) {
+	container, err := endure.NewContainer(nil, endure.RetryOnFail(false), endure.SetLogLevel(endure.ErrorLevel))
+	if err != nil {
+		t.Fatal(err)
+	}
+	vp := &config.Viper{}
+	vp.Path = ".rr.yaml"
+	vp.Prefix = "rr"
+	vp.Flags = []string{"rpc.listen=tcp//not_exist"}
+
+	err = container.RegisterAll(
+		&logger.ZapLogger{},
+		&rpc.Plugin{},
+		vp,
+		&Foo2{},
+	)
+	assert.NoError(t, err)
+
+	err = container.Init()
+	assert.Error(t, err)
+}
+
+func TestConfigOverwriteValid(t *testing.T) {
+	container, err := endure.NewContainer(nil, endure.RetryOnFail(false), endure.SetLogLevel(endure.ErrorLevel))
+	if err != nil {
+		t.Fatal(err)
+	}
+	vp := &config.Viper{}
+	vp.Path = ".rr.yaml"
+	vp.Prefix = "rr"
+	vp.Flags = []string{"rpc.listen=tcp://localhost:6061"}
+
+	err = container.RegisterAll(
+		&logger.ZapLogger{},
+		&rpc.Plugin{},
+		vp,
+		&Foo2{},
+	)
+	assert.NoError(t, err)
+
+	err = container.Init()
+	assert.NoError(t, err)
+
+	errCh, err := container.Serve()
+	assert.NoError(t, err)
+
+	// stop by CTRL+C
+	c := make(chan os.Signal, 1)
+	signal.Notify(c, os.Interrupt)
+
+	tt := time.NewTicker(time.Second * 3)
+	defer tt.Stop()
+
+	for {
+		select {
+		case e := <-errCh:
+			assert.NoError(t, e.Error)
+			assert.NoError(t, container.Stop())
+			return
+		case <-c:
+			er := container.Stop()
+			assert.NoError(t, er)
+			return
+		case <-tt.C:
+			assert.NoError(t, container.Stop())
+			return
+		}
+	}
+}
diff --git a/tests/plugins/config/plugin2.go b/tests/plugins/config/plugin2.go
new file mode 100755
index 00000000..0fea9007
--- /dev/null
+++ b/tests/plugins/config/plugin2.go
@@ -0,0 +1,50 @@
+package config
+
+import (
+	"github.com/spiral/errors"
+	"github.com/spiral/roadrunner/v2/plugins/config"
+)
+
+type Foo2 struct {
+	configProvider config.Configurer
+}
+
+// Depends on S2 and DB (S3 in the current case)
+func (f *Foo2) Init(p config.Configurer) error {
+	f.configProvider = p
+	return nil
+}
+
+func (f *Foo2) Serve() chan error {
+	const op = errors.Op("foo_plugin_serve")
+	errCh := make(chan error, 1)
+
+	r := &ReloadConfig{}
+	err := f.configProvider.UnmarshalKey("reload", r)
+	if err != nil {
+		errCh <- err
+	}
+
+	if len(r.Patterns) == 0 {
+		errCh <- errors.E(op, errors.Str("should be at least one pattern, but got 0"))
+		return errCh
+	}
+
+	var allCfg AllConfig
+	err = f.configProvider.Unmarshal(&allCfg)
+	if err != nil {
+		errCh <- errors.E(op, errors.Str("should be at least one pattern, but got 0"))
+		return errCh
+	}
+
+	if allCfg.RPC.Listen != "tcp://localhost:6061" {
+		errCh <- errors.E(op, errors.Str("RPC.Listen should be overwritten"))
+		return errCh
+	}
+
+	return errCh
+}
+
+func (f *Foo2) Stop() error {
+	return nil
+}