Skip to content

OTA-915: metadata-helper/src/config/cli: Expose --signatures.dir #877

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
openshift-merge-bot merged 1 commit into from
Nov 8, 2023
Merged

OTA-915: metadata-helper/src/config/cli: Expose --signatures.dir #877

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
9 changes: 9 additions & 0 deletions metadata-helper/src/config/cli.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ pub struct CliOptions {
#[structopt(flatten)]
pub service: options::ServiceOptions,

// Signature service options
#[structopt(flatten)]
pub signatures: options::SignaturesOptions,

// Status service options
#[structopt(flatten)]
pub status: options::StatusOptions,
Expand All @@ -35,6 +39,7 @@ impl MergeOptions<CliOptions> for AppSettings {
};

self.try_merge(Some(opts.service))?;
self.try_merge(Some(opts.signatures))?;
self.try_merge(Some(opts.status))?;

Ok(())
Expand All @@ -60,6 +65,10 @@ mod tests {
let svc_port_args = vec!["argv0", "--service.port", "9999"];
let svc_port_cli = CliOptions::from_iter_safe(svc_port_args).unwrap();
assert_eq!(svc_port_cli.service.port, Some(9999));

let sig_dir_args = vec!["argv0", "--signtures.dir", "/a/b"];
let sig_dir_cli = CliOptions::from_iter_safe(sig_dir_args).unwrap();
assert_eq!(sig_dir_cli.signatures.dir, Some("/a/b"));
}

#[test]
Expand Down