Unwind the task module and return to flat file/module structure.

src/lib.rs

@@ -1,18 +1,21 @@
 use std::{thread::sleep, time::Duration};
 
-use task::{scheduled::ScheduledTask, Workload};
+use crate::{task::ScheduledTask, workload::Workload};
 
 pub mod actions;
 pub mod config;
 pub mod errors;
+pub mod github;
 pub mod gix;
 pub mod opts;
 pub mod receiver;
+pub mod state;
 pub mod store;
 pub mod task;
 #[cfg(test)]
 pub(crate) mod testutils;
 pub(crate) mod utils;
+pub mod workload;
 
 #[derive(Debug, PartialEq)]
 pub enum Progress {
@@ -76,11 +79,7 @@ mod lib {
 
     use gix::{hash::Kind, ObjectId};
 
-    use crate::{
-        errors::GitOpsError,
-        task::{scheduled::ScheduledTask, State},
-        testutils::TestWorkload,
-    };
+    use crate::{errors::GitOpsError, state::State, task::ScheduledTask, testutils::TestWorkload};
 
     #[test]
     fn run_eligible_task() {

src/main.rs

@@ -5,8 +5,8 @@ use kitops::errors::GitOpsError;
 use kitops::opts::{load_store, load_tasks, CliOptions};
 use kitops::run_tasks;
 use kitops::store::Store;
-use kitops::task::gitworkload::GitWorkload;
-use kitops::task::scheduled::ScheduledTask;
+use kitops::task::ScheduledTask;
+use kitops::workload::GitWorkload;
 use std::collections::HashSet;
 use std::time::Duration;
 

src/opts.rs

@@ -5,14 +5,12 @@ use clap::Parser;
 use crate::{
     config::{read_config, GitTaskConfig},
     errors::GitOpsError,
+    github::{github_watcher, GithubUrlProvider},
     gix::DefaultUrlProvider,
     receiver::logging_receiver,
     store::{FileStore, Store},
-    task::{
-        github::{github_watcher, GithubUrlProvider},
-        gitworkload::GitWorkload,
-        scheduled::ScheduledTask,
-    },
+    task::ScheduledTask,
+    workload::GitWorkload,
 };
 
 const DEFAULT_BRANCH: &str = "main";

src/task/mod.rs → src/state.rs

@@ -1,23 +1,8 @@
-use std::{
-    path::PathBuf,
-    time::{Duration, SystemTime},
-};
+use std::time::SystemTime;
 
 use gix::{hash::Kind, ObjectId};
 use serde::{Deserialize, Serialize};
 
-use crate::errors::GitOpsError;
-
-pub mod github;
-pub mod gitworkload;
-pub mod scheduled;
-
-pub trait Workload {
-    fn id(&self) -> String;
-    fn interval(&self) -> Duration;
-    fn perform(self, workdir: PathBuf, current_sha: ObjectId) -> Result<ObjectId, GitOpsError>;
-}
-
 #[derive(Clone, Debug, Serialize, Deserialize)]
 pub struct State {
     pub next_run: SystemTime,

src/store.rs

@@ -4,10 +4,7 @@ use std::{
     path::{Path, PathBuf},
 };
 
-use crate::{
-    errors::GitOpsError,
-    task::{scheduled::ScheduledTask, State, Workload},
-};
+use crate::{errors::GitOpsError, state::State, task::ScheduledTask, workload::Workload};
 
 pub trait Store {
     fn get(&self, id: &str) -> Option<&State>;

src/task/scheduled.rs → src/task.rs

@@ -6,9 +6,7 @@ use std::{
 
 use gix::ObjectId;
 
-use crate::errors::GitOpsError;
-
-use super::{State, Workload};
+use crate::{errors::GitOpsError, state::State, workload::Workload};
 
 pub struct ScheduledTask<W: Workload + Clone + Send> {
     work: W,
@@ -89,10 +87,7 @@ mod tests {
 
     use gix::ObjectId;
 
-    use crate::{
-        task::{scheduled::ScheduledTask, State},
-        testutils::TestWorkload,
-    };
+    use crate::{state::State, task::ScheduledTask, testutils::TestWorkload};
 
     #[test]
     fn scheduled_task_flow() {

src/testutils.rs

@@ -2,10 +2,7 @@ use std::{path::PathBuf, sync::Arc, thread::sleep, time::Duration};
 
 use gix::ObjectId;
 
-use crate::{
-    errors::GitOpsError,
-    task::{scheduled::ScheduledTask, Workload},
-};
+use crate::{errors::GitOpsError, task::ScheduledTask, workload::Workload};
 
 impl<W: Workload + Clone + Send + 'static> ScheduledTask<W> {
     pub fn await_finished(&self) {

src/task/gitworkload.rs → src/workload.rs

@@ -14,7 +14,11 @@ use crate::{
     receiver::WorkloadEvent,
 };
 
-use super::Workload;
+pub trait Workload {
+    fn id(&self) -> String;
+    fn interval(&self) -> Duration;
+    fn perform(self, workdir: PathBuf, current_sha: ObjectId) -> Result<ObjectId, GitOpsError>;
+}
 
 #[allow(clippy::type_complexity)]
 #[derive(Clone)]

tests/workload.rs

@@ -6,7 +6,7 @@ use kitops::{
     errors::GitOpsError,
     gix::DefaultUrlProvider,
     receiver::{SourceType, WorkloadEvent},
-    task::{gitworkload::GitWorkload, Workload},
+    workload::{GitWorkload, Workload},
 };
 use utils::*;