Refactor to DRY

alex-karpenko · Mar 24, 2024 · c977377 · c977377
1 parent 0c8dd99
commit c977377
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 21 deletions.
diff --git a/.gitignore b/.gitignore
@@ -11,3 +11,4 @@ target/
 
 #
 /*.yaml
+TODO.*
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,7 +1,9 @@
 {
     "cSpell.words": [
+        "chrono",
         "clustergitrepos",
         "cntrlr",
+        "crdgen",
         "Finalizer",
         "gitrepo",
         "gitrepos",

diff --git a/src/controllers.rs b/src/controllers.rs
@@ -200,14 +200,18 @@ where
 }
 
 pub(crate) trait Reconcilable {
-    async fn reconcile_2(&self, ctx: Arc<Context>) -> Result<ReconcileAction>;
-    async fn cleanup_2(&self, ctx: Arc<Context>) -> Result<ReconcileAction>;
-    fn finalizer_name(&self) -> &str;
+    async fn reconcile(&self, ctx: Arc<Context>) -> Result<ReconcileAction>;
+    async fn cleanup(&self, ctx: Arc<Context>) -> Result<ReconcileAction>;
+    fn finalizer_name(&self) -> String;
     fn kind(&self) -> &str;
 }
 
 // TODO: restrict K to Reconcilable trait
-fn error_policy<K>(_resource: Arc<K>, error: &Error, _ctx: Arc<Context>) -> ReconcileAction {
+fn error_policy<K: Reconcilable>(
+    _resource: Arc<K>,
+    error: &Error,
+    _ctx: Arc<Context>,
+) -> ReconcileAction {
     warn!("reconcile failed: {:?}", error);
     ReconcileAction::await_change()
 }
@@ -223,19 +227,19 @@ where
     let resource_api: Api<K> = Api::namespaced(ctx.client.clone(), &ns);
 
     info!(
-        "Reconciling {} `{}` in {}",
+        "Reconciling {} `{}/{}`",
         resource.kind(),
         resource.name_any(),
         ns
     );
     finalizer(
         &resource_api,
-        resource.finalizer_name(),
-        resource.clone(),
+        resource.finalizer_name().as_str(),
+        resource,
         |event| async {
             match event {
-                Finalizer::Apply(resource) => resource.reconcile_2(ctx.clone()).await,
-                Finalizer::Cleanup(resource) => resource.cleanup_2(ctx.clone()).await,
+                Finalizer::Apply(resource) => resource.reconcile(ctx.clone()).await,
+                Finalizer::Cleanup(resource) => resource.cleanup(ctx.clone()).await,
             }
         },
     )

diff --git a/src/controllers/action.rs b/src/controllers/action.rs
@@ -100,12 +100,12 @@ impl ActionJob {
 }
 
 impl Reconcilable for Action {
-    async fn reconcile_2(&self, _ctx: Arc<Context>) -> Result<ReconcileAction> {
+    async fn reconcile(&self, _ctx: Arc<Context>) -> Result<ReconcileAction> {
         // If no events were received, check back 30 minutes
         Ok(ReconcileAction::await_change())
     }
 
-    async fn cleanup_2(&self, _ctx: Arc<Context>) -> Result<ReconcileAction> {
+    async fn cleanup(&self, _ctx: Arc<Context>) -> Result<ReconcileAction> {
         info!(
             "Cleanup Action `{}` in {}",
             self.name_any(),
@@ -114,8 +114,8 @@ impl Reconcilable for Action {
         Ok(ReconcileAction::await_change())
     }
 
-    fn finalizer_name(&self) -> &str {
-        "actions.git-events-runner.rs"
+    fn finalizer_name(&self) -> String {
+        String::from("actions.git-events-runner.rs")
     }
 
     fn kind(&self) -> &str {

diff --git a/src/controllers/git_repo.rs b/src/controllers/git_repo.rs
@@ -142,7 +142,7 @@ enum RepoUriSchema {
 }
 
 impl Reconcilable for GitRepo {
-    async fn reconcile_2(&self, ctx: Arc<Context>) -> Result<ReconcileAction> {
+    async fn reconcile(&self, ctx: Arc<Context>) -> Result<ReconcileAction> {
         let client = ctx.client.clone();
         let recorder = &ctx.diagnostics.read().await.recorder(client.clone(), self);
         let ns = self.namespace().unwrap();
@@ -304,7 +304,7 @@ impl Reconcilable for GitRepo {
         Ok(ReconcileAction::requeue(Duration::from_secs(30 * 60)))
     }
 
-    async fn cleanup_2(&self, _ctx: Arc<Context>) -> Result<ReconcileAction> {
+    async fn cleanup(&self, _ctx: Arc<Context>) -> Result<ReconcileAction> {
         info!(
             "Cleanup GitRepo `{}` in {}",
             self.name_any(),
@@ -313,8 +313,8 @@ impl Reconcilable for GitRepo {
         Ok(ReconcileAction::await_change())
     }
 
-    fn finalizer_name(&self) -> &str {
-        "gitrepos.git-events-runner.rs"
+    fn finalizer_name(&self) -> String {
+        String::from("gitrepos.git-events-runner.rs")
     }
 
     fn kind(&self) -> &str {

diff --git a/src/controllers/trigger.rs b/src/controllers/trigger.rs
@@ -214,7 +214,7 @@ pub enum TriggerActionKind {
 }
 
 impl Reconcilable for Trigger {
-    async fn reconcile_2(&self, ctx: Arc<Context>) -> Result<ReconcileAction> {
+    async fn reconcile(&self, ctx: Arc<Context>) -> Result<ReconcileAction> {
         let client = ctx.client.clone();
         let recorder = &ctx.diagnostics.read().await.recorder(client.clone(), self);
         let ns = self.namespace().unwrap();
@@ -365,7 +365,7 @@ impl Reconcilable for Trigger {
         Ok(ReconcileAction::requeue(Duration::from_secs(30 * 60)))
     }
 
-    async fn cleanup_2(&self, ctx: Arc<Context>) -> Result<ReconcileAction> {
+    async fn cleanup(&self, ctx: Arc<Context>) -> Result<ReconcileAction> {
         info!(
             "Cleanup Trigger `{}` in {}",
             self.name_any(),
@@ -392,8 +392,8 @@ impl Reconcilable for Trigger {
         Ok(ReconcileAction::await_change())
     }
 
-    fn finalizer_name(&self) -> &str {
-        "triggers.git-events-runner.rs"
+    fn finalizer_name(&self) -> String {
+        String::from("triggers.git-events-runner.rs")
     }
 
     fn kind(&self) -> &str {