fix: expand envs for the root and included files

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

Author: rustatian

internal/rpc/client_test.go

@@ -62,6 +62,8 @@ func TestNewClient_WithIncludes(t *testing.T) {
 
 	assert.NotNil(t, c)
 	assert.NoError(t, err)
+
+	assert.NoError(t, c.Close())
 }
 
 func TestNewClient_SuccessfullyConnectedOverride(t *testing.T) {

internal/rpc/includes.go

@@ -37,6 +37,10 @@ func getConfiguration(path string) (map[string]any, string, error) {
 }
 
 func handleInclude(rootVersion string, v *viper.Viper) error {
+	// automatically inject ENV variables using ${ENV} pattern
+	// root config
+	expandEnvViper(v)
+
 	ifiles := v.GetStringSlice(includeKey)
 	if ifiles == nil {
 		return nil

internal/rpc/test/config_rpc_conn_err.yaml

@@ -1,2 +1,4 @@
+version: "3"
+
 rpc:
   listen: tcp://127.0.0.1:55554

internal/rpc/test/config_rpc_empty.yaml

@@ -0,0 +1 @@
+version: "3"

internal/rpc/test/config_rpc_ok.yaml

@@ -1,2 +1,4 @@
+version: "3"
+
 rpc:
   listen: tcp://127.0.0.1:55554

internal/rpc/test/config_rpc_ok_env.yaml

@@ -1,2 +1,4 @@
+version: "3"
+
 rpc:
   listen: ${RPC}

internal/rpc/test/config_rpc_wrong.yaml

@@ -1,2 +1,4 @@
+version: "3"
+
 rpc:
   $foo bar