Repository navigation
PLAT-685-allow batch approvals #75
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
Open
AlpBilgin
wants to merge
3
commits into
master
Choose a base branch
from
PLAT-685-batch-confirm
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
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
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 |
|---|---|---|
|
|
@@ -3,6 +3,13 @@ use std::sync::atomic::{AtomicBool, Ordering}; | |
|
|
||
| static YES: AtomicBool = AtomicBool::new(false); | ||
|
|
||
| #[derive(Debug, PartialEq, Eq)] | ||
| pub enum BatchAnswer { | ||
| All, | ||
| None, | ||
| Each, | ||
| } | ||
|
|
||
| pub struct Question; | ||
|
|
||
| impl Question { | ||
|
|
@@ -31,12 +38,70 @@ impl Question { | |
| s | ||
| } | ||
|
|
||
| pub fn confirm(question: &str) -> bool { | ||
| if YES.load(Ordering::Relaxed) { | ||
| return true; | ||
| fn always_yes() -> bool { | ||
| YES.load(Ordering::Relaxed) | ||
| || std::env::vars().any(|(ref key, ref value)| key == "VAULT_FORCE_YES" && value == "1") | ||
| } | ||
|
|
||
| /// Asks once for a whole batch: apply all, skip all, or decide item by item. | ||
| pub fn confirm_batch(question: &str) -> BatchAnswer { | ||
| if Self::always_yes() { | ||
| return BatchAnswer::All; | ||
| } | ||
|
|
||
| loop { | ||
| match Self::ask(&format!( | ||
| "{question} (y)es to all / (n)o to all / (c)ase by case" | ||
| )) | ||
| .trim() | ||
| .to_lowercase() | ||
| .as_ref() | ||
| { | ||
| "y" | "j" | "a" => return BatchAnswer::All, | ||
| "n" => return BatchAnswer::None, | ||
| "c" => return BatchAnswer::Each, | ||
| chars => { | ||
| eprintln!("unexpected char \"{chars}\" - reask."); | ||
| continue; | ||
| } | ||
| }; | ||
| } | ||
| } | ||
|
|
||
| /// Lists all planned changes, asks once, and returns the items the user accepted. | ||
| /// Choosing "each" falls back to asking per item. | ||
| pub fn select<T>( | ||
| heading: &str, | ||
| items: Vec<T>, | ||
| describe: impl Fn(&T) -> String, | ||
| per_item_question: impl Fn(&T) -> String, | ||
| ) -> Vec<T> { | ||
| if items.is_empty() { | ||
| return items; | ||
| } | ||
|
|
||
| if std::env::vars().any(|(ref key, ref value)| key == "VAULT_FORCE_YES" && value == "1") { | ||
| println!(); | ||
| println!("{heading} ({}):", items.len()); | ||
| for item in &items { | ||
| println!(" - {}", describe(item)); | ||
| } | ||
| println!(); | ||
|
|
||
| match Self::confirm_batch(&format!("apply these {} change(s)?", items.len())) { | ||
| BatchAnswer::All => items, | ||
| BatchAnswer::None => { | ||
| println!("maybe later"); | ||
| Vec::new() | ||
| } | ||
| BatchAnswer::Each => items | ||
| .into_iter() | ||
| .filter(|item| Self::confirm(&per_item_question(item))) | ||
| .collect(), | ||
| } | ||
| } | ||
|
|
||
| pub fn confirm(question: &str) -> bool { | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Please add documentation comments for all public items you touched. |
||
| if Self::always_yes() { | ||
| return true; | ||
| } | ||
|
|
||
|
|
@@ -66,5 +131,9 @@ mod test { | |
| Question::set_yes(true); | ||
| let result = Question::confirm("a_question"); | ||
| assert!(result); | ||
| assert_eq!(Question::confirm_batch("a_batch"), BatchAnswer::All); | ||
| let selected = | ||
| Question::select("items", vec![1, 2, 3], |i| i.to_string(), |i| i.to_string()); | ||
| assert_eq!(selected, vec![1, 2, 3]); | ||
| } | ||
| } | ||
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
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.
Please also add doc comments to the enum itself and it's values.