rename network-proxy to network-tunnel

estuary · Apr 12, 2022 · f9ca1a0 · f9ca1a0
1 parent 97574d1
commit f9ca1a0
Show file tree

Hide file tree

Showing 30 changed files with 154 additions and 154 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -196,7 +196,7 @@ jobs:
           -o /home/runner/work/flow/flow/.build/package/bin/flowctl \
           -o /home/runner/work/flow/flow/.build/package/bin/flowctl-go \
           -o /home/runner/work/flow/flow/.build/package/bin/flow-connector-proxy \
-          -o /home/runner/work/flow/flow/.build/package/bin/flow-network-proxy \
+          -o /home/runner/work/flow/flow/.build/package/bin/flow-network-tunnel \
           -o /home/runner/work/flow/flow/.build/package/bin/flow-parser \
           -o /home/runner/work/flow/flow/.build/package/bin/flow-schemalate \
           -o /home/runner/work/flow/flow/.build/package/bin/gazette \
@@ -209,7 +209,7 @@ jobs:
           -o /home/runner/work/flow/flow/.build/package/bin/flowctl \
           -o /home/runner/work/flow/flow/.build/package/bin/flowctl-go \
           -o /home/runner/work/flow/flow/.build/package/bin/flow-connector-proxy \
-          -o /home/runner/work/flow/flow/.build/package/bin/flow-network-proxy \
+          -o /home/runner/work/flow/flow/.build/package/bin/flow-network-tunnel \
           -o /home/runner/work/flow/flow/.build/package/bin/flow-parser \
           -o /home/runner/work/flow/flow/.build/package/bin/flow-schemalate \
           -o /home/runner/work/flow/flow/.build/package/bin/gazette \
@@ -222,7 +222,7 @@ jobs:
           -o /home/runner/work/flow/flow/.build/package/bin/flowctl \
           -o /home/runner/work/flow/flow/.build/package/bin/flowctl-go \
           -o /home/runner/work/flow/flow/.build/package/bin/flow-connector-proxy \
-          -o /home/runner/work/flow/flow/.build/package/bin/flow-network-proxy \
+          -o /home/runner/work/flow/flow/.build/package/bin/flow-network-tunnel \
           -o /home/runner/work/flow/flow/.build/package/bin/flow-parser \
           -o /home/runner/work/flow/flow/.build/package/bin/flow-schemalate \
           -o /home/runner/work/flow/flow/.build/package/bin/gazette \
@@ -235,7 +235,7 @@ jobs:
           -o /home/runner/work/flow/flow/.build/package/bin/flowctl \
           -o /home/runner/work/flow/flow/.build/package/bin/flowctl-go \
           -o /home/runner/work/flow/flow/.build/package/bin/flow-connector-proxy \
-          -o /home/runner/work/flow/flow/.build/package/bin/flow-network-proxy \
+          -o /home/runner/work/flow/flow/.build/package/bin/flow-network-tunnel \
           -o /home/runner/work/flow/flow/.build/package/bin/flow-parser \
           -o /home/runner/work/flow/flow/.build/package/bin/flow-schemalate \
           -o /home/runner/work/flow/flow/.build/package/bin/gazette \

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Makefile b/Makefile
@@ -145,9 +145,9 @@ ${RUST_MUSL_BIN}/flow-schemalate:
 ${RUST_MUSL_BIN}/flow-parser:
 	cargo build --target x86_64-unknown-linux-musl --release --locked -p parser
 
-.PHONY: ${RUST_MUSL_BIN}/flow-network-proxy
-${RUST_MUSL_BIN}/flow-network-proxy:
-	cargo build --target x86_64-unknown-linux-musl --release --locked -p network-proxy
+.PHONY: ${RUST_MUSL_BIN}/flow-network-tunnel
+${RUST_MUSL_BIN}/flow-network-tunnel:
+	cargo build --target x86_64-unknown-linux-musl --release --locked -p network-tunnel
 
 .PHONY: ${RUST_MUSL_BIN}/flow-connector-proxy
 ${RUST_MUSL_BIN}/flow-connector-proxy:
@@ -167,7 +167,7 @@ RUST_TARGETS = \
 MUSL_TARGETS = \
 	${PKGDIR}/bin/flow-parser \
 	${PKGDIR}/bin/flow-schemalate \
-	${PKGDIR}/bin/flow-network-proxy \
+	${PKGDIR}/bin/flow-network-tunnel \
 	${PKGDIR}/bin/flow-connector-proxy \
 
 .PHONY: rust-binaries
