Refactor to add runtime module (#733)

jamsocket · May 17, 2024 · 2e2cbe4 · 2e2cbe4
1 parent 68bc278
commit 2e2cbe4
Show file tree

Hide file tree

Showing 11 changed files with 15 additions and 12 deletions.
diff --git a/plane/plane-tests/tests/common/test_env.rs b/plane/plane-tests/tests/common/test_env.rs
@@ -7,7 +7,7 @@ use plane::{
     controller::ControllerServer,
     database::PlaneDatabase,
     dns::run_dns_with_listener,
-    drone::{docker::DockerRuntimeConfig, Drone, DroneConfig, ExecutorConfig},
+    drone::{runtime::docker::DockerRuntimeConfig, Drone, DroneConfig, ExecutorConfig},
     names::{AcmeDnsServerName, ControllerName, DroneName, Name},
     proxy::AcmeEabConfiguration,
     types::{ClusterName, DronePoolName},

diff --git a/plane/plane-tests/tests/docker_command.rs b/plane/plane-tests/tests/docker_command.rs
@@ -2,7 +2,7 @@ use anyhow::Context;
 use bollard::container::LogsOptions;
 use futures_util::TryStreamExt;
 use plane::{
-    drone::docker::{
+    drone::runtime::docker::{
         commands::{get_container_config_from_executor_config, pull_image},
         types::ContainerId,
     },

diff --git a/plane/plane-tests/tests/metrics.rs b/plane/plane-tests/tests/metrics.rs
@@ -2,7 +2,7 @@ use common::test_env::TestEnvironment;
 use common::timeout::WithTimeout;
 use plane::{
     drone::{
-        docker::{DockerRuntime, DockerRuntimeConfig},
+        runtime::docker::{DockerRuntime, DockerRuntimeConfig},
         runtime::Runtime,
     },
     names::{BackendName, Name},

diff --git a/plane/src/drone/command.rs b/plane/src/drone/command.rs
@@ -1,5 +1,5 @@
 use crate::{
-    drone::{docker::DockerRuntimeConfig, DroneConfig},
+    drone::{runtime::docker::DockerRuntimeConfig, DroneConfig},
     names::{DroneName, OrRandom},
     types::{ClusterName, DronePoolName},
     util::resolve_hostname,

diff --git a/plane/src/drone/mod.rs b/plane/src/drone/mod.rs
@@ -1,11 +1,14 @@
 use self::{
-    docker::DockerRuntimeConfig, executor::Executor, heartbeat::HeartbeatLoop,
-    key_manager::KeyManager, runtime::Runtime, state_store::StateStore,
+    executor::Executor,
+    heartbeat::HeartbeatLoop,
+    key_manager::KeyManager,
+    runtime::{docker::DockerRuntimeConfig, Runtime},
+    state_store::StateStore,
 };
 use crate::{
     client::PlaneClient,
     database::backend::BackendActionMessage,
-    drone::docker::DockerRuntime,
+    drone::runtime::docker::DockerRuntime,
     names::DroneName,
     protocol::{BackendAction, MessageFromDrone, MessageToDrone, RenewKeyResponse},
     signals::wait_for_shutdown_signal,
@@ -29,7 +32,6 @@ use valuable::Valuable;
 
 mod backend_manager;
 pub mod command;
-pub mod docker;
 mod executor;
 mod heartbeat;
 mod key_manager;

diff --git a/plane/src/drone/docker/commands.rs → plane/src/drone/runtime/docker/commands.rs b/plane/src/drone/docker/commands.rs → plane/src/drone/runtime/docker/commands.rs
diff --git a/plane/src/drone/docker/metrics.rs → plane/src/drone/runtime/docker/metrics.rs b/plane/src/drone/docker/metrics.rs → plane/src/drone/runtime/docker/metrics.rs
diff --git a/plane/src/drone/docker/mod.rs → plane/src/drone/runtime/docker/mod.rs b/plane/src/drone/docker/mod.rs → plane/src/drone/runtime/docker/mod.rs
@@ -5,7 +5,7 @@ use self::{
 };
 use crate::{
     database::backend::BackendMetricsMessage,
-    drone::{docker::metrics::metrics_loop, runtime::Runtime},
+    drone::runtime::{docker::metrics::metrics_loop, Runtime},
     heartbeat_consts::KILL_AFTER_SOFT_TERMINATE_SECONDS,
     names::BackendName,
     protocol::AcquiredKey,

diff --git a/plane/src/drone/docker/types.rs → plane/src/drone/runtime/docker/types.rs b/plane/src/drone/docker/types.rs → plane/src/drone/runtime/docker/types.rs
diff --git a/plane/src/drone/docker/wait_backend.rs → .../src/drone/runtime/docker/wait_backend.rs b/plane/src/drone/docker/wait_backend.rs → .../src/drone/runtime/docker/wait_backend.rs
diff --git a/plane/src/drone/runtime.rs → plane/src/drone/runtime/mod.rs b/plane/src/drone/runtime.rs → plane/src/drone/runtime/mod.rs
@@ -1,15 +1,16 @@
-use std::net::SocketAddr;
-
-use super::docker::{SpawnResult, TerminateEvent};
 use crate::{
     database::backend::BackendMetricsMessage,
     names::BackendName,
     protocol::AcquiredKey,
     types::{backend_state::BackendError, BearerToken},
 };
 use anyhow::Error;
+use docker::{SpawnResult, TerminateEvent};
 use futures_util::{Future, Stream};
 use serde::{de::DeserializeOwned, Serialize};
+use std::net::SocketAddr;
+
+pub mod docker;
 
 pub trait Runtime: Send + Sync + 'static {
     type RuntimeConfig;