Empty Commit

Author: dag-andersen

.github/workflows/generate-diff.yml …rkflows/generate-diff-exmaple-change.yml.github/workflows/generate-diff.yml renamed to .github/workflows/generate-diff-exmaple-change.yml .github/workflows/generate-diff.yml renamed to .github/workflows/generate-diff-exmaple-change.yml

@@ -0,0 +1,44 @@
+name: Generate Diff
+
+on:
+  pull_request:
+    branches:
+      - "main"
+    paths:
+      - "src/**"
+      - Cargo.toml
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      pull-requests: write
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          path: pull-request
+
+      - uses: actions/checkout@v4
+        with:
+          ref: main
+          path: main
+
+      - name: Generate Diff
+        run: |
+          docker build . -t image
+          docker run \
+            --network=host \
+            -v /var/run/docker.sock:/var/run/docker.sock \
+            -v $(pwd)/main:/base-branch \
+            -v $(pwd)/pull-request:/target-branch \
+            -v $(pwd)/output:/output \
+            image
+
+      - name: Post diff as comment
+        run: |
+          gh pr comment ${{ github.event.number }} --repo ${{ github.repository }} --body-file output/diff.md --edit-last || \
+          gh pr comment ${{ github.event.number }} --repo ${{ github.repository }} --body-file output/diff.md
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/generate-diff-tool-change.yml

@@ -1,6 +1,6 @@
 [package]
 name = "argocd-diff-preview"
-version = "0.0.3"
+version = "0.0.9"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

Cargo.lock

@@ -17,7 +17,7 @@ COPY ./src ./src
 
 # install kind
 RUN apt-get update && apt-get install -y curl
-RUN curl -Lo ./kind https://kind.sigs.k8s.io/dl/v0.22.0/kind-linux-arm64
+RUN curl -Lo ./kind https://kind.sigs.k8s.io/dl/v0.23.0/kind-linux-arm64
 RUN chmod +x ./kind
 
 # Install kubectl

Cargo.toml

@@ -1,8 +1,9 @@
 use log::{debug, info};
+use regex::Regex;
 use std::fs;
 use std::{error::Error, process::Output};
 
