From 9f017b2bba9016922083b26205b61fa5e111e093 Mon Sep 17 00:00:00 2001
From: Angira Kekteeva <kira@nspcc.ru>
Date: Thu, 14 Apr 2022 22:10:57 +0400
Subject: [PATCH] [#396] Rename rpc-endpoint and resolve-order

To make cli params more consistent
Signed-off-by: Angira Kekteeva <kira@nspcc.ru>
---
 cmd/s3-gw/app_settings.go | 4 ++--
 config/config.env         | 4 ++--
 config/config.yaml        | 4 ++--
 docs/configuration.md     | 6 +++---
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/cmd/s3-gw/app_settings.go b/cmd/s3-gw/app_settings.go
index 178e2ddb..ed6cdf6c 100644
--- a/cmd/s3-gw/app_settings.go
+++ b/cmd/s3-gw/app_settings.go
@@ -86,10 +86,10 @@ const ( // Settings.
 	cfgPeers = "peers"
 
 	// NeoGo.
-	cfgRPCEndpoint = "rpc-endpoint"
+	cfgRPCEndpoint = "rpc_endpoint"
 
 	// Resolving.
-	cfgResolveOrder = "resolve-order"
+	cfgResolveOrder = "resolve_order"
 
 	// Application.
 	cfgApplicationBuildTime = "app.build_time"
diff --git a/config/config.env b/config/config.env
index ea382a40..87f04b49 100644
--- a/config/config.env
+++ b/config/config.env
@@ -35,8 +35,8 @@ S3_GW_CONFIG=/path/to/config/yaml
 S3_GW_LOGGER_LEVEL=debug
 
 # RPC endpoint and order of resolving of bucket names
-S3_GW_RPC-ENDPOINT=http://morph-chain.neofs.devenv:30333/
-S3_GW_RESOLVE-ORDER="nns dns"
+S3_GW_RPC_ENDPOINT=http://morph-chain.neofs.devenv:30333/
+S3_GW_RESOLVE_ORDER="nns dns"
 
 # Metrics
 S3_GW_METRICS=false
diff --git a/config/config.yaml b/config/config.yaml
index 2df7697a..b697c3ab 100644
--- a/config/config.yaml
+++ b/config/config.yaml
@@ -36,8 +36,8 @@ logger:
   level: debug
 
 # RPC endpoint and order of resolving of bucket names
-rpc-endpoint: http://node4.neofs:40332
-resolve-order:
+rpc_endpoint: http://node4.neofs:40332
+resolve_order:
   - nns
 
 # Metrics
diff --git a/docs/configuration.md b/docs/configuration.md
index 9692b485..6f0d4816 100644
--- a/docs/configuration.md
+++ b/docs/configuration.md
@@ -63,11 +63,11 @@ $ neofs-s3-gw --listen_address 192.168.130.130:443 \
 
 ### RPC endpoint and resolving of bucket names
 
-To set RPC endpoint specify a value of parameter `-r` or `--rpc-endpoint`. The parameter is **required if** another 
-parameter's `--resolve-order` value contains `nns`.
+To set RPC endpoint specify a value of parameter `-r` or `--rpc_endpoint`. The parameter is **required if** another 
+parameter's `--resolve_order` value contains `nns`.
 
 ```shell
-$ neofs-s3-gw --rpc-endpoint http://morph-chain.neofs.devenv:30333/ --resolve-order nns,dns
+$ neofs-s3-gw --rpc_endpoint http://morph-chain.neofs.devenv:30333/ --resolve_order nns,dns
 ```
 
 ### Processing of requests