@@ -193,8 +193,8 @@ ${PKGDIR}/bin/flow-schemalate: ${RUST_MUSL_BIN}/flow-schemalate | ${PKGDIR}
 	cp ${RUST_MUSL_BIN}/flow-schemalate $@
 ${PKGDIR}/bin/flow-parser: ${RUST_MUSL_BIN}/flow-parser | ${PKGDIR}
 	cp ${RUST_MUSL_BIN}/flow-parser $@
-${PKGDIR}/bin/flow-network-proxy: ${RUST_MUSL_BIN}/flow-network-proxy | ${PKGDIR}
-	cp ${RUST_MUSL_BIN}/flow-network-proxy $@
+${PKGDIR}/bin/flow-network-tunnel: ${RUST_MUSL_BIN}/flow-network-tunnel | ${PKGDIR}
+	cp ${RUST_MUSL_BIN}/flow-network-tunnel $@
 ${PKGDIR}/bin/flow-connector-proxy: ${RUST_MUSL_BIN}/flow-connector-proxy | ${PKGDIR}
 	cp ${RUST_MUSL_BIN}/flow-connector-proxy $@
 
@@ -228,11 +228,11 @@ install-tools: ${PKGDIR}/bin/etcd ${PKGDIR}/bin/sops
 
 .PHONY: rust-test
 rust-test:
-	cargo test --release --locked --workspace --exclude parser --exclude network-proxy --exclude schemalate --exclude connector_proxy
+	cargo test --release --locked --workspace --exclude parser --exclude network-tunnel --exclude schemalate --exclude connector_proxy
 
 .PHONY: musl-test
 musl-test:
-	cargo test --release --locked --target x86_64-unknown-linux-musl --package parser --package network-proxy --package schemalate --package connector_proxy
+	cargo test --release --locked --target x86_64-unknown-linux-musl --package parser --package network-tunnel --package schemalate --package connector_proxy
 
 # `go` test targets must have PATH-based access to tools (etcd & sops),
 # because the `go` tool compiles tests as binaries within a temp directory,

diff --git a/crates/connector_proxy/Cargo.toml b/crates/connector_proxy/Cargo.toml
@@ -10,7 +10,7 @@ path = "src/main.rs"
 [dependencies]
 doc = { path = "../doc", version = "0.0.0" }
 flow_cli_common = { path = "../flow_cli_common" }
-network-proxy = { path = "../network-proxy", version = "0.1.0" }
+network-tunnel = { path = "../network-tunnel", version = "0.1.0" }
 protocol = { path = "../protocol", version = "0.0.0" }
 
 async-trait="*"

