Make pull policy and env optional (#559)

* Make pull policy and env optional * make resource limits optional
jamsocket · Jan 19, 2024 · 1314f72 · 1314f72
1 parent 8aa8415
commit 1314f72
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 7 deletions.
diff --git a/plane/plane-tests/tests/backend_lifecycle.rs b/plane/plane-tests/tests/backend_lifecycle.rs
@@ -27,7 +27,7 @@ async fn backend_lifecycle(env: TestEnvironment) {
         spawn_config: Some(SpawnConfig {
             executable: ExecutorConfig {
                 image: "ghcr.io/drifting-in-space/demo-image-drop-four".to_string(),
-                pull_policy: PullPolicy::IfNotPresent,
+                pull_policy: Some(PullPolicy::IfNotPresent),
                 env: HashMap::default(),
                 resource_limits: ResourceLimits::default(),
                 credentials: None,

diff --git a/plane/plane-tests/tests/backend_status_in_response.rs b/plane/plane-tests/tests/backend_status_in_response.rs
@@ -24,7 +24,7 @@ async fn backend_status_in_response(env: TestEnvironment) {
         spawn_config: Some(SpawnConfig {
             executable: ExecutorConfig {
                 image: "ghcr.io/drifting-in-space/demo-image-drop-four".to_string(),
-                pull_policy: PullPolicy::IfNotPresent,
+                pull_policy: Some(PullPolicy::IfNotPresent),
                 env: HashMap::default(),
                 resource_limits: ResourceLimits::default(),
                 credentials: None,

diff --git a/plane/plane-tests/tests/reuse_key.rs b/plane/plane-tests/tests/reuse_key.rs
@@ -24,7 +24,7 @@ async fn reuse_key(env: TestEnvironment) {
         spawn_config: Some(SpawnConfig {
             executable: ExecutorConfig {
                 image: "ghcr.io/drifting-in-space/demo-image-drop-four".to_string(),
-                pull_policy: PullPolicy::IfNotPresent,
+                pull_policy: Some(PullPolicy::IfNotPresent),
                 env: HashMap::default(),
                 resource_limits: ResourceLimits::default(),
                 credentials: None,

diff --git a/plane/src/drone/backend_manager.rs b/plane/src/drone/backend_manager.rs
@@ -182,7 +182,7 @@ impl BackendManager {
         match state.status {
             BackendStatus::Scheduled => StepStatusResult::SetState(state.to_loading()),
             BackendStatus::Loading => {
-                let force_pull = match self.executor_config.pull_policy {
+                let force_pull = match self.executor_config.pull_policy.unwrap_or_default() {
                     PullPolicy::IfNotPresent => false,
                     PullPolicy::Always => true,
                     PullPolicy::Never => {

diff --git a/plane/src/types.rs b/plane/src/types.rs
@@ -183,7 +183,7 @@ impl Display for BackendStatus {
     }
 }
 
-#[derive(Clone, Serialize, Deserialize, Debug, Default)]
+#[derive(Clone, Copy, Serialize, Deserialize, Debug, Default)]
 pub enum PullPolicy {
     #[default]
     IfNotPresent,
@@ -263,17 +263,19 @@ impl From<DockerRegistryAuth> for DockerCredentials {
 #[derive(Clone, Serialize, Deserialize, Debug)]
 pub struct ExecutorConfig {
     pub image: String,
-    pub pull_policy: PullPolicy,
+    pub pull_policy: Option<PullPolicy>,
     pub credentials: Option<DockerRegistryAuth>,
+    #[serde(default)]
     pub env: HashMap<String, String>,
+    #[serde(default)]
     pub resource_limits: ResourceLimits,
 }
 
 impl ExecutorConfig {
     pub fn from_image_with_defaults<T: Into<String>>(image: T) -> Self {
         Self {
             image: image.into(),
-            pull_policy: PullPolicy::default(),
+            pull_policy: None,
             env: HashMap::default(),
             resource_limits: ResourceLimits::default(),
             credentials: None,