-
Notifications
You must be signed in to change notification settings - Fork 98
refactor: Factor out common code for sns cli #2586
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.
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
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
cb287e9
Factor out common code
bitdivine 8d1fd20
Tweak
bitdivine 5634586
Merge branch 'master' into reduce-reuse
bitdivine c67f49e
Merge branch 'master' into reduce-reuse
bitdivine 5c7d9ac
Merge remote-tracking branch 'origin/master' into reduce-reuse
bitdivine File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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 |
|---|---|---|
| @@ -1,42 +1,21 @@ | ||
| //! Code for creating SNS configurations | ||
| use anyhow::{anyhow, Context}; | ||
| use fn_error_context::context; | ||
| use std::ffi::OsString; | ||
| use std::path::Path; | ||
| use std::process::{self, Command}; | ||
|
|
||
| use crate::lib::error::DfxResult; | ||
| use crate::lib::sns::sns_cli::call_sns_cli; | ||
| use crate::Environment; | ||
|
|
||
| /// Ceates an SNS configuration template. | ||
| #[context("Failed to create sns config at {}.", path.display())] | ||
| pub fn create_config(env: &dyn Environment, path: &Path) -> DfxResult { | ||
| let cli_name = "sns"; | ||
| let sns_cli = env | ||
| .get_cache() | ||
| .get_binary_command_path(cli_name) | ||
| .with_context(|| format!("Could not find bundled binary '{cli_name}'."))?; | ||
| let mut command = Command::new(sns_cli); | ||
| command | ||
| .arg("init-config-file") | ||
| .arg("--init-config-file-path") | ||
| .arg(path) | ||
| .arg("new"); | ||
| command | ||
| .stdin(process::Stdio::null()) | ||
| .output() | ||
| .map_err(anyhow::Error::from) | ||
| .and_then(|output| { | ||
| if output.status.success() { | ||
| Ok(()) | ||
| } else { | ||
| Err(anyhow!( | ||
| "Failed to create an SNS configuration.\n{:?} {:?}\nStdout:\n{:?}\n\nStderr:\n{:?}", | ||
| command.get_program(), | ||
| command.get_args(), | ||
| String::from_utf8_lossy(&output.stdout), | ||
| String::from_utf8_lossy(&output.stderr) | ||
| )) | ||
| } | ||
| })?; | ||
| let args = vec![ | ||
| OsString::from("init-config-file"), | ||
| OsString::from("--init-config-file-path"), | ||
| OsString::from(path), | ||
| OsString::from("new"), | ||
| ]; | ||
| call_sns_cli(env, &args)?; | ||
| Ok(()) | ||
| } | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Note: The context message on the function provides the important contextual information, and the library function provides stdout and stderr if it fails.