diff --git a/crates/connector_proxy/src/connector_runner.rs b/crates/connector_proxy/src/connector_runner.rs
@@ -2,8 +2,8 @@ use crate::apis::{FlowCaptureOperation, FlowMaterializeOperation, InterceptorStr
 use crate::errors::Error;
 use crate::interceptors::{
     airbyte_source_interceptor::AirbyteSourceInterceptor,
-    network_proxy_capture_interceptor::NetworkProxyCaptureInterceptor,
-    network_proxy_materialize_interceptor::NetworkProxyMaterializeInterceptor,
+    network_tunnel_capture_interceptor::NetworkTunnelCaptureInterceptor,
+    network_tunnel_materialize_interceptor::NetworkTunnelMaterializeInterceptor,
 };
 use crate::libs::command::{
     check_exit_status, invoke_connector_delayed, invoke_connector_direct, parse_child,
@@ -23,10 +23,10 @@ pub async fn run_flow_capture_connector(
         parse_child(invoke_connector_direct(entrypoint, args)?)?;
 
     let adapted_request_stream =
-        NetworkProxyCaptureInterceptor::adapt_request_stream(op, request_stream())?;
+        NetworkTunnelCaptureInterceptor::adapt_request_stream(op, request_stream())?;
 
     let adapted_response_stream =
-        NetworkProxyCaptureInterceptor::adapt_response_stream(op, response_stream(child_stdout))?;
+        NetworkTunnelCaptureInterceptor::adapt_response_stream(op, response_stream(child_stdout))?;
 
     streaming_all(
         child_stdin,
@@ -50,9 +50,9 @@ pub async fn run_flow_materialize_connector(
         parse_child(invoke_connector_direct(entrypoint, args)?)?;
 
     let adapted_request_stream =
-        NetworkProxyMaterializeInterceptor::adapt_request_stream(op, request_stream())?;
+        NetworkTunnelMaterializeInterceptor::adapt_request_stream(op, request_stream())?;
 
-    let adapted_response_stream = NetworkProxyMaterializeInterceptor::adapt_response_stream(
+    let adapted_response_stream = NetworkTunnelMaterializeInterceptor::adapt_response_stream(
         op,
         response_stream(child_stdout),
     )?;
@@ -82,10 +82,10 @@ pub async fn run_airbyte_source_connector(
 
     let adapted_request_stream = airbyte_interceptor.adapt_request_stream(
         op,
-        NetworkProxyCaptureInterceptor::adapt_request_stream(op, request_stream())?,
+        NetworkTunnelCaptureInterceptor::adapt_request_stream(op, request_stream())?,
     )?;
 
-    let adapted_response_stream = NetworkProxyCaptureInterceptor::adapt_response_stream(
+    let adapted_response_stream = NetworkTunnelCaptureInterceptor::adapt_response_stream(
         op,
         airbyte_interceptor.adapt_response_stream(op, response_stream(child_stdout))?,
     )?;

diff --git a/crates/connector_proxy/src/errors.rs b/crates/connector_proxy/src/errors.rs
@@ -49,7 +49,7 @@ pub enum Error {
     MissingImageInspectFile,
 
     #[error(transparent)]
-    NetworkProxyError(#[from] network_proxy::errors::Error),
+    NetworkTunnelError(#[from] network_tunnel::errors::Error),
 
     #[error(transparent)]
     TempfilePersistError(#[from] tempfile::PersistError),

diff --git a/crates/connector_proxy/src/interceptors/mod.rs b/crates/connector_proxy/src/interceptors/mod.rs
@@ -1,3 +1,3 @@
 pub mod airbyte_source_interceptor;
-pub mod network_proxy_capture_interceptor;
-pub mod network_proxy_materialize_interceptor;
+pub mod network_tunnel_capture_interceptor;
+pub mod network_tunnel_materialize_interceptor;
diff --git a/...tors/network_proxy_capture_interceptor.rs → ...ors/network_tunnel_capture_interceptor.rs b/...tors/network_proxy_capture_interceptor.rs → ...ors/network_tunnel_capture_interceptor.rs
@@ -1,6 +1,6 @@
 use crate::apis::{FlowCaptureOperation, InterceptorStream};
 use crate::errors::{Error, Must};
-use crate::libs::network_proxy::NetworkProxy;
+use crate::libs::network_tunnel::NetworkTunnel;
 use crate::libs::protobuf::{decode_message, encode_message};
 use crate::libs::stream::{get_decoded_message, stream_all_bytes};
 use futures::{future, stream, StreamExt, TryStreamExt};
@@ -11,14 +11,14 @@ use protocol::capture::{
 use serde_json::value::RawValue;
 use tokio_util::io::StreamReader;
 
-pub struct NetworkProxyCaptureInterceptor {}
+pub struct NetworkTunnelCaptureInterceptor {}
 
-impl NetworkProxyCaptureInterceptor {
+impl NetworkTunnelCaptureInterceptor {
     fn adapt_discover_request_stream(in_stream: InterceptorStream) -> InterceptorStream {
         Box::pin(stream::once(async {
             let mut request = get_decoded_message::<DiscoverRequest>(in_stream).await?;
 
-            request.endpoint_spec_json = NetworkProxy::consume_network_proxy_config(
+            request.endpoint_spec_json = NetworkTunnel::consume_network_tunnel_config(
                 RawValue::from_string(request.endpoint_spec_json)?,
             )
             .await
@@ -33,7 +33,7 @@ impl NetworkProxyCaptureInterceptor {
         Box::pin(stream::once(async {
             let mut request = get_decoded_message::<ValidateRequest>(in_stream).await?;
 
-            request.endpoint_spec_json = NetworkProxy::consume_network_proxy_config(
+            request.endpoint_spec_json = NetworkTunnel::consume_network_tunnel_config(
                 RawValue::from_string(request.endpoint_spec_json)?,
             )
             .await
@@ -49,7 +49,7 @@ impl NetworkProxyCaptureInterceptor {
             let mut request = get_decoded_message::<ApplyRequest>(in_stream).await?;
 
             if let Some(ref mut c) = request.capture {
-                c.endpoint_spec_json = NetworkProxy::consume_network_proxy_config(
+                c.endpoint_spec_json = NetworkTunnel::consume_network_tunnel_config(
                     RawValue::from_string(c.endpoint_spec_json.clone())?,
                 )
                 .await
@@ -71,7 +71,7 @@ impl NetworkProxyCaptureInterceptor {
                     .expect("expected request is not received.");
                 if let Some(ref mut o) = request.open {
                     if let Some(ref mut c) = o.capture {
-                        c.endpoint_spec_json = NetworkProxy::consume_network_proxy_config(
+                        c.endpoint_spec_json = NetworkTunnel::consume_network_tunnel_config(
                             RawValue::from_string(c.endpoint_spec_json.clone())?,
                         )
                         .await
@@ -91,7 +91,7 @@ impl NetworkProxyCaptureInterceptor {
     }
 }
 
-impl NetworkProxyCaptureInterceptor {
+impl NetworkTunnelCaptureInterceptor {
     pub fn adapt_request_stream(
         op: &FlowCaptureOperation,
         in_stream: InterceptorStream,
@@ -114,7 +114,7 @@ impl NetworkProxyCaptureInterceptor {
         Ok(match op {
             FlowCaptureOperation::Spec => Box::pin(stream::once(async move {
                 let mut response = get_decoded_message::<SpecResponse>(in_stream).await?;
-                response.endpoint_spec_schema_json = NetworkProxy::extend_endpoint_schema(
+                response.endpoint_spec_schema_json = NetworkTunnel::extend_endpoint_schema(
                     RawValue::from_string(response.endpoint_spec_schema_json)?,
                 )
                 .or_bail()

diff --git a/.../network_proxy_materialize_interceptor.rs → ...network_tunnel_materialize_interceptor.rs b/.../network_proxy_materialize_interceptor.rs → ...network_tunnel_materialize_interceptor.rs
@@ -1,6 +1,6 @@
 use crate::apis::{FlowMaterializeOperation, InterceptorStream};
 use crate::errors::{Error, Must};
-use crate::libs::network_proxy::NetworkProxy;
+use crate::libs::network_tunnel::NetworkTunnel;
 use crate::libs::protobuf::{decode_message, encode_message};
 use crate::libs::stream::{get_decoded_message, stream_all_bytes};
 
@@ -10,18 +10,18 @@ use protocol::materialize::{ApplyRequest, SpecResponse, TransactionRequest, Vali
 use serde_json::value::RawValue;
 use tokio_util::io::StreamReader;
 
-pub struct NetworkProxyMaterializeInterceptor {}
+pub struct NetworkTunnelMaterializeInterceptor {}
 
-impl NetworkProxyMaterializeInterceptor {
+impl NetworkTunnelMaterializeInterceptor {
     fn adapt_spec_request(in_stream: InterceptorStream) -> InterceptorStream {
         Box::pin(stream::once(async {
             let mut request = get_decoded_message::<ValidateRequest>(in_stream).await?;
 
-            request.endpoint_spec_json = NetworkProxy::consume_network_proxy_config(
+            request.endpoint_spec_json = NetworkTunnel::consume_network_tunnel_config(
                 RawValue::from_string(request.endpoint_spec_json)?,
             )
             .await
-            .expect("failed to start network proxy")
+            .expect("failed to start network tunnel")
             .to_string();
             encode_message(&request)
         }))
@@ -32,7 +32,7 @@ impl NetworkProxyMaterializeInterceptor {
             let mut request = get_decoded_message::<ApplyRequest>(in_stream).await?;
 
             if let Some(ref mut m) = request.materialization {
-                m.endpoint_spec_json = NetworkProxy::consume_network_proxy_config(
+                m.endpoint_spec_json = NetworkTunnel::consume_network_tunnel_config(
                     RawValue::from_string(m.endpoint_spec_json.clone())?,
                 )
                 .await
@@ -54,7 +54,7 @@ impl NetworkProxyMaterializeInterceptor {
                     .expect("expected request is not received.");
                 if let Some(ref mut o) = request.open {
                     if let Some(ref mut m) = o.materialization {
-                        m.endpoint_spec_json = NetworkProxy::consume_network_proxy_config(
+                        m.endpoint_spec_json = NetworkTunnel::consume_network_tunnel_config(
                             RawValue::from_string(m.endpoint_spec_json.clone())?,
                         )
                         .await
@@ -73,7 +73,7 @@ impl NetworkProxyMaterializeInterceptor {
     }
 }
 
-impl NetworkProxyMaterializeInterceptor {
+impl NetworkTunnelMaterializeInterceptor {
     pub fn adapt_request_stream(
         op: &FlowMaterializeOperation,
         in_stream: InterceptorStream,
@@ -96,7 +96,7 @@ impl NetworkProxyMaterializeInterceptor {
             FlowMaterializeOperation::Spec => Box::pin(stream::once(async {
                 let mut response = get_decoded_message::<SpecResponse>(in_stream).await?;
 
-                response.endpoint_spec_schema_json = NetworkProxy::extend_endpoint_schema(
+                response.endpoint_spec_schema_json = NetworkTunnel::extend_endpoint_schema(
                     RawValue::from_string(response.endpoint_spec_schema_json)?,
                 )
                 .or_bail()

diff --git a/crates/connector_proxy/src/libs/mod.rs b/crates/connector_proxy/src/libs/mod.rs
@@ -2,6 +2,6 @@ pub mod airbyte_catalog;
 pub mod command;
 pub mod image_inspect;
 pub mod json;
-pub mod network_proxy;
+pub mod network_tunnel;
 pub mod protobuf;
 pub mod stream;