Use db name as example for privs editor

This commit is contained in:
Oystein Kristoffer Tveit 2024-08-17 21:24:59 +02:00
parent af86893acf
commit 466d4a8b96
Signed by: oysteikt
GPG Key ID: 9F2F7D8250F35146
2 changed files with 6 additions and 4 deletions

View File

@ -366,7 +366,7 @@ pub async fn edit_database_privileges(
let privileges_to_change = if !args.privs.is_empty() {
parse_privilege_tables_from_args(&args)?
} else {
edit_privileges_with_editor(&privilege_data)?
edit_privileges_with_editor(&privilege_data, args.name.as_deref())?
};
let diffs = diff_privileges(&privilege_data, &privileges_to_change);
@ -432,13 +432,14 @@ fn parse_privilege_tables_from_args(
fn edit_privileges_with_editor(
privilege_data: &[DatabasePrivilegeRow],
database_name: Option<&str>,
) -> anyhow::Result<Vec<DatabasePrivilegeRow>> {
let unix_user = User::from_uid(getuid())
.context("Failed to look up your UNIX username")
.and_then(|u| u.ok_or(anyhow::anyhow!("Failed to look up your UNIX username")))?;
let editor_content =
generate_editor_content_from_privilege_data(privilege_data, &unix_user.name);
generate_editor_content_from_privilege_data(privilege_data, &unix_user.name, database_name);
// TODO: handle errors better here
let result = Editor::new().extension("tsv").edit(&editor_content)?;

View File

@ -157,9 +157,10 @@ const EDITOR_COMMENT: &str = r#"
pub fn generate_editor_content_from_privilege_data(
privilege_data: &[DatabasePrivilegeRow],
unix_user: &str,
database_name: Option<&str>,
) -> String {
let example_user = format!("{}_user", unix_user);
let example_db = format!("{}_db", unix_user);
let example_db = database_name.unwrap_or(&format!("{}_db", unix_user)).to_string();
// NOTE: `.max()`` fails when the iterator is empty.
// In this case, we know that the only fields in the
@ -664,7 +665,7 @@ mod tests {
},
];
let content = generate_editor_content_from_privilege_data(&permissions, "user");
let content = generate_editor_content_from_privilege_data(&permissions, "user", None);
let parsed_permissions = parse_privilege_data_from_editor_content(content).unwrap();