-
Notifications
You must be signed in to change notification settings - Fork 50
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
## Type of change ``` - [ ] Bug fix - [x] New feature development - [ ] Tech debt (refactoring, code cleanup, dependency upgrades, etc) - [ ] Build/deploy pipeline (DevOps) - [ ] Other ``` ## Objective Implement support for generating manpages at compile-time. Extracted from PR #103. The manpages also get generated in CI and uploaded as artifacts. Note that because the CLI struct needs to be accessed by a build script, it had to be extracted to a separate self contained file. ## How to generate manpages locally The manpages get generated by a build script, and are available in the crate's build script OUT_DIR, to get it: ``` cargo build --message-format json > build.json jq -r --slurp '.[] | select (.reason == "build-script-executed") | select(.package_id|contains("crates/bws")) .out_dir' build.json ``` The output path is going to be something like `sdk/target/debug/build/bws-4acb75a675879df1/out`. Copy them to a better location, and then you can view the pages: - `man ./my-pages/bws.1` - `man ./my-pages/bws-project.1` - `man ./my-pages/bws-secret.1` - … If you install them in a system path, you could also just access them with `man bws`, but that path is system specific. In Ubuntu I think it is `/usr/share/man` ## Screenshots ![Screenshot 2023-07-14 at 18 28 54](https://github.com/bitwarden/sdk/assets/725423/549fbaf8-1d1a-4d77-b348-61e0ddba6911) ![image](https://github.com/bitwarden/sdk/assets/725423/6b0725d7-f307-42db-aa24-88aff7245e3b)
- Loading branch information
1 parent
faa3444
commit 643d40c
Showing
9 changed files
with
322 additions
and
230 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
include!("src/cli.rs"); | ||
|
||
fn main() -> Result<(), std::io::Error> { | ||
use std::{env, fs, path::Path}; | ||
|
||
let out_dir = env::var_os("OUT_DIR").expect("OUT_DIR exists"); | ||
let path = Path::new(&out_dir).join("manpages"); | ||
fs::create_dir_all(&path).expect("OUT_DIR is writable"); | ||
|
||
let cmd = <Cli as clap::CommandFactory>::command(); | ||
clap_mangen::generate_to(cmd, &path)?; | ||
|
||
Ok(()) | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,228 @@ | ||
use std::path::PathBuf; | ||
|
||
use bitwarden_cli::Color; | ||
use clap::{ArgGroup, Parser, Subcommand, ValueEnum}; | ||
use clap_complete::Shell; | ||
use uuid::Uuid; | ||
|
||
pub(crate) const ACCESS_TOKEN_KEY_VAR_NAME: &str = "BWS_ACCESS_TOKEN"; | ||
pub(crate) const CONFIG_FILE_KEY_VAR_NAME: &str = "BWS_CONFIG_FILE"; | ||
pub(crate) const PROFILE_KEY_VAR_NAME: &str = "BWS_PROFILE"; | ||
pub(crate) const SERVER_URL_KEY_VAR_NAME: &str = "BWS_SERVER_URL"; | ||
|
||
pub(crate) const DEFAULT_CONFIG_FILENAME: &str = "config"; | ||
pub(crate) const DEFAULT_CONFIG_DIRECTORY: &str = ".bws"; | ||
|
||
#[allow(non_camel_case_types)] | ||
#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord, ValueEnum, Debug)] | ||
pub(crate) enum ProfileKey { | ||
server_base, | ||
server_api, | ||
server_identity, | ||
state_file_dir, | ||
} | ||
|
||
#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord, ValueEnum, Debug)] | ||
#[allow(clippy::upper_case_acronyms)] | ||
pub(crate) enum Output { | ||
JSON, | ||
YAML, | ||
Env, | ||
Table, | ||
TSV, | ||
None, | ||
} | ||
|
||
#[derive(Parser, Debug)] | ||
#[command(name = "bws", version, about = "Bitwarden Secrets CLI", long_about = None)] | ||
pub(crate) struct Cli { | ||
// Optional as a workaround for https://github.com/clap-rs/clap/issues/3572 | ||
#[command(subcommand)] | ||
pub(crate) command: Option<Commands>, | ||
|
||
#[arg(short = 'o', long, global = true, value_enum, default_value_t = Output::JSON, help="Output format")] | ||
pub(crate) output: Output, | ||
|
||
#[arg(short = 'c', long, global = true, value_enum, default_value_t = Color::Auto, help="Use colors in the output")] | ||
pub(crate) color: Color, | ||
|
||
#[arg(short = 't', long, global = true, env = ACCESS_TOKEN_KEY_VAR_NAME, hide_env_values = true, help="Specify access token for the service account")] | ||
pub(crate) access_token: Option<String>, | ||
|
||
#[arg( | ||
short = 'f', | ||
long, | ||
global = true, | ||
env = CONFIG_FILE_KEY_VAR_NAME, | ||
help = format!("[default: ~/{}/{}] Config file to use", DEFAULT_CONFIG_DIRECTORY, DEFAULT_CONFIG_FILENAME) | ||
)] | ||
pub(crate) config_file: Option<PathBuf>, | ||
|
||
#[arg(short = 'p', long, global = true, env = PROFILE_KEY_VAR_NAME, help="Profile to use from the config file")] | ||
pub(crate) profile: Option<String>, | ||
|
||
#[arg(short = 'u', long, global = true, env = SERVER_URL_KEY_VAR_NAME, help="Override the server URL from the config file")] | ||
pub(crate) server_url: Option<String>, | ||
} | ||
|
||
#[derive(Subcommand, Debug)] | ||
pub(crate) enum Commands { | ||
#[command(long_about = "Configure the CLI", arg_required_else_help(true))] | ||
Config { | ||
name: Option<ProfileKey>, | ||
value: Option<String>, | ||
|
||
#[arg(short = 'd', long)] | ||
delete: bool, | ||
}, | ||
|
||
#[command(long_about = "Generate shell completion files")] | ||
Completions { shell: Option<Shell> }, | ||
|
||
#[command(long_about = "Commands available on Projects")] | ||
Project { | ||
#[command(subcommand)] | ||
cmd: ProjectCommand, | ||
}, | ||
#[command(long_about = "Commands available on Secrets")] | ||
Secret { | ||
#[command(subcommand)] | ||
cmd: SecretCommand, | ||
}, | ||
#[command(long_about = "Create a single item (deprecated)", hide(true))] | ||
Create { | ||
#[command(subcommand)] | ||
cmd: CreateCommand, | ||
}, | ||
#[command(long_about = "Delete one or more items (deprecated)", hide(true))] | ||
Delete { | ||
#[command(subcommand)] | ||
cmd: DeleteCommand, | ||
}, | ||
#[command(long_about = "Edit a single item (deprecated)", hide(true))] | ||
Edit { | ||
#[command(subcommand)] | ||
cmd: EditCommand, | ||
}, | ||
#[command(long_about = "Retrieve a single item (deprecated)", hide(true))] | ||
Get { | ||
#[command(subcommand)] | ||
cmd: GetCommand, | ||
}, | ||
#[command(long_about = "List items (deprecated)", hide(true))] | ||
List { | ||
#[command(subcommand)] | ||
cmd: ListCommand, | ||
}, | ||
} | ||
|
||
#[derive(Subcommand, Debug)] | ||
pub(crate) enum SecretCommand { | ||
Create { | ||
key: String, | ||
value: String, | ||
|
||
#[arg(help = "The ID of the project this secret will be added to")] | ||
project_id: Uuid, | ||
|
||
#[arg(long, help = "An optional note to add to the secret")] | ||
note: Option<String>, | ||
}, | ||
Delete { | ||
secret_ids: Vec<Uuid>, | ||
}, | ||
#[clap(group = ArgGroup::new("edit_field").required(true).multiple(true))] | ||
Edit { | ||
secret_id: Uuid, | ||
#[arg(long, group = "edit_field")] | ||
key: Option<String>, | ||
#[arg(long, group = "edit_field")] | ||
value: Option<String>, | ||
#[arg(long, group = "edit_field")] | ||
note: Option<String>, | ||
#[arg(long, group = "edit_field")] | ||
project_id: Option<Uuid>, | ||
}, | ||
Get { | ||
secret_id: Uuid, | ||
}, | ||
List { | ||
project_id: Option<Uuid>, | ||
}, | ||
} | ||
|
||
#[derive(Subcommand, Debug)] | ||
pub(crate) enum ProjectCommand { | ||
Create { | ||
name: String, | ||
}, | ||
Delete { | ||
project_ids: Vec<Uuid>, | ||
}, | ||
Edit { | ||
project_id: Uuid, | ||
#[arg(long, group = "edit_field")] | ||
name: String, | ||
}, | ||
Get { | ||
project_id: Uuid, | ||
}, | ||
List, | ||
} | ||
|
||
#[derive(Subcommand, Debug)] | ||
pub(crate) enum ListCommand { | ||
Projects, | ||
Secrets { project_id: Option<Uuid> }, | ||
} | ||
|
||
#[derive(Subcommand, Debug)] | ||
pub(crate) enum GetCommand { | ||
Project { project_id: Uuid }, | ||
Secret { secret_id: Uuid }, | ||
} | ||
|
||
#[derive(Subcommand, Debug)] | ||
pub(crate) enum CreateCommand { | ||
Project { | ||
name: String, | ||
}, | ||
Secret { | ||
key: String, | ||
value: String, | ||
|
||
#[arg(long, help = "An optional note to add to the secret")] | ||
note: Option<String>, | ||
|
||
#[arg(long, help = "The ID of the project this secret will be added to")] | ||
project_id: Uuid, | ||
}, | ||
} | ||
|
||
#[derive(Subcommand, Debug)] | ||
pub(crate) enum EditCommand { | ||
#[clap(group = ArgGroup::new("edit_field").required(true).multiple(true))] | ||
Project { | ||
project_id: Uuid, | ||
#[arg(long, group = "edit_field")] | ||
name: String, | ||
}, | ||
#[clap(group = ArgGroup::new("edit_field").required(true).multiple(true))] | ||
Secret { | ||
secret_id: Uuid, | ||
#[arg(long, group = "edit_field")] | ||
key: Option<String>, | ||
#[arg(long, group = "edit_field")] | ||
value: Option<String>, | ||
#[arg(long, group = "edit_field")] | ||
note: Option<String>, | ||
#[arg(long, group = "edit_field")] | ||
project_id: Option<Uuid>, | ||
}, | ||
} | ||
|
||
#[derive(Subcommand, Debug)] | ||
pub(crate) enum DeleteCommand { | ||
Project { project_ids: Vec<Uuid> }, | ||
Secret { secret_ids: Vec<Uuid> }, | ||
} |
Oops, something went wrong.