Skip to content

Use kebab-case value placeholders #159

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 8, 2022
Merged

Use kebab-case value placeholders #159

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 22 additions & 5 deletions server/src/option.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,32 +154,48 @@ where
S: Clone + clap::Args + StorageOpt,
{
/// The location of TLS Cert file
#[arg(long, env = "P_TLS_CERT_PATH")]
#[arg(long, env = "P_TLS_CERT_PATH", value_name = "path")]
pub tls_cert_path: Option<PathBuf>,

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

/// The address on which the http server will listen.
#[arg(long, env = "P_ADDR", default_value = "0.0.0.0:8000")]
#[arg(
long,
env = "P_ADDR",
default_value = "0.0.0.0:8000",
value_name = "url"
)]
pub address: String,

/// The local storage path is used as temporary landing point
/// for incoming events and local cache while querying data pulled
/// from object storage backend
#[arg(long, env = "P_LOCAL_STORAGE", default_value = "./data")]
#[arg(
long,
env = "P_LOCAL_STORAGE",
default_value = "./data",
value_name = "path"
)]
pub local_disk_path: PathBuf,

/// Optional interval after which server would upload uncommited data to
/// remote object storage platform. Defaults to 1min.
#[arg(long, env = "P_STORAGE_UPLOAD_INTERVAL", default_value = "60")]
#[arg(
long,
env = "P_STORAGE_UPLOAD_INTERVAL",
default_value = "60",
value_name = "seconds"
)]
pub upload_interval: u64,

/// Optional username to enable basic auth on the server
#[arg(
long,
env = USERNAME_ENV,
value_name = "username",
default_value_if("demo", ArgPredicate::IsPresent, DEFAULT_USERNAME)
)]
pub username: String,
Expand All @@ -188,6 +204,7 @@ where
#[arg(
long,
env = PASSWORD_ENV,
value_name = "password",
default_value_if("demo", ArgPredicate::IsPresent, DEFAULT_PASSWORD)
)]
pub password: String,
Expand Down
5 changes: 5 additions & 0 deletions server/src/s3.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ pub struct S3Config {
#[arg(
long,
env = "P_S3_URL",
value_name = "url",
default_value_if("demo", ArgPredicate::IsPresent, DEFAULT_S3_URL)
)]
pub s3_endpoint_url: String,
Expand All @@ -106,6 +107,7 @@ pub struct S3Config {
#[arg(
long,
env = "P_S3_ACCESS_KEY",
value_name = "access-key",
default_value_if("demo", ArgPredicate::IsPresent, DEFAULT_S3_ACCESS_KEY)
)]
pub s3_access_key_id: String,
Expand All @@ -114,6 +116,7 @@ pub struct S3Config {
#[arg(
long,
env = "P_S3_SECRET_KEY",
value_name = "secret-key",
default_value_if("demo", ArgPredicate::IsPresent, DEFAULT_S3_SECRET_KEY)
)]
pub s3_secret_key: String,
Expand All @@ -122,6 +125,7 @@ pub struct S3Config {
#[arg(
long,
env = "P_S3_REGION",
value_name = "region",
default_value_if("demo", ArgPredicate::IsPresent, DEFAULT_S3_REGION)
)]
pub s3_region: String,
Expand All @@ -130,6 +134,7 @@ pub struct S3Config {
#[arg(
long,
env = "P_S3_BUCKET",
value_name = "bucket-name",
default_value_if("demo", ArgPredicate::IsPresent, DEFAULT_S3_BUCKET)
)]
pub s3_bucket_name: String,
Expand Down