Skip to content

Commit

Permalink
Replace usages of proxy connector with new location
Browse files Browse the repository at this point in the history
  • Loading branch information
slinkydeveloper committed Jun 1, 2023
1 parent 7719cd3 commit 11f5224
Show file tree
Hide file tree
Showing 8 changed files with 19 additions and 7 deletions.
13 changes: 11 additions & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions src/invoker/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ options_schema = ["dep:schemars", "restate_common/options_schema"]
bytes = { workspace = true }
bytes-utils = { workspace = true }
restate_common = { workspace = true, features = ["serde"] }
restate_hyper_util = { workspace = true }
drain = { workspace = true }
futures = { workspace = true }
hyper = { workspace = true, features = ["http1", "http2", "client", "tcp", "stream", "runtime"] }
Expand Down
2 changes: 1 addition & 1 deletion src/invoker/src/invoker.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ use std::{cmp, panic};

use futures::stream;
use futures::stream::{PollNext, StreamExt};
use restate_common::proxy_connector::{Proxy, ProxyConnector};
use restate_common::types::PartitionLeaderEpoch;
use restate_hyper_util::proxy_connector::{Proxy, ProxyConnector};
use restate_journal::raw::{PlainRawEntry, RawEntryCodec};
use restate_service_metadata::ServiceEndpointRegistry;
use restate_timer_queue::TimerQueue;
Expand Down
1 change: 1 addition & 0 deletions src/meta/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ schemars = { workspace = true }

# Service discovery and metadata
restate_common = { workspace = true, features = ["serde"] }
restate_hyper_util = { workspace = true }
restate_service_key_extractor = { workspace = true, features = ["json"] }
restate_service_metadata = { workspace = true, features = ["serde", "serde_schema"] }
restate_service_protocol = { workspace = true, features = ["discovery"] }
Expand Down
2 changes: 1 addition & 1 deletion src/meta/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ mod storage;

use codederror::CodedError;
use rest_api::MetaRestEndpoint;
use restate_common::proxy_connector::Proxy;
use restate_common::retry_policy::RetryPolicy;
use restate_common::worker_command::WorkerCommandSender;
use restate_hyper_util::proxy_connector::Proxy;
use restate_ingress_grpc::ReflectionRegistry;
use restate_service_key_extractor::KeyExtractorsRegistry;
use restate_service_metadata::{InMemoryMethodDescriptorRegistry, InMemoryServiceEndpointRegistry};
Expand Down
2 changes: 1 addition & 1 deletion src/meta/src/service.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ use std::future::Future;
use hyper::http::{HeaderName, HeaderValue};
use hyper::Uri;
use prost_reflect::DescriptorPool;
use restate_common::proxy_connector::Proxy;
use restate_common::retry_policy::RetryPolicy;
use restate_errors::{error_it, warn_it};
use restate_futures_util::command::{Command, UnboundedCommandReceiver, UnboundedCommandSender};
use restate_hyper_util::proxy_connector::Proxy;
use restate_ingress_grpc::{ReflectionRegistry, RegistrationError};
use restate_service_key_extractor::KeyExtractorsRegistry;
use restate_service_metadata::{
Expand Down
3 changes: 2 additions & 1 deletion src/service_protocol/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ default = []
protocol = []
message = ["protocol", "dep:restate_common", "dep:bytes-utils", "dep:codederror", "dep:restate_errors", "dep:size", "dep:tracing"]
codec = ["protocol", "dep:restate_common", "dep:thiserror", "dep:restate_journal", "dep:paste"]
discovery = ["dep:thiserror", "dep:codederror", "dep:restate_errors", "dep:restate_service_key_extractor", "dep:hyper", "dep:hyper-rustls", "dep:prost-reflect", "dep:restate_common", "dep:restate_service_metadata"]
discovery = ["dep:thiserror", "dep:codederror", "dep:restate_errors", "dep:restate_service_key_extractor", "dep:hyper", "dep:hyper-rustls", "dep:prost-reflect", "dep:restate_common", "dep:restate_hyper_util", "dep:restate_service_metadata"]

[dependencies]
bytes = { workspace = true }
Expand All @@ -34,6 +34,7 @@ prost-reflect = { workspace = true, optional = true }
restate_service_metadata = { workspace = true, optional = true }
codederror = { workspace = true, optional = true }
restate_errors = { workspace = true, optional = true }
restate_hyper_util = { workspace = true, optional = true }

size = { version = "0.4.1", optional = true }

Expand Down
2 changes: 1 addition & 1 deletion src/service_protocol/src/discovery.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ use prost_reflect::{
DescriptorError, DescriptorPool, ExtensionDescriptor, FieldDescriptor, Kind, MethodDescriptor,
ServiceDescriptor,
};
use restate_common::proxy_connector::{Proxy, ProxyConnector};
use restate_common::retry_policy::RetryPolicy;
use restate_errors::{META0001, META0002, META0003};
use restate_hyper_util::proxy_connector::{Proxy, ProxyConnector};
use restate_service_key_extractor::{KeyStructure, ServiceInstanceType};
use restate_service_metadata::ProtocolType;

Expand Down

0 comments on commit 11f5224

Please sign in to comment.