[2/N] restate-types use restate-ty

Author: AhmedSoliman

Cargo.lock

@@ -84,6 +84,7 @@ restate-time-util = { path = "crates/time-util" }
 restate-timer = { path = "crates/timer" }
 restate-timer-queue = { path = "crates/timer-queue" }
 restate-tracing-instrumentation = { path = "crates/tracing-instrumentation" }
+restate-ty = { path = "crates/lib/ty" }
 restate-types = { path = "crates/types" }
 restate-utoipa = { path = "crates/utoipa" }
 restate-wal-protocol = { path = "crates/wal-protocol" }

Cargo.toml

@@ -31,6 +31,7 @@ restate-cli-util = { workspace = true }
 restate-cloud-tunnel-client = { workspace = true }
 restate-serde-util = { workspace = true }
 restate-time-util = { workspace = true }
+restate-ty = { workspace = true }
 restate-types = { workspace = true }
 restate-lite = { workspace = true, optional = true }
 mock-service-endpoint = { workspace = true, optional = true }

cli/Cargo.toml

@@ -18,7 +18,8 @@ use restate_admin_rest_model::invocations::RestartAsNewInvocationResponse;
 use restate_admin_rest_model::services::*;
 use restate_admin_rest_model::version::VersionInformation;
 use restate_serde_util::SerdeableHeaderHashMap;
-use restate_types::identifiers::{DeploymentId, LambdaARN};
+use restate_types::LambdaARN;
+use restate_types::identifiers::DeploymentId;
 use restate_types::schema::deployment::ProtocolType;
 use restate_types::schema::service::ServiceMetadata;
 

cli/src/clients/admin_interface.rs

@@ -26,7 +26,7 @@ use restate_admin_rest_model::version::AdminApiVersion;
 use restate_cli_util::ui::console::{Styled, StyledTable, confirm_or_exit};
 use restate_cli_util::ui::stylesheet::Style;
 use restate_cli_util::{c_eprintln, c_error, c_indent_table, c_indentln, c_success, c_warn};
-use restate_types::identifiers::LambdaARN;
+use restate_ty::LambdaARN;
 use restate_types::schema::service::ServiceMetadata;
 
 use crate::cli_env::CliEnv;

cli/src/commands/deployments/register.rs

@@ -8,16 +8,18 @@
 // the Business Source License, use of this software will be governed
 // by the Apache License, Version 2.0.
 
+use std::collections::HashMap;
+
 use http::{Uri, Version};
+use serde::{Deserialize, Serialize};
+use serde_with::serde_as;
+
 use restate_serde_util::SerdeableHeaderHashMap;
-use restate_types::identifiers::ServiceRevision;
-use restate_types::identifiers::{DeploymentId, LambdaARN};
+use restate_types::LambdaARN;
+use restate_types::identifiers::DeploymentId;
 use restate_types::schema::deployment::{EndpointLambdaCompression, ProtocolType};
 use restate_types::schema::info::Info;
 use restate_types::schema::service::ServiceMetadata;
-use serde::{Deserialize, Serialize};
-use serde_with::serde_as;
-use std::collections::HashMap;
 
 // This enum could be a struct with a nested enum to avoid repeating some fields, but serde(flatten) unfortunately breaks the openapi code generation
 #[serde_as]
@@ -160,7 +162,7 @@ pub enum RegisterDeploymentRequest {
 #[derive(Clone, Debug, Serialize, Deserialize)]
 pub struct ServiceNameRevPair {
     pub name: String,
-    pub revision: ServiceRevision,
+    pub revision: u32,
 }
 
 #[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]

crates/admin-rest-model/src/deployments.rs

@@ -9,7 +9,7 @@ publish = false
 
 [features]
 default = ["serve-web-ui"]
-options_schema = ["restate-service-client/options_schema", "restate-types/schemars"]
+options_schema = ["restate-service-client/options_schema", "restate-types/schemars", "restate-ty/schemars"]
 serve-web-ui = ["restate-web-ui", "mime_guess"]
 storage-query = []
 metadata-api = []
@@ -27,6 +27,7 @@ restate-service-client = { workspace = true }
 restate-service-protocol = { workspace = true, features = ["discovery"] }
 restate-storage-query-datafusion = { workspace = true }
 restate-time-util = { workspace = true }
+restate-ty = { workspace = true }
 restate-types = { workspace = true }
 restate-wal-protocol = { workspace = true }
 restate-web-ui = { git = "https://github.com/restatedev/restate-web-ui-crate", optional = true, version = "0.1.11", tag = "v0.1.11" }

crates/admin/Cargo.toml

@@ -19,12 +19,12 @@ use restate_core::{
     Metadata, ShutdownError, TaskCenter, TaskHandle, TaskKind, cancellation_watcher,
 };
 use restate_metadata_store::MetadataStoreClient;
+use restate_ty::metadata::MetadataKind;
 use restate_types::cluster::cluster_state::LegacyClusterState;
 use restate_types::cluster_state::ClusterState;
 use restate_types::epoch::EpochMetadata;
 use restate_types::identifiers::PartitionId;
 use restate_types::metadata_store::keys::partition_processor_epoch_key;
-use restate_types::net::metadata::MetadataKind;
 use restate_types::nodes_config::NodesConfiguration;
 use restate_types::partitions::PartitionTable;
 

crates/admin/src/cluster_controller/service/scheduler_task.rs

@@ -21,8 +21,10 @@ use okapi_operation::*;
 use restate_admin_rest_model::deployments::*;
 use restate_admin_rest_model::version::AdminApiVersion;
 use restate_errors::warn_it;
+use restate_ty::identifiers::DeploymentId;
+use restate_ty::invocation::ServiceRevision;
+use restate_ty::lambda::InvalidLambdaARN;
 use restate_types::deployment::{HttpDeploymentAddress, LambdaDeploymentAddress};
-use restate_types::identifiers::{DeploymentId, InvalidLambdaARN, ServiceRevision};
 use restate_types::schema;
 use restate_types::schema::deployment::{Deployment, DeploymentType};
 use restate_types::schema::registry::{

crates/admin/src/rest_api/deployments.rs

@@ -22,6 +22,7 @@ restate-futures-util = { workspace = true }
 restate-metadata-store = { workspace = true }
 restate-rocksdb = { workspace = true, optional = true }
 restate-test-util = { workspace = true, optional = true }
+restate-ty = { workspace = true }
 restate-types = { workspace = true }
 
 ahash = { workspace = true }
@@ -81,4 +82,4 @@ tikv-jemallocator = { workspace = true }
 
 [[bench]]
 name = "replicated_loglet_serde"
-harness = false
+harness = false