-use crate::utils::run_command;
+use crate::utils::{check_if_folder_exists, run_command};
 use crate::Branch;
 
 pub async fn generate_diff(
@@ -134,3 +135,41 @@ fn print_diff(summary: &str, diff: &str) -> String {
         .trim_start()
         .to_string()
 }
+
+fn check_if_folder_contains_git_repo(branch: &Branch) -> bool {
+    check_if_folder_exists(&format!("{}/.git", branch.folder()))
+}
+
+pub async fn get_repo_name(branch: Branch) -> Option<String> {
+    if !check_if_folder_contains_git_repo(&branch) {
+        return None;
+    }
+
+    let repo_url_regex = Regex::new(r"[:/](?P<repo>[^/]+/[^/]+)\.git").unwrap();
+    let repo_name = run_command("git remote get-url origin", Some(branch.folder()))
+        .await
+        .ok()?
+        .stdout;
+
+    let repo_name = String::from_utf8_lossy(&repo_name);
+
+    match repo_url_regex.captures(repo_name.as_ref()) {
+        Some(capture) => {
+            let repo_name = capture.name("repo").unwrap().as_str();
+            Some(repo_name.trim().to_string())
+        }
+        None => None,
+    }
+}
+
+pub async fn get_branch_name(branch: Branch) -> Option<String> {
+    if !check_if_folder_contains_git_repo(&branch) {
+        return None;
+    }
+
+    let branch_name = run_command("git rev-parse --abbrev-ref HEAD", Some(branch.folder()))
+        .await
+        .ok()?
+        .stdout;
+    Some(String::from_utf8_lossy(&branch_name).trim().to_string())
+}

Dockerfile_ARM64

@@ -8,14 +8,15 @@ use log::{debug, error, info};
 use crate::utils::run_command;
 use crate::{apply_manifest, apps_file, Branch};
 
-static ERROR_MESSAGES: [&str; 7] = [
+static ERROR_MESSAGES: [&str; 8] = [
     "helm template .",
     "authentication required",
     "authentication failed",
     "path does not exist",
     "error converting YAML to JSON",
     "Unknown desc = `helm template .",
     "Unknown desc = Unable to resolve",
+    "is not a valid chart repository or cannot be reached",
 ];
 
 static TIMEOUT_MESSAGES: [&str; 4] = [

src/diff.rs

@@ -6,7 +6,7 @@ use std::{
     process::{Command, Output},
 };
 
-use log::{debug, error, info};
+use log::{debug, error, info, warn};
 use std::path::PathBuf;
 use structopt::StructOpt;
 
@@ -50,17 +50,17 @@ struct Opt {
     #[structopt(long, env)]
     argocd_version: Option<String>,
 
-    /// Base branch name
-    #[structopt(short, long, default_value = "main", env)]
-    base_branch: String,
+    /// Base branch name. If not provided, it will be auto-detected from .git folder in base-branch folder
+    #[structopt(short, long, env)]
+    base_branch: Option<String>,
 
-    /// Target branch name
+    /// Target branch name. If not provided, it will be auto-detected from .git folder in target-branch folder
     #[structopt(short, long, env)]
-    target_branch: String,
+    target_branch: Option<String>,
 
-    /// Git Repository. Format: OWNER/REPO
-    #[structopt(long = "repo", env)]
-    repo: String,
+    /// Git Repository. Format: OWNER/REPO. If not provided, it will be auto-detected from .git folder in base-branch folder
+    #[structopt(long, env)]
+    repo: Option<String>,
 
     /// Output folder where the diff will be saved
     #[structopt(short, long, default_value = "./output", env)]
@@ -90,6 +90,15 @@ enum Branch {
     Target,
 }
 
+impl Branch {
+    fn folder(&self) -> &str {
+        match self {
+            Branch::Base => "base-branch",
+            Branch::Target => "target-branch",
+        }
+    }
+}
+
 impl std::fmt::Display for Branch {
     fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
         match self {
@@ -106,9 +115,6 @@ fn apps_file(branch: &Branch) -> &'static str {
     }
 }
 
-const BASE_BRANCH_FOLDER: &str = "base-branch";
-const TARGET_BRANCH_FOLDER: &str = "target-branch";
-
 #[tokio::main]
 async fn main() -> Result<(), Box<dyn Error>> {
     let opt = Opt::from_args();
@@ -133,19 +139,7 @@ async fn main() -> Result<(), Box<dyn Error>> {
         .filter(|f| !f.trim().is_empty())
         .map(|f| Regex::new(&f).unwrap());
 
-    let base_branch_name = opt.base_branch;
-    let target_branch_name = opt.target_branch;
-    let repo = opt.repo;
-    let diff_ignore = opt.diff_ignore.filter(|f| !f.trim().is_empty());
-    let timeout = opt.timeout;
-    let output_folder = opt.output_folder.as_str();
-    let secrets_folder = opt.secrets_folder.as_str();
-    let line_count = opt.line_count;
-    let argocd_version = opt
-        .argocd_version
-        .as_deref()
-        .filter(|f| !f.trim().is_empty());
-    let max_diff_length = opt.max_diff_length;
+    info!("✨ Running with:");
 
     // select local cluster tool
     let tool = match opt.local_cluster_tool {
@@ -159,19 +153,28 @@ async fn main() -> Result<(), Box<dyn Error>> {
         }
     };
 
-    let repo_regex = Regex::new(r"^[a-zA-Z0-9-]+/[a-zA-Z0-9-]+$").unwrap();
-    if !repo_regex.is_match(&repo) {
-        error!("❌ Invalid repository format. Please use OWNER/REPO");
-        panic!("Invalid repository format");
-    }
-
-    info!("✨ Running with:");
     info!("✨ - local-cluster-tool: {:?}", tool);
-    info!("✨ - base-branch: {}", base_branch_name);
-    info!("✨ - target-branch: {}", target_branch_name);
+
+    let (repo_name, base_branch_name, target_branch_name) = repo_and_branch_config(
+        opt.repo,
+        opt.base_branch,
+        opt.target_branch,
+    )
+    .await;
+
+    let diff_ignore = opt.diff_ignore.filter(|f| !f.trim().is_empty());
+    let timeout = opt.timeout;
+    let output_folder = opt.output_folder.as_str();
+    let secrets_folder = opt.secrets_folder.as_str();
+    let line_count = opt.line_count;
+    let argocd_version = opt
+        .argocd_version
+        .as_deref()
+        .filter(|f| !f.trim().is_empty());
+    let max_diff_length = opt.max_diff_length;
+
     info!("✨ - secrets-folder: {}", secrets_folder);
     info!("✨ - output-folder: {}", output_folder);
-    info!("✨ - repo: {}", repo);
     info!("✨ - timeout: {} seconds", timeout);
     if let Some(a) = file_regex.clone() {
         info!("✨ - file-regex: {}", a.as_str());
@@ -189,18 +192,18 @@ async fn main() -> Result<(), Box<dyn Error>> {
         info!("✨ - max-diff-length: {}", a);
     }
 
-    if !check_if_folder_exists(&BASE_BRANCH_FOLDER) {
+    if !check_if_folder_exists(&Branch::Base.folder()) {
         error!(
             "❌ Base branch folder does not exist: {}",
-            BASE_BRANCH_FOLDER
+            Branch::Base.folder()
         );
         panic!("Base branch folder does not exist");
     }
 
-    if !check_if_folder_exists(&TARGET_BRANCH_FOLDER) {
+    if !check_if_folder_exists(&Branch::Target.folder()) {
         error!(
             "❌ Target branch folder does not exist: {}",
-            TARGET_BRANCH_FOLDER
+            Branch::Target.folder()
         );
         panic!("Target branch folder does not exist");
     }
@@ -224,15 +227,18 @@ async fn main() -> Result<(), Box<dyn Error>> {
     }
 
     // remove .git from repo
-    let repo = repo.trim_end_matches(".git");
-    let base_apps =
-        parsing::get_applications(&BASE_BRANCH_FOLDER, &base_branch_name, &file_regex, &repo)
-            .await?;
+    let base_apps = parsing::get_applications(
+        &Branch::Base.folder(),
+        &base_branch_name,
+        &file_regex,
+        &repo_name,
+    )
+    .await?;
     let target_apps = parsing::get_applications(
-        &TARGET_BRANCH_FOLDER,
+        &Branch::Target.folder(),
         &target_branch_name,
         &file_regex,
-        &repo,
+        &repo_name,
     )
     .await?;
 
@@ -311,3 +317,73 @@ fn apply_folder(folder_name: &str) -> Result<u64, String> {
     }
     Ok(count)
 }
+
+async fn repo_and_branch_config(
+    base_repo_option: Option<String>,
+    base_branch_name_option: Option<String>,
+    target_branch_name_option: Option<String>,
+) -> (String, String, String) {
+    let repo_regex = Regex::new(r"^[a-zA-Z0-9-]+/[a-zA-Z0-9-]+$").unwrap();
+
+    let repo_name = match (
+        base_repo_option,
+        diff::get_repo_name(Branch::Base).await,
+    ) {
+        (Some(r), _) if repo_regex.is_match(&r) => {
+            info!("✨ - repo: {}", r);
+            r
+        }
+        (Some(_), _) => {
+            error!("❌ Invalid repository format. Please use OWNER/REPO");
+            panic!("Invalid repository format");
+        }
+        (None, Some(r)) => {
+            info!("✨ - repo: {} (Auto Detected)", r);
+            r
+        }
+        _ => {
+            warn!("🚨 Failed to autodetect repository from .git folder");
+            error!("❌ Please provide the repository with --repo in the format OWNER/REPO");
+            panic!("Repository not provided and not autodetected in in .git folder")
+        }
+    };
+
+    let base_branch_name = match (
+        base_branch_name_option,
+        diff::get_branch_name(Branch::Base).await,
+    ) {
+        (Some(b), _) => {
+            info!("✨ - base-branch: {}", b);
+            b
+        }
+        (None, Some(b)) => {
+            info!("✨ - base-branch: {} (Auto Detected)", b);
+            b
+        }
+        _ => {
+            warn!("🚨 Failed to autodetect base-branch name from .git folder");
+            error!("❌ Please provide the base branch name with --base-branch");
+            panic!("Base branch name not provided and not found in git remotes")
+        }
+    };
+
+    let target_branch_name = match (
+        target_branch_name_option,
+        diff::get_branch_name(Branch::Target).await,
+    ) {
+        (Some(b), _) => {
+            info!("✨ - target-branch: {}", b);
+            b
+        }
+        (None, Some(b)) => {
+            info!("✨ - base-branch: {} (Auto Detected)", b);
+            b
+        }
+        _ => {
+            warn!("🚨 Failed to autodetect target-branch name from .git folder");
+            error!("❌ Please provide the target branch name with --target-branch");
+            panic!("Target branch name not provided and not found in git remotes")
+        }
+    };
+    (repo_name, base_branch_name, target_branch_name)
+}