kjuulh/update-deployment
1
0
Fork 0
Code Issues 1 Pull Requests 3 Packages Projects Releases Wiki Activity

feat: with username

Browse Source 
Signed-off-by: kjuulh <contact@kjuulh.io>
This commit is contained in:
Kasper Juul Hermansen 2023-11-27 22:12:48 +01:00
parent 91c73c7a4e
commit 54524e46ae
Signed by: kjuulh
GPG Key ID: 57B6E1465221F912
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main.rs
View File

@ -40,9 +40,9 @@ async fn main() -> eyre::Result<()> {
); );
let mut cb = RemoteCallbacks::new(); let mut cb = RemoteCallbacks::new();
cb.credentials(|_, _, _| { cb.credentials(|_, username, _| {
if let Some(sock) = std::env::var("SSH_AUTH_SOCK").ok() { if let Some(sock) = std::env::var("SSH_AUTH_SOCK").ok() {
return Cred::ssh_key_from_agent("git"); return Cred::ssh_key_from_agent(username.unwrap_or("git"));
} }
let username = std::env::var("GIT_USERNAME").expect("GIT_USERNAME to be set"); let username = std::env::var("GIT_USERNAME").expect("GIT_USERNAME to be set");
let password = std::env::var("GIT_PASSWORD").expect("GIT_PASSWORD to be set"); let password = std::env::var("GIT_PASSWORD").expect("GIT_PASSWORD to be set");
@ -118,9 +118,9 @@ async fn main() -> eyre::Result<()> {
let mut remote = repo.find_remote("origin")?; let mut remote = repo.find_remote("origin")?;
let mut cb = RemoteCallbacks::new(); let mut cb = RemoteCallbacks::new();
cb.credentials(|_, _, _| { cb.credentials(|_, username, _| {
if let Some(sock) = std::env::var("SSH_AUTH_SOCK").ok() { if let Some(sock) = std::env::var("SSH_AUTH_SOCK").ok() {
return Cred::ssh_key_from_agent("git"); return Cred::ssh_key_from_agent(username.unwrap_or("git"));
} }
let username = std::env::var("GIT_USERNAME").expect("GIT_USERNAME to be set"); let username = std::env::var("GIT_USERNAME").expect("GIT_USERNAME to be set");
let password = std::env::var("GIT_PASSWORD").expect("GIT_PASSWORD to be set"); let password = std::env::var("GIT_PASSWORD").expect("GIT_PASSWORD to be set");