Repo is now provided as OWNER/REPO instead of full url

Author: dag-andersen

.github/workflows/generate-diff.yml

@@ -34,7 +34,7 @@ jobs:
             -v $(pwd)/pull-request:/target-branch \
             -v $(pwd)/output:/output \
             -e TARGET_BRANCH=${{ github.head_ref }} \
-            -e GIT_REPO="$(git config --get remote.origin.url)" \
+            -e REPO=${{ github.repository }} \
             dagandersen/argocd-diff-preview:latest
 
       - name: Post diff as comment

README.md

@@ -146,7 +146,7 @@ jobs:
             -v $(pwd)/pull-request:/target-branch \
             -v $(pwd)/output:/output \
             -e TARGET_BRANCH=${{ github.head_ref }} \
-            -e GIT_REPO="$(git config --get remote.origin.url)" \
+            -e REPO=${{ github.repository }} \
             dagandersen/argocd-diff-preview:latest
 
       - name: Post diff as comment
@@ -254,9 +254,9 @@ OPTIONS:
         --base-branch-folder <folder>       Base branch folder [env: BASE_BRANCH_FOLDER=]  [default: base-branch]
     -i, --diff-ignore <diff-ignore>         Ignore lines in diff. Example: use 'v[1,9]+.[1,9]+.[1,9]+' for ignoring changes caused by version changes following semver [env: DIFF_IGNORE=]
     -r, --file-regex <file-regex>           Regex to filter files. Example: "/apps_.*\.yaml" [env: FILE_REGEX=]
-    -g, --git-repo <git-repository>         Git repository URL [env: GIT_REPO=]
         --local-cluster-tool <tool>         Local cluster tool. Options: kind, minikube [env: LOCAL_CLUSTER_TOOL=] [default: auto]
     -o, --output-folder <output-folder>     Output folder where the diff will be saved [env: OUTPUT_FOLDER=]  [default: ./output]
+        --repo <repo>                       Git Repository. Format: OWNER/REPO [env: REPO=]
     -s, --secrets-folder <secrets-folder>   Secrets folder where the secrets are read from [env: SECRETS_FOLDER=]  [default: ./secrets]
     -t, --target-branch <target-branch>     Target branch name [env: TARGET_BRANCH=]
         --target-branch-folder <folder>     Target branch folder [env: TARGET_BRANCH_FOLDER=]  [default: target-branch]

makefile

@@ -9,7 +9,7 @@ local-test-cargo:
 	cd base-branch && gh repo clone $(github_org)/$(gitops_repo) -- --depth=1 --branch "$(base_branch)" && cp -r $(gitops_repo)/. base-branch && rm -rf .git && echo "*" > .gitignore && rm -rf $(gitops_repo) && cd -
 	cd target-branch && gh repo clone $(github_org)/$(gitops_repo) -- --depth=1 --branch "$(target_branch)" && cp -r $(gitops_repo)/. target-branch && rm -rf .git && echo "*" > .gitignore && rm -rf $(gitops_repo) && cd -
 
-	cargo run -- -b "$(base_branch)" -t "$(target_branch)" -g "https://github.com/$(github_org)/$(gitops_repo).git" -r "$(regex)" --debug
+	cargo run -- -b "$(base_branch)" -t "$(target_branch)" --repo $(github_org)/$(gitops_repo) -r "$(regex)" --debug
 
 local-test-docker:
 	# Pull repos
@@ -29,6 +29,6 @@ local-test-docker:
 		-v $(PWD)/secrets:/secrets \
 		-e BASE_BRANCH=$(base_branch) \
 		-e TARGET_BRANCH=$(target_branch) \
-		-e GIT_REPO="https://github.com/$(github_org)/$(gitops_repo).git" \
+		-e REPO=$(github_org)/$(gitops_repo) \
 		-e FILE_REGEX=$(regex) \
 		image-arm64

src/main.rs

@@ -60,9 +60,9 @@ struct Opt {
     #[structopt(long, env, default_value = "target-branch")]
     target_branch_folder: String,
 
-    /// Git repository URL
-    #[structopt(short = "g", long = "git-repo", env = "GIT_REPO")]
-    git_repository: String,
+    /// Git Repository. Format: OWNER/REPO
+    #[structopt(long = "repo", env)]
+    repo: String,
 
     /// Output folder where the diff will be saved
     #[structopt(short, long, default_value = "./output", env)]
@@ -132,7 +132,7 @@ async fn main() -> Result<(), Box<dyn Error>> {
     let base_branch_folder = opt.base_branch_folder;
     let target_branch_name = opt.target_branch;
     let target_branch_folder = opt.target_branch_folder;
-    let repo = opt.git_repository;
+    let repo = opt.repo;
     let diff_ignore = opt.diff_ignore;
     let timeout = opt.timeout;
     let output_folder = opt.output_folder.as_str();
@@ -150,6 +150,12 @@ 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);
@@ -158,7 +164,7 @@ async fn main() -> Result<(), Box<dyn Error>> {
     info!("✨ - target-branch-folder: {}", target_branch_folder);
     info!("✨ - secrets-folder: {}", secrets_folder);
     info!("✨ - output-folder: {}", output_folder);
-    info!("✨ - git-repo: {}", repo);
+    info!("✨ - repo: {}", repo);
     info!("✨ - timeout: {} seconds", timeout);
     if let Some(a) = file_regex.clone() {
         info!("✨ - file-regex: {}", a.as_str());

src/parsing.rs

@@ -100,14 +100,13 @@ async fn patch_argocd_applications(
             if spec["source"]["repoURL"]
                 .as_str()
                 .unwrap()
-                .trim_end_matches(".git")
-                == repo
+                .contains(repo)
             {
                 spec["source"]["targetRevision"] = serde_yaml::Value::String(branch.to_string());
             }
         } else if spec.contains_key("sources") {
             for source in spec["sources"].as_sequence_mut().unwrap() {
-                if source["repoURL"].as_str().unwrap().trim_end_matches(".git") == repo {
+                if source["repoURL"].as_str().unwrap().contains(repo) {
                     source["targetRevision"] = serde_yaml::Value::String(branch.to_string());
                 }
             }