fix: minor development bug fixes (#806)

* fix: old projects deserialized without idle-minutes * fix: cargo-chef cook failure
shuttle-hq · Apr 20, 2023 · c596e46 · c596e46
1 parent b048d9c
commit c596e46
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 17 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -410,7 +410,7 @@ jobs:
   linux-qa:
     machine:
       image: ubuntu-2004:current
-      resource_class: xlarge
+    resource_class: xlarge
     steps:
       - checkout
       - run:

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/cargo-shuttle/Cargo.toml b/cargo-shuttle/Cargo.toml
@@ -64,10 +64,6 @@ features = ["models"]
 [dependencies.shuttle-proto]
 workspace = true
 
-[dependencies.shuttle-secrets]
-version = "0.14.0"
-path = "../resources/secrets"
-
 [dependencies.shuttle-service]
 workspace = true
 features = ["builder"]

diff --git a/common/src/models/project.rs b/common/src/models/project.rs
@@ -8,9 +8,14 @@ use std::fmt::{Display, Formatter};
 use strum::EnumString;
 use utoipa::ToSchema;
 
-// Timeframe before a project is considered idle
+/// Timeframe before a project is considered idle
 pub const IDLE_MINUTES: u64 = 30;
 
+/// Function to set [IDLE_MINUTES] as a serde default
+pub const fn idle_minutes() -> u64 {
+    IDLE_MINUTES
+}
+
 #[derive(Deserialize, Serialize, Clone, ToSchema)]
 #[schema(as = shuttle_common::models::project::Response)]
 pub struct Response {

diff --git a/gateway/src/project.rs b/gateway/src/project.rs
@@ -20,7 +20,7 @@ use hyper::Client;
 use once_cell::sync::Lazy;
 use rand::distributions::{Alphanumeric, DistString};
 use serde::{Deserialize, Serialize};
-use shuttle_common::models::project::IDLE_MINUTES;
+use shuttle_common::models::project::{idle_minutes, IDLE_MINUTES};
 use tokio::time::{sleep, timeout};
 use tracing::{debug, error, info, instrument};
 
@@ -582,6 +582,7 @@ pub struct ProjectCreating {
     #[serde(default)]
     recreate_count: usize,
     /// Label set on container as to how many minutes to wait before a project is considered idle
+    #[serde(default = "idle_minutes")]
     idle_minutes: u64,
 }