Skip to content

Commit

Permalink
fix: adapt to upstream clap changes
Browse files Browse the repository at this point in the history
Signed-off-by: Roman Volosatovs <[email protected]>
  • Loading branch information
rvolosatovs committed Oct 20, 2022
1 parent b8c4dd0 commit 773b1ee
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ rand = { version = "0.8", features = ["std"], default-features = false }
tracing-subscriber = { version="^0.3.15", features = ["env-filter", "json", "fmt"], default-features = false }
tower-http = { version = "^0.3.0", features = ["trace"], default-features = false }
axum = { version = "^0.5.16", features = ["headers"], default-features = false }
clap = { version = "^4.0.17", features = ["std", "derive", "env"], default-features = false }
clap = { version = "^4.0.17", features = ["help", "usage", "error-context", "std", "derive", "env"], default-features = false }
hyper = { git = "https://github.com/rjzak/hyper", branch = "wasi_wip", features = ["http1", "server"], default-features = false }
tokio = { version = "^1.21.2", features = ["rt", "macros"], default-features = false }
uuid = { version = "^0.8.2", features = ["v4"], default-features = false }
Expand Down
14 changes: 7 additions & 7 deletions src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -66,24 +66,24 @@ const BUNDLE: &str = "application/vnd.steward.pkcs10-bundle.v1";
/// The configuration file must contain valid TOML table mapping argument
/// names to their values.
#[derive(Clone, Debug, Parser)]
#[clap(author, version, about)]
#[command(author, version, about)]
struct Args {
#[clap(short, long, env = "STEWARD_KEY")]
#[arg(short, long, env = "STEWARD_KEY")]
key: Option<PathBuf>,

#[clap(short, long, env = "STEWARD_CRT")]
#[arg(short, long, env = "STEWARD_CRT")]
crt: Option<PathBuf>,

#[clap(short, long, env = "ROCKET_PORT", default_value = "3000")]
#[arg(short, long, env = "ROCKET_PORT", default_value = "3000")]
port: u16,

#[clap(short, long, env = "ROCKET_ADDRESS", default_value = "::")]
#[arg(short, long, env = "ROCKET_ADDRESS", default_value = "::")]
addr: IpAddr,

#[clap(short, long, env = "RENDER_EXTERNAL_HOSTNAME")]
#[arg(long, env = "RENDER_EXTERNAL_HOSTNAME")]
host: Option<String>,

#[clap(long, env = "STEWARD_SAN")]
#[arg(long, env = "STEWARD_SAN")]
san: Option<String>,
}

Expand Down

0 comments on commit 773b1ee

Please sign in to comment.