Add push with SSH creds attempt

Author: mbrav

Cargo.toml

@@ -16,6 +16,9 @@ ref_debug = []
 [profile.dev]
 opt-level = 1
 
+# Sometimes faster, sometimes slower
+# parallel-compiler = true
+
 # Build optimizations: https://github.com/johnthagen/min-sized-rust
 [profile.release]
 panic = "abort"

README.md

@@ -85,16 +85,16 @@ Repo mbrav/test-repo
   Success commit 'Change bootstrap server url from prod-kafka to dev-kafka' d93cb354791ccb4a540b767c70ea480d4cbd580a
 REPORT                                                                                               
 Fn - Matched file with number of matched lines                                                                           
-  On - Original line, line number                                                                                     
+  Ln - Original line, line number                                                                                     
   Rn - Replace line (if present), line number 
 GIT REPOSITORIES
 
 Repository: mbrav/test-repo
 Branch: development
   F2: mbrav/test-repo/values.yaml
-    F1:   kafka_bootstrapservers: "prod-kafka.backend:9092"
+    L1:   kafka_bootstrapservers: "prod-kafka.backend:9092"
     R1:   kafka_bootstrapservers: "test-kafka.backend:9092"
-    F4:   kafka_url: prod-kafka.backend:9092
+    L4:   kafka_url: prod-kafka.backend:9092
     R4:   kafka_url: test-kafka.backend:9092
 Elapsed: 39.170ms
 ```

src/git.rs

@@ -1,4 +1,6 @@
-use git2::{Branch, BranchType, Branches, Commit, Oid, PushOptions, RemoteCallbacks, Repository};
+use git2::{
+    Branch, BranchType, Branches, Commit, Cred, Oid, PushOptions, RemoteCallbacks, Repository,
+};
 use std::path::{Path, PathBuf};
 
 /// Get repo from path
@@ -115,17 +117,31 @@ pub fn commit(repo: &mut Repository, msg: &str) -> Result<(), git2::Error> {
 }
 
 /// Push changes to remote
-pub fn push(repo: &Repository) -> Result<(), git2::Error> {
+pub fn push(repo: &Repository, username: &str) -> Result<(), git2::Error> {
     // Setup remote
     let mut opts = PushOptions::default();
-    let callbacks = RemoteCallbacks::new();
+    let mut callbacks = RemoteCallbacks::new();
+
+    // Configure authentication credentials
+    callbacks.credentials(|_url, username_from_url, _allowed_types| {
+        Cred::ssh_key_from_agent(username_from_url.unwrap_or(username))
+    });
+
+    // Set the callbacks for the remote
     opts.remote_callbacks(callbacks);
 
     // Assume the remote's name is "origin"
     let mut remote = repo.find_remote("origin")?;
 
-    // Push to remote
-    remote.push::<&str>(&[], Some(&mut opts))?;
+    // Push changes of the current checkout branch
+    let current_branch = get_branch_name(repo).expect("Error getting branch");
+    let refspec = format!(
+        "refs/heads/{}:refs/heads/{}",
+        current_branch, current_branch
+    );
+
+    // Push changes based on settings
+    remote.push(&[refspec], Some(&mut opts))?;
 
     Ok(())
 }

src/main.rs

@@ -48,15 +48,12 @@ fn main() {
         raider.commit(commit_message.as_str());
 
         // If push flag is set, push to remote
-        if conf.push && conf.username.is_some() && conf.password.is_some() {
-            raider.remote_push(
-                conf.username.expect("Error unwrapping username"),
-                conf.password.expect("Error unwrapping password"),
-            );
+        if conf.push && conf.username.is_some() {
+            raider.remote_push(conf.username.expect("Error unwrapping username").as_str());
         }
         // If username or password was not set then throw an error
         else if conf.push {
-            panic!("ERROR: Git username and password must be specified for push");
+            panic!("ERROR: Git username must be specified for push");
         }
     }
 

src/raider.rs

@@ -288,7 +288,7 @@ impl RepoRaider {
     }
 
     /// Push changes to remote
-    pub fn remote_push(&self, _username: String, _password: String) {
+    pub fn remote_push(&self, username: &str) {
         self.dirs.iter().for_each(|dir| {
             let repo = dir.repo.as_ref().expect("Error unwrapping repo");
 
@@ -299,7 +299,7 @@ impl RepoRaider {
                 );
             } else {
                 println!("Pushing {} to remote", dir.relative_path.display());
-                git::push(repo).expect("Error pushing repository");
+                git::push(repo, username).expect("Error pushing repository");
             }
         });
     }