into_resource_id

Author: epompeii

lib/bencher_client/src/lib.rs

@@ -247,7 +247,40 @@ macro_rules! from_slug {
     };
 }
 
-from_slug!(BranchSlug, TestbedSlug, BenchmarkSlug, MeasureSlug);
+from_slug!(
+    OrganizationSlug,
+    ProjectSlug,
+    BranchSlug,
+    TestbedSlug,
+    BenchmarkSlug,
+    MeasureSlug,
+    UserSlug
+);
+
+macro_rules! from_resource_id {
+    ($($from:ident),*) => {
+        $(
+            impl From<bencher_json::$from> for types::ResourceId {
+                fn from(json: bencher_json::$from) -> Self {
+                    match json {
+                        bencher_json::$from::Uuid(uuid) => Self::Uuid(uuid.into()),
+                        bencher_json::$from::Slug(slug) => Self::Slug(slug.into()),
+                    }.into()
+                }
+            }
+        )*
+    };
+}
+
+from_resource_id!(
+    OrganizationResourceId,
+    ProjectResourceId,
+    BranchResourceId,
+    TestbedResourceId,
+    BenchmarkResourceId,
+    MeasureResourceId,
+    UserResourceId
+);
 
 macro_rules! from_name_id {
     ($($from:ident),*) => {

lib/bencher_json/src/lib.rs

@@ -4,8 +4,8 @@ pub use bencher_context::RunContext;
 pub use bencher_valid::{
     BenchmarkName, Boundary, BranchName, CdfBoundary, DateTime, DateTimeMillis, Email, GitHash,
     Index, IqrBoundary, Jwt, Model, ModelTest, NameId, NonEmpty, PercentageBoundary, ResourceId,
-    ResourceName, SampleSize, Sanitize, Search, Secret, Slug, Units, Url, UserName, ValidError,
-    Window,
+    ResourceName, SampleSize, Sanitize, Search, Secret, Slug, IntoResourceId, Units, Url, UserName,
+    ValidError, Window,
 };
 #[cfg(feature = "plus")]
 pub use bencher_valid::{

lib/bencher_json/src/typed_slug.rs

@@ -50,6 +50,12 @@ macro_rules! typed_slug {
             }
         }
 
+        impl<U> $crate::IntoResourceId<U, $slug> for $slug {
+            fn into_resource_id(self) -> $crate::ResourceId<U, $slug> {
+                $crate::ResourceId::Slug(self)
+            }
+        }
+
         $crate::typed_db::typed_db!($slug);
     };
     ($slug:ident, $name:ident) => {

lib/bencher_json/src/typed_uuid.rs

@@ -49,6 +49,12 @@ macro_rules! typed_uuid {
             }
         }
 
+        impl<S> $crate::IntoResourceId<$uuid, S> for $uuid {
+            fn into_resource_id(self) -> $crate::ResourceId<$uuid, S> {
+                $crate::ResourceId::Uuid(self)
+            }
+        }
+
         impl $uuid {
             pub fn new() -> Self {
                 Self(uuid::Uuid::new_v4())

lib/bencher_schema/src/model/organization/mod.rs

@@ -1,8 +1,8 @@
 use std::string::ToString as _;
 
 use bencher_json::{
-    DateTime, JsonNewOrganization, JsonOrganization, Jwt, OrganizationResourceId, OrganizationSlug,
-    OrganizationUuid, ProjectSlug, ResourceName,
+    DateTime, IntoResourceId as _, JsonNewOrganization, JsonOrganization, Jwt,
+    OrganizationResourceId, OrganizationSlug, OrganizationUuid, ProjectSlug, ResourceName,
     organization::{
         JsonOrganizationPatch, JsonOrganizationPatchNull, JsonUpdateOrganization,
         member::OrganizationRole,
@@ -96,7 +96,7 @@ impl QueryOrganization {
         // The project organization should be created with the project's slug.
         if let Ok(query_organization) = Self::from_resource_id(
             conn_lock!(context),
-            &OrganizationSlug::from(project_slug.clone()).into(),
+            &OrganizationSlug::from(project_slug.clone()).into_resource_id(),
         ) {
             // If the project is part of an organization that is claimed,
             // then the project can not have anonymous reports.

lib/bencher_valid/src/lib.rs

@@ -53,7 +53,7 @@ pub use plus::{
     CardBrand, CardCvc, CardNumber, Entitlements, ExpirationMonth, ExpirationYear, LastFour,
     LicensedPlanId, MeteredPlanId, PlanLevel, PlanStatus,
 };
-pub use resource_id::ResourceId;
+pub use resource_id::{IntoResourceId, ResourceId};
 pub use resource_name::ResourceName;
 pub use search::Search;
 pub use secret::Secret;

lib/bencher_valid/src/resource_id.rs

@@ -17,10 +17,8 @@ pub enum ResourceId<U, S> {
     Slug(S),
 }
 
-impl<U, S> From<S> for ResourceId<U, S> {
-    fn from(slug: S) -> Self {
-        Self::Slug(slug)
-    }
+pub trait IntoResourceId<U, S> {
+    fn into_resource_id(self) -> ResourceId<U, S>;
 }
 
 #[cfg(feature = "schema")]

services/cli/src/bencher/sub/organization/member/invite.rs

@@ -1,5 +1,5 @@
 use bencher_client::types::{JsonNewMember, OrganizationRole};
-use bencher_json::{Email, ResourceId, UserName};
+use bencher_json::{Email, OrganizationResourceId, UserName};
 
 use crate::{
     CliError,
@@ -11,7 +11,7 @@ use crate::bencher::SubCmd;
 
 #[derive(Debug, Clone)]
 pub struct Invite {
-    organization: ResourceId,
+    organization: OrganizationResourceId,
     name: Option<UserName>,
     email: Email,
     role: OrganizationRole,

services/cli/src/bencher/sub/organization/member/list.rs

@@ -1,5 +1,5 @@
 use bencher_client::types::{JsonDirection, OrgMembersSort};
-use bencher_json::{ResourceId, UserName};
+use bencher_json::{OrganizationResourceId, UserName};
 
 use crate::{
     CliError,
@@ -12,7 +12,7 @@ use crate::{
 
 #[derive(Debug)]
 pub struct List {
-    pub organization: ResourceId,
+    pub organization: OrganizationResourceId,
     pub name: Option<UserName>,
     pub search: Option<String>,
     pub pagination: Pagination,

services/cli/src/bencher/sub/organization/member/remove.rs

@@ -1,4 +1,4 @@
-use bencher_json::ResourceId;
+use bencher_json::{OrganizationResourceId, UserResourceId};
 
 use crate::{
     CliError,
@@ -8,8 +8,8 @@ use crate::{
 
 #[derive(Debug)]
 pub struct Remove {
-    pub organization: ResourceId,
-    pub user: ResourceId,
+    pub organization: OrganizationResourceId,
+    pub user: UserResourceId,
     pub backend: AuthBackend,
 }