cli_resource_id

Author: epompeii

lib/bencher_client/src/lib.rs

@@ -253,19 +253,18 @@ from_slug!(
     BranchSlug,
     TestbedSlug,
     BenchmarkSlug,
-    MeasureSlug,
-    UserSlug
+    MeasureSlug
 );
 
 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()
+                    types::Slug::from(match json {
+                        bencher_json::$from::Uuid(uuid) => uuid.to_string(),
+                        bencher_json::$from::Slug(slug) => slug.to_string(),
+                    }).into()
                 }
             }
         )*

lib/bencher_valid/src/slug.rs

@@ -24,6 +24,12 @@ pub struct Slug(String);
 #[cfg(feature = "db")]
 crate::typed_string!(Slug);
 
+impl From<uuid::Uuid> for Slug {
+    fn from(uuid: uuid::Uuid) -> Self {
+        Self(uuid.to_string())
+    }
+}
+
 impl FromStr for Slug {
     type Err = ValidError;
 

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

@@ -1,4 +1,4 @@
-use bencher_json::OrganizationResourceId;
+use bencher_json::{OrganizationResourceId, UserResourceId};
 
 use crate::{
     CliError,

services/cli/src/bencher/sub/project/archive/mod.rs

@@ -1,4 +1,4 @@
-use bencher_json::ResourceId;
+use bencher_json::ProjectResourceId;
 
 use crate::{
     CliError,
@@ -14,7 +14,7 @@ use dimension::Dimension;
 
 #[derive(Debug, Clone)]
 pub struct Archive {
-    pub project: ResourceId,
+    pub project: ProjectResourceId,
     pub dimension: Dimension,
     pub action: ArchiveAction,
     pub backend: AuthBackend,

services/cli/src/bencher/sub/project/benchmark/create.rs

@@ -1,5 +1,5 @@
 use bencher_client::types::JsonNewBenchmark;
-use bencher_json::{BenchmarkName, BenchmarkSlug, ResourceId};
+use bencher_json::{BenchmarkName, BenchmarkSlug, ProjectResourceId};
 
 use crate::{
     CliError,
@@ -9,7 +9,7 @@ use crate::{
 
 #[derive(Debug, Clone)]
 pub struct Create {
-    pub project: ResourceId,
+    pub project: ProjectResourceId,
     pub name: BenchmarkName,
     pub slug: Option<BenchmarkSlug>,
     pub backend: AuthBackend,

services/cli/src/bencher/sub/project/benchmark/delete.rs

@@ -1,4 +1,4 @@
-use bencher_json::ResourceId;
+use bencher_json::{BenchmarkResourceId, ProjectResourceId};
 
 use crate::{
     CliError,
@@ -8,8 +8,8 @@ use crate::{
 
 #[derive(Debug)]
 pub struct Delete {
-    pub project: ResourceId,
-    pub benchmark: ResourceId,
+    pub project: ProjectResourceId,
+    pub benchmark: BenchmarkResourceId,
     pub backend: AuthBackend,
 }
 

services/cli/src/bencher/sub/project/benchmark/list.rs

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

services/cli/src/bencher/sub/project/benchmark/update.rs

@@ -1,5 +1,5 @@
 use bencher_client::types::JsonUpdateBenchmark;
-use bencher_json::{BenchmarkName, BenchmarkSlug, ResourceId};
+use bencher_json::{BenchmarkName, BenchmarkResourceId, BenchmarkSlug, ProjectResourceId};
 
 use crate::{
     CliError,
@@ -9,8 +9,8 @@ use crate::{
 
 #[derive(Debug, Clone)]
 pub struct Update {
-    pub project: ResourceId,
-    pub benchmark: ResourceId,
+    pub project: ProjectResourceId,
+    pub benchmark: BenchmarkResourceId,
     pub name: Option<BenchmarkName>,
     pub slug: Option<BenchmarkSlug>,
     pub archived: Option<bool>,

services/cli/src/bencher/sub/project/benchmark/view.rs

@@ -1,4 +1,4 @@
-use bencher_json::ResourceId;
+use bencher_json::{BenchmarkResourceId, ProjectResourceId};
 
 use crate::{
     CliError,
@@ -8,8 +8,8 @@ use crate::{
 
 #[derive(Debug)]
 pub struct View {
-    pub project: ResourceId,
-    pub benchmark: ResourceId,
+    pub project: ProjectResourceId,
+    pub benchmark: BenchmarkResourceId,
     pub backend: PubBackend,
 }
 

services/cli/src/bencher/sub/project/branch/create.rs

@@ -1,5 +1,5 @@
 use bencher_client::types::{JsonNewBranch, JsonNewStartPoint};
-use bencher_json::{BranchName, BranchNameId, BranchSlug, GitHash, ResourceId};
+use bencher_json::{BranchName, BranchNameId, BranchSlug, GitHash, ProjectResourceId};
 
 use crate::{
     CliError,
@@ -9,7 +9,7 @@ use crate::{
 
 #[derive(Debug, Clone)]
 pub struct Create {
-    pub project: ResourceId,
+    pub project: ProjectResourceId,
     pub name: BranchName,
     pub slug: Option<BranchSlug>,
     pub start_point_branch: Option<BranchNameId>,