Add support for 'changed files' and 'watch-pattern' annotation (#50)

Author: dag-andersen

.github/workflows/generate-diff.yml

@@ -9,7 +9,7 @@ on:
       - "examples/**"
 
 jobs:
-  build:
+  render-diff:
     runs-on: ubuntu-latest
     permissions:
       contents: read

.github/workflows/mkdocs.yaml

@@ -4,8 +4,12 @@ on:
     branches:
       - master
       - main
+    paths:
+      - "docs/**"
+
 permissions:
   contents: write
+
 jobs:
   deploy:
     runs-on: ubuntu-latest

.github/workflows/pr-build.yml

@@ -4,6 +4,9 @@ on:
   pull_request:
     branches:
       - "main"
+    paths:
+      - "src/**"
+      - Cargo.toml
 
 jobs:
   build-amd64:

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "argocd-diff-preview"
-version = "0.0.19"
+version = "0.0.20"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@@ -10,7 +10,7 @@ tokio = {version="1.40.0",features = ["full"]}
 base64 = "0.22.1"
 serde = "1.0.210"
 serde_yaml = "0.9.33"
-serde_json = "1.0.128"
+serde_json = "1.0.131"
 walkdir = "2.5.0"
 schemars = "0.8.21"
 structopt = { version = "0.3" }

Cargo.toml

@@ -0,0 +1,22 @@
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: my-app-labels
+  namespace: argocd
+  labels:
+    team: my-team
+spec:
+  project: default
+  destination:
+    name: in-cluster
+    namespace: default
+  sources:
+    - repoURL: https://github.com/dag-andersen/argocd-diff-preview
+      ref: local-files
+    - path: examples/helm/charts/myApp
+      repoURL: https://github.com/dag-andersen/argocd-diff-preview
+      helm:
+        valueFiles:
+          - $local-files/examples/helm/values/values.yaml
+        valuesObject:
+          replicaCount: 5

examples/helm/applications/label-selectors/my-app-labels.yaml

@@ -0,0 +1,22 @@
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: my-app-watch-pattern-broken-regex
+  namespace: argocd
+  annotations:
+    argocd-diff-preview/watch-pattern: '\'
+spec:
+  project: default
+  destination:
+    name: in-cluster
+    namespace: default
+  sources:
+    - repoURL: https://github.com/dag-andersen/argocd-diff-preview
+      ref: local-files
+    - path: examples/helm/charts/myApp
+      repoURL: https://github.com/dag-andersen/argocd-diff-preview
+      helm:
+        valueFiles:
+          - $local-files/examples/helm/values/values.yaml
+        valuesObject:
+          replicaCount: 5

examples/helm/applications/watch-pattern/broken-regex.yaml

@@ -0,0 +1,22 @@
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: my-app-watch-pattern-valid-regex
+  namespace: argocd
+  annotations:
+    argocd-diff-preview/watch-pattern: "examples/helm/values/.*"
+spec:
+  project: default
+  destination:
+    name: in-cluster
+    namespace: default
+  sources:
+    - repoURL: https://github.com/dag-andersen/argocd-diff-preview
+      ref: local-files
+    - path: examples/helm/charts/myApp
+      repoURL: https://github.com/dag-andersen/argocd-diff-preview
+      helm:
+        valueFiles:
+          - $local-files/examples/helm/values/values.yaml
+        valuesObject:
+          replicaCount: 5

examples/helm/applications/watch-pattern/valid-regex.yaml

@@ -10,10 +10,18 @@ pull-repostory:
 	cd base-branch   && gh repo clone $(github_org)/$(gitops_repo) -- --depth=1 --branch "$(base_branch)"   && cp -r $(gitops_repo)/. . && 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)/. . && rm -rf .git && echo "*" > .gitignore && rm -rf $(gitops_repo) && cd -
 
-local-test-cargo: pull-repostory
-	cargo run -- -b "$(base_branch)" -t "$(target_branch)" --repo $(github_org)/$(gitops_repo) -r "$(regex)" --debug --diff-ignore "$(diff-ignore)" --timeout $(timeout) -l "$(selector)"
+run-with-cargo: pull-repostory
+	cargo run -- -b "$(base_branch)" \
+		-t "$(target_branch)" \
+		--repo $(github_org)/$(gitops_repo) \
+		--debug  \
+		-r "$(regex)" \
+		--diff-ignore "$(diff_ignore)" \
+		--timeout $(timeout) \
+		-l "$(selector)" \
+		--files-changed="$(files_changed)"
 
-local-test-docker: pull-repostory
+run-with-docker: pull-repostory
 	docker build . -f $(docker_file) -t image
 	docker run \
 		--network=host \
@@ -27,6 +35,8 @@ local-test-docker: pull-repostory
 		-e TARGET_BRANCH=$(target_branch) \
 		-e REPO=$(github_org)/$(gitops_repo) \
 		-e FILE_REGEX="$(regex)" \
-		-e DIFF_IGNORE="$(diff-ignore)" \
+		-e DIFF_IGNORE="$(diff_ignore)" \
 		-e TIMEOUT=$(timeout) \
+		-e SELECTOR="$(selector)" \
+		-e FILES_CHANGED="$(files_changed)" \
 		image

makefile

@@ -60,8 +60,6 @@ pub async fn install_argo_cd(options: ArgoCDOptions<'_>) -> Result<(), Box<dyn E
         }
     }
 
-    info!("🦑 Installing Argo CD Helm Chart");
-
     let helm_install_command = format!(
         "helm install argocd argo/argo-cd -n argocd {} {} {}",
         values.unwrap_or_default(),
@@ -121,10 +119,8 @@ pub async fn install_argo_cd(options: ArgoCDOptions<'_>) -> Result<(), Box<dyn E
         let password_decoded = BASE64_STANDARD
             .decode(password_encoded)
             .expect("failed to decode password");
-        let password =
-            String::from_utf8(password_decoded).expect("failed to convert password to string");
 
-        password
+        String::from_utf8(password_decoded).expect("failed to convert password to string")
     };
 
     // sleep for 5 seconds