diff options
author | Valery Piashchynski <[email protected]> | 2024-06-06 14:58:22 +0200 |
---|---|---|
committer | GitHub <[email protected]> | 2024-06-06 14:58:22 +0200 |
commit | 1c1abb483d3e00d901d7c6279c8e4d09a5621871 (patch) | |
tree | a25db9a21d7c2958997f1d0a92e5bdf3460d05b2 /internal/rpc | |
parent | a049b0bcf48c2063d3b94b536bf4781c50bf4a30 (diff) | |
parent | 864aa7bc51f8e8c68f481be6718a79389b754b2d (diff) |
[#1929]: feature(config plugin): deprecate env prefix
Diffstat (limited to 'internal/rpc')
-rw-r--r-- | internal/rpc/client.go | 3 | ||||
-rw-r--r-- | internal/rpc/client_test.go | 15 |
2 files changed, 0 insertions, 18 deletions
diff --git a/internal/rpc/client.go b/internal/rpc/client.go index 7b3d8f5d..91d4f09b 100644 --- a/internal/rpc/client.go +++ b/internal/rpc/client.go @@ -16,7 +16,6 @@ import ( ) const ( - prefix string = "rr" rpcKey string = "rpc.listen" // default envs envDefault = ":-" @@ -26,8 +25,6 @@ const ( // Client will be connected to the RPC. func NewClient(cfg string, flags []string) (*rpc.Client, error) { v := viper.New() - v.AutomaticEnv() - v.SetEnvPrefix(prefix) v.SetEnvKeyReplacer(strings.NewReplacer(".", "_")) v.SetConfigFile(cfg) diff --git a/internal/rpc/client_test.go b/internal/rpc/client_test.go index 9bd974a9..0bc11da4 100644 --- a/internal/rpc/client_test.go +++ b/internal/rpc/client_test.go @@ -66,21 +66,6 @@ func TestNewClient_SuccessfullyConnectedOverride(t *testing.T) { defer func() { assert.NoError(t, c.Close()) }() } -func TestNewClient_SuccessfullyConnectedEnv(t *testing.T) { - l, err := net.Listen("tcp", "127.0.0.1:55556") - assert.NoError(t, err) - - defer func() { assert.NoError(t, l.Close()) }() - - require.NoError(t, os.Setenv("RR_RPC_LISTEN", "tcp://127.0.0.1:55556")) - c, err := rpc.NewClient("test/config_rpc_ok.yaml", nil) - - assert.NotNil(t, c) - assert.NoError(t, err) - - defer func() { assert.NoError(t, c.Close()) }() -} - // ${} syntax func TestNewClient_SuccessfullyConnectedEnvDollarSyntax(t *testing.T) { l, err := net.Listen("tcp", "127.0.0.1:55556") |