Change from ProjectName to String

shuttle-hq · Dec 5, 2023 · 97c7bb7 · 97c7bb7
1 parent 41670ed
commit 97c7bb7
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/cargo-shuttle/Cargo.toml b/cargo-shuttle/Cargo.toml
@@ -9,7 +9,7 @@ homepage = "https://www.shuttle.rs"
 rust-version = "1.70"
 
 [dependencies]
-shuttle-common = { workspace = true, features = ["models", "backend"] }
+shuttle-common = { workspace = true, features = ["models"] }
 shuttle-proto = { workspace = true, features = ["provisioner", "runtime"] }
 shuttle-service = { workspace = true, features = ["builder", "runner"] }
 

diff --git a/common/src/models/error.rs b/common/src/models/error.rs
@@ -1,6 +1,5 @@
 use std::fmt::{Display, Formatter};
 
-use crate::models::project::name::ProjectName;
 use crossterm::style::Stylize;
 use http::StatusCode;
 use serde::{Deserialize, Serialize};
@@ -40,7 +39,7 @@ pub enum ErrorKind {
     Forbidden,
     UserNotFound,
     UserAlreadyExists,
-    ProjectNotFound(ProjectName),
+    ProjectNotFound(String),
     InvalidProjectName(InvalidProjectName),
     ProjectAlreadyExists,
     /// Contains a message describing a running state of the project.

diff --git a/gateway/src/auth.rs b/gateway/src/auth.rs
@@ -87,7 +87,7 @@ where
         if user.projects.contains(&scope) || user.claim.scopes.contains(&Scope::Admin) {
             Ok(Self { user, scope })
         } else {
-            Err(Error::from(ErrorKind::ProjectNotFound(scope)))
+            Err(Error::from(ErrorKind::ProjectNotFound(scope.to_string())))
         }
     }
 }
diff --git a/gateway/src/service.rs b/gateway/src/service.rs
@@ -388,7 +388,7 @@ impl GatewayService {
                         ))
                     }),
             })
-            .ok_or_else(|| Error::from_kind(ErrorKind::ProjectNotFound(project_name.clone())))
+            .ok_or_else(|| Error::from_kind(ErrorKind::ProjectNotFound(project_name.to_string())))
     }
 
     pub async fn project_name_exists(&self, project_name: &ProjectName) -> Result<bool, Error> {
@@ -472,7 +472,7 @@ impl GatewayService {
             .fetch_optional(&self.db)
             .await?
             .map(|row| row.get("account_name"))
-            .ok_or_else(|| Error::from(ErrorKind::ProjectNotFound(project_name.clone())))
+            .ok_or_else(|| Error::from(ErrorKind::ProjectNotFound(project_name.to_string())))
     }
 
     pub async fn control_key_from_project_name(
@@ -484,7 +484,7 @@ impl GatewayService {
             .fetch_optional(&self.db)
             .await?
             .map(|row| row.try_get("initial_key").unwrap())
-            .ok_or_else(|| Error::from(ErrorKind::ProjectNotFound(project_name.clone())))?;
+            .ok_or_else(|| Error::from(ErrorKind::ProjectNotFound(project_name.to_string())))?;
         Ok(control_key)
     }