feat(gateway): don't deduplicate resource list

shuttle-hq · Oct 23, 2023 · 13a9e85 · 13a9e85
1 parent faf1961
commit 13a9e85
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/common/src/database.rs b/common/src/database.rs
@@ -5,7 +5,7 @@ use strum::{Display, EnumString};
 #[cfg(feature = "openapi")]
 use utoipa::ToSchema;
 
-#[derive(Clone, Copy, Debug, Deserialize, Serialize, Eq, PartialEq, Hash)]
+#[derive(Clone, Copy, Debug, Deserialize, Serialize, Eq, PartialEq)]
 #[serde(rename_all = "lowercase")]
 #[cfg_attr(feature = "openapi", derive(ToSchema))]
 #[cfg_attr(feature = "openapi", schema(as = shuttle_common::database::Type))]
@@ -14,7 +14,7 @@ pub enum Type {
     Shared(SharedEngine),
 }
 
-#[derive(Clone, Copy, Debug, Deserialize, Display, Serialize, EnumString, Eq, PartialEq, Hash)]
+#[derive(Clone, Copy, Debug, Deserialize, Display, Serialize, EnumString, Eq, PartialEq)]
 #[serde(rename_all = "lowercase")]
 #[strum(serialize_all = "lowercase")]
 #[cfg_attr(feature = "openapi", derive(ToSchema))]
@@ -24,7 +24,7 @@ pub enum AwsRdsEngine {
     MariaDB,
 }
 
-#[derive(Clone, Copy, Debug, Deserialize, Display, Serialize, EnumString, Eq, PartialEq, Hash)]
+#[derive(Clone, Copy, Debug, Deserialize, Display, Serialize, EnumString, Eq, PartialEq)]
 #[serde(rename_all = "lowercase")]
 #[strum(serialize_all = "lowercase")]
 #[cfg_attr(feature = "openapi", derive(ToSchema))]

diff --git a/common/src/resource.rs b/common/src/resource.rs
@@ -25,7 +25,7 @@ pub struct Response {
     pub data: Value,
 }
 
-#[derive(Clone, Copy, Debug, Deserialize, Serialize, Eq, PartialEq, Hash)]
+#[derive(Clone, Copy, Debug, Deserialize, Serialize, Eq, PartialEq)]
 #[serde(rename_all = "lowercase")]
 #[cfg_attr(feature = "openapi", derive(ToSchema))]
 #[cfg_attr(feature = "openapi", schema(as = shuttle_common::resource::Type))]

diff --git a/gateway/src/api/latest.rs b/gateway/src/api/latest.rs
@@ -1,4 +1,3 @@
-use std::collections::HashSet;
 use std::io::Cursor;
 use std::net::SocketAddr;
 use std::ops::Sub;
@@ -373,8 +372,6 @@ async fn delete_project(
                 )
             })
             .map(|resource| resource.r#type.to_string())
-            .collect::<HashSet<_>>()
-            .into_iter()
             .collect::<Vec<_>>();
 
         if !resources.is_empty() {