joe/notfiles
1
0
Fork 0
Code Issues 6 Pull Requests Actions Packages Projects Releases Wiki Activity

feat(notstrap): migrate to notsecrets age-native API, remove sops shell-out

Browse Source 
Replace AgeKeySource/resolve_age_key/install_age_key with IdentitySource/resolve_identities.
Update integration tests to use a valid age bech32 key fixture.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
Joseph O'Brien
2026-04-01 21:19:23 -04:00
parent f80ea02f07
commit 58de007e19
4 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
crates/notstrap/src/lib.rs
View File

@@ -2,7 +2,8 @@ use anyhow::{Context, Result};
use notcore::{HookPhase, Report, StepStatus};
use notfiles::{LinkOptions, link};
use nothooks::{HookRunner, run_phase};
use notsecrets::{BitwardenSource, FileSource, PromptSource, install_age_key, resolve_age_key};
use notsecrets::{BitwardenSource, FileSource, PromptSource, resolve_identities};
use notsecrets::sources::IdentitySource;
use serde::Deserialize;
use std::path::{Path, PathBuf};
@@ -88,8 +89,8 @@ pub fn run(opts: BootstrapOptions) -> Result<Report> {
}
}
// 4. Retrieve age key and install
let sources: Vec<Box<dyn notsecrets::AgeKeySource>> = if let Some(kf) = opts.key_file {
// 4. Resolve age identities
let sources: Vec<Box<dyn IdentitySource>> = if let Some(kf) = opts.key_file {
vec![Box::new(FileSource::new(kf))]
} else {
vec![
@@ -98,9 +99,8 @@ pub fn run(opts: BootstrapOptions) -> Result<Report> {
]
};
match resolve_age_key(sources) {
Ok(key) => {
install_age_key(&key)?;
match resolve_identities(sources) {
Ok(_identities) => {
report.add("age key", StepStatus::Ok);
}
Err(e) => {