Skip to content

Commit 0a67dd5

Browse files
authored
Use kebab-case value placeholders (#159)
1 parent 4b6299f commit 0a67dd5

File tree

2 files changed

+27
-5
lines changed

2 files changed

+27
-5
lines changed

server/src/option.rs

Lines changed: 22 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -154,32 +154,48 @@ where
154154
S: Clone + clap::Args + StorageOpt,
155155
{
156156
/// The location of TLS Cert file
157-
#[arg(long, env = "P_TLS_CERT_PATH")]
157+
#[arg(long, env = "P_TLS_CERT_PATH", value_name = "path")]
158158
pub tls_cert_path: Option<PathBuf>,
159159

160160
/// The location of TLS Private Key file
161-
#[arg(long, env = "P_TLS_KEY_PATH")]
161+
#[arg(long, env = "P_TLS_KEY_PATH", value_name = "path")]
162162
pub tls_key_path: Option<PathBuf>,
163163

164164
/// The address on which the http server will listen.
165-
#[arg(long, env = "P_ADDR", default_value = "0.0.0.0:8000")]
165+
#[arg(
166+
long,
167+
env = "P_ADDR",
168+
default_value = "0.0.0.0:8000",
169+
value_name = "url"
170+
)]
166171
pub address: String,
167172

168173
/// The local storage path is used as temporary landing point
169174
/// for incoming events and local cache while querying data pulled
170175
/// from object storage backend
171-
#[arg(long, env = "P_LOCAL_STORAGE", default_value = "./data")]
176+
#[arg(
177+
long,
178+
env = "P_LOCAL_STORAGE",
179+
default_value = "./data",
180+
value_name = "path"
181+
)]
172182
pub local_disk_path: PathBuf,
173183

174184
/// Optional interval after which server would upload uncommited data to
175185
/// remote object storage platform. Defaults to 1min.
176-
#[arg(long, env = "P_STORAGE_UPLOAD_INTERVAL", default_value = "60")]
186+
#[arg(
187+
long,
188+
env = "P_STORAGE_UPLOAD_INTERVAL",
189+
default_value = "60",
190+
value_name = "seconds"
191+
)]
177192
pub upload_interval: u64,
178193

179194
/// Optional username to enable basic auth on the server
180195
#[arg(
181196
long,
182197
env = USERNAME_ENV,
198+
value_name = "username",
183199
default_value_if("demo", ArgPredicate::IsPresent, DEFAULT_USERNAME)
184200
)]
185201
pub username: String,
@@ -188,6 +204,7 @@ where
188204
#[arg(
189205
long,
190206
env = PASSWORD_ENV,
207+
value_name = "password",
191208
default_value_if("demo", ArgPredicate::IsPresent, DEFAULT_PASSWORD)
192209
)]
193210
pub password: String,

server/src/s3.rs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@ pub struct S3Config {
9898
#[arg(
9999
long,
100100
env = "P_S3_URL",
101+
value_name = "url",
101102
default_value_if("demo", ArgPredicate::IsPresent, DEFAULT_S3_URL)
102103
)]
103104
pub s3_endpoint_url: String,
@@ -106,6 +107,7 @@ pub struct S3Config {
106107
#[arg(
107108
long,
108109
env = "P_S3_ACCESS_KEY",
110+
value_name = "access-key",
109111
default_value_if("demo", ArgPredicate::IsPresent, DEFAULT_S3_ACCESS_KEY)
110112
)]
111113
pub s3_access_key_id: String,
@@ -114,6 +116,7 @@ pub struct S3Config {
114116
#[arg(
115117
long,
116118
env = "P_S3_SECRET_KEY",
119+
value_name = "secret-key",
117120
default_value_if("demo", ArgPredicate::IsPresent, DEFAULT_S3_SECRET_KEY)
118121
)]
119122
pub s3_secret_key: String,
@@ -122,6 +125,7 @@ pub struct S3Config {
122125
#[arg(
123126
long,
124127
env = "P_S3_REGION",
128+
value_name = "region",
125129
default_value_if("demo", ArgPredicate::IsPresent, DEFAULT_S3_REGION)
126130
)]
127131
pub s3_region: String,
@@ -130,6 +134,7 @@ pub struct S3Config {
130134
#[arg(
131135
long,
132136
env = "P_S3_BUCKET",
137+
value_name = "bucket-name",
133138
default_value_if("demo", ArgPredicate::IsPresent, DEFAULT_S3_BUCKET)
134139
)]
135140
pub s3_bucket_name: String,

0 commit comments

Comments
 (0)