From e751641403f0e97a54d430093bcda395d8a27dcc Mon Sep 17 00:00:00 2001 From: Johnny Graettinger Date: Mon, 11 Sep 2023 21:33:02 +0000 Subject: [PATCH] flowctl: support docker desktop and missing flow-connector-init When running on non-linux OS's, ask docker to publish all ports (including the init port), then extract and pass around the mapping of container ports to mapped host addresses. Also fix a flow-connector-init startup race where it writes to stderr before its port has been bound. --- crates/connector-init/src/lib.rs | 25 +- crates/connector-init/src/main.rs | 8 +- crates/proto-flow/src/runtime.rs | 12 + crates/runtime/src/container.rs | 238 +++++++++++----- crates/validation/tests/scenario_tests.rs | 3 + go/protocols/runtime/runtime.pb.go | 323 ++++++++++++++++------ go/protocols/runtime/runtime.proto | 8 + 7 files changed, 455 insertions(+), 162 deletions(-) diff --git a/crates/connector-init/src/lib.rs b/crates/connector-init/src/lib.rs index 3093868339..2dea69ecdf 100644 --- a/crates/connector-init/src/lib.rs +++ b/crates/connector-init/src/lib.rs @@ -1,8 +1,8 @@ use anyhow::Context; pub use codec::Codec; +use std::io::Write; use tokio::signal::unix; use tonic::transport::server::TcpIncoming; -use anyhow::anyhow; mod capture; mod codec; @@ -26,8 +26,24 @@ pub struct Args { pub port: u16, } -pub async fn run(args: Args) -> anyhow::Result<()> { - let image = inspect::Image::parse_from_json_file(&args.image_inspect_json_path) +pub async fn run( + Args { + image_inspect_json_path, + port, + }: Args, + log_level: String, +) -> anyhow::Result<()> { + // Bind our port before we do anything else. + let addr = format!("0.0.0.0:{}", port).parse().unwrap(); + let incoming = TcpIncoming::new(addr, true, None) + .map_err(|e| anyhow::anyhow!("tcp incoming error {}", e))?; + + // Now write a byte to stderr to let our container host know that we're alive. + // Whitespace avoids interfering with JSON logs that also write to stderr. + std::io::stderr().write(" ".as_bytes()).unwrap(); + tracing::info!(%log_level, port, message = "connector-init started"); + + let image = inspect::Image::parse_from_json_file(&image_inspect_json_path) .context("reading image inspect JSON")?; let entrypoint = image.get_argv()?; @@ -36,9 +52,6 @@ pub async fn run(args: Args) -> anyhow::Result<()> { _ => Codec::Proto, }; - let addr = format!("0.0.0.0:{}", args.port).parse().unwrap(); - let incoming = TcpIncoming::new(addr, true, None).map_err(|e| anyhow!("tcp incoming error {}", e))?; - check_protocol(&entrypoint, codec).await?; let capture = proto_grpc::capture::connector_server::ConnectorServer::new(capture::Proxy { diff --git a/crates/connector-init/src/main.rs b/crates/connector-init/src/main.rs index a63decb123..472b971908 100644 --- a/crates/connector-init/src/main.rs +++ b/crates/connector-init/src/main.rs @@ -1,12 +1,7 @@ use clap::Parser; -use std::io::Write; use tracing_subscriber::prelude::*; fn main() { - // Write a byte to stderr to let our container host know that we're alive. - // Whitespace avoids interfering with JSON logs that also write to stderr. - std::io::stderr().write(" ".as_bytes()).unwrap(); - let args = connector_init::Args::parse(); // Map the LOG_LEVEL variable to an equivalent tracing EnvFilter. @@ -40,8 +35,7 @@ fn main() { }; // Run until signaled, then gracefully stop. - tracing::info!(%log_level, port=args.port, message = "connector-init started"); - let result = runtime.block_on(connector_init::run(args)); + let result = runtime.block_on(connector_init::run(args, log_level)); // Explicitly call Runtime::shutdown_background as an alternative to calling Runtime::Drop. // This shuts down the runtime without waiting for blocking background tasks to complete, diff --git a/crates/proto-flow/src/runtime.rs b/crates/proto-flow/src/runtime.rs index bc829a5646..c9ceb88418 100644 --- a/crates/proto-flow/src/runtime.rs +++ b/crates/proto-flow/src/runtime.rs @@ -128,10 +128,22 @@ pub struct RocksDbDescriptor { #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct Container { + /// IP Address of the running container. + /// If this IP is accessible (it may not be, in contexts like Docker Desktop for Mac), + /// then it is *only* accessible from the hosting server. #[prost(string, tag = "1")] pub ip_addr: ::prost::alloc::string::String, + /// Network ports which are available for this container. #[prost(message, repeated, tag = "2")] pub network_ports: ::prost::alloc::vec::Vec, + /// Mapping of ports from `network_ports` to a corresponding "host-ip:port" address, + /// as either IPv4 or IPv6, through which the port can be accessed. If empty, + /// then the container `ip_addr` should be used directly. + #[prost(btree_map = "uint32, string", tag = "3")] + pub mapped_host_ports: ::prost::alloc::collections::BTreeMap< + u32, + ::prost::alloc::string::String, + >, } #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] diff --git a/crates/runtime/src/container.rs b/crates/runtime/src/container.rs index 3c49a6dc92..f9cfa50844 100644 --- a/crates/runtime/src/container.rs +++ b/crates/runtime/src/container.rs @@ -1,6 +1,7 @@ use anyhow::Context; use futures::channel::oneshot; use proto_flow::{flow, runtime}; +use std::collections::BTreeMap; use tokio::io::AsyncBufReadExt; // Port on which flow-connector-init listens for requests. @@ -24,15 +25,6 @@ pub async fn start( where L: Fn(&ops::Log) + Send + Sync + 'static, { - // We can't start a container without flow-connector-init. - let connector_init = locate_bin::locate("flow-connector-init") - .context("failed to locate flow-connector-init")?; - - // Generate a unique name for this container instance. Pull and inspect its image. - let name = unique_container_name(); - let inspect_content = inspect_image(image.to_string()).await?; - let network_ports = parse_network_ports(&inspect_content)?; - // Many operational contexts only allow for docker volume mounts // from certain locations: // * Docker for Mac restricts file shares to /User, /tmp, and a couple others. @@ -55,13 +47,13 @@ where tmp_docker_inspect.as_file_mut().set_permissions(perms)?; } - // Write `inspect_content` output to its temporary file. - // Copy `flow-connector-init` to its temporary file. - ((), _) = futures::try_join!( - tokio::fs::write(tmp_docker_inspect.path(), &inspect_content), - tokio::fs::copy(connector_init, tmp_connector_init.path()) - ) - .context("writing container temporary file")?; + // Concurrently 1) find or fetch a copy of `flow-connector-init`, copying it + // into a temp path, and 2) inspect the image, also copying into a temp path, + // and parsing its advertised network ports. + let ((), network_ports) = futures::try_join!( + find_connector_init_and_copy(tmp_connector_init.path()), + inspect_image_and_copy(image, tmp_docker_inspect.path()), + )?; // Close our open files but retain a deletion guard. let tmp_connector_init = tmp_connector_init.into_temp_path(); @@ -71,43 +63,56 @@ where let network = if network == "" { "bridge" } else { network }; let log_level = log_level.unwrap_or(ops::LogLevel::Warn); + // Generate a unique name for this container instance. + let name = unique_container_name(); + let mut process: async_process::Child = async_process::Command::new("docker") .args([ - "run".to_string(), + "run", // Remove the docker container upon its exit. - "--rm".to_string(), + "--rm", // Addressable name of this connector. - format!("--name={name}"), + &format!("--name={name}"), // Network to which the container should attach. - format!("--network={}", network), + &format!("--network={}", network), // The entrypoint into a connector is always flow-connector-init, // which will delegate to the actual entrypoint of the connector. - "--entrypoint=/flow-connector-init".to_string(), + "--entrypoint=/flow-connector-init", // Mount the flow-connector-init binary and `docker inspect` output. - format!( + &format!( "--mount=type=bind,source={},target=/flow-connector-init", tmp_connector_init.to_string_lossy() ), - format!( + &format!( "--mount=type=bind,source={},target=/image-inspect.json", tmp_docker_inspect.to_string_lossy(), ), // Thread-through the logging configuration of the connector. - "--env=LOG_FORMAT=json".to_string(), - format!("--env=LOG_LEVEL={}", log_level.as_str_name()), + "--env=LOG_FORMAT=json", + &format!("--env=LOG_LEVEL={}", log_level.as_str_name()), // Cgroup memory / CPU resource limits. // TODO(johnny): we intend to tighten these down further, over time. - "--memory=1g".to_string(), - "--cpus=2".to_string(), + "--memory=1g", + "--cpus=2", + // For now, we support only Linux amd64 connectors. + "--platform=linux/amd64", // Attach labels that let us group connector resource usage under a few dimensions. - format!("--label=image={}", image), - format!("--label=task-name={}", task_name), - format!("--label=task-type={}", task_type.as_str_name()), + &format!("--label=image={}", image), + &format!("--label=task-name={}", task_name), + &format!("--label=task-type={}", task_type.as_str_name()), + // Support Docker Desktop in non-production contexts (for example, `flowctl`) + // where the container IP is not directly addressable. As an alternative, + // we ask Docker to provide mapped host ports that are then advertised + // in the attached runtime::Container description. + #[cfg(not(target_os = "linux"))] + &format!("--publish=0.0.0.0:0:{CONNECTOR_INIT_PORT}"), + #[cfg(not(target_os = "linux"))] + "--publish-all", // Image to run. - image.to_string(), + &image, // The following are arguments of flow-connector-init, not docker. - "--image-inspect-json-path=/image-inspect.json".to_string(), - format!("--port={CONNECTOR_INIT_PORT}"), + "--image-inspect-json-path=/image-inspect.json", + &format!("--port={CONNECTOR_INIT_PORT}"), ]) .stdin(async_process::Stdio::null()) .stdout(async_process::Stdio::null()) @@ -166,24 +171,38 @@ where _ = ready_rx => (), } - // Ask docker for the IP address it assigned to the container. - let ip_addr = inspect_container_ip(&name).await?; + // Ask docker for network configuration that it assigned to the container. + let (ip_addr, mapped_host_ports) = inspect_container_network(&name).await?; // Dial the gRPC endpoint hosted by `flow-connector-init` within the container context. - let channel = - tonic::transport::Endpoint::new(format!("http://{ip_addr}:{CONNECTOR_INIT_PORT}")) - .expect("formatting endpoint address") - .connect_timeout(std::time::Duration::from_secs(5)) - .connect() - .await - .context("failed to connect to connector-init inside of container")?; - - tracing::info!(%image, %name, %task_name, ?task_type, "started connector"); + let init_address = if let Some(addr) = mapped_host_ports.get(&(CONNECTOR_INIT_PORT as u32)) { + format!("http://{addr}") + } else { + format!("http://{ip_addr}:{CONNECTOR_INIT_PORT}") + }; + let channel = tonic::transport::Endpoint::new(init_address.clone()) + .expect("formatting endpoint address") + .connect_timeout(std::time::Duration::from_secs(5)) + .connect() + .await + .context("failed to connect to connector-init inside of container")?; + + tracing::info!( + %image, + %init_address, + %ip_addr, + ?mapped_host_ports, + %name, + %task_name, + ?task_type, + "started connector" + ); Ok(( runtime::Container { ip_addr: format!("{ip_addr}"), network_ports: network_ports.clone(), + mapped_host_ports, }, channel, Guard { @@ -228,46 +247,81 @@ where Ok(output.stdout) } -async fn inspect_image(image: String) -> anyhow::Result> { - if !image.ends_with(":local") { - _ = docker_cmd(&["pull", &image, "--quiet"]).await?; +async fn inspect_container_network( + name: &str, +) -> anyhow::Result<(std::net::IpAddr, BTreeMap)> { + #[derive(serde::Deserialize)] + #[serde(rename_all = "PascalCase", deny_unknown_fields)] + struct HostPort { + host_ip: std::net::IpAddr, + host_port: String, + } + + #[derive(serde::Deserialize)] + struct Output { + status: String, + ip: std::net::IpAddr, + ports: BTreeMap>>, } - docker_cmd(&["inspect", &image]).await -} -async fn inspect_container_ip(name: &str) -> anyhow::Result { let output = docker_cmd(&[ "inspect", "--format", - "{{.State.Status}}|{{range.NetworkSettings.Networks}}{{.IPAddress}}{{end}}", + r#"{ + "ip": "{{range.NetworkSettings.Networks}}{{.IPAddress}}{{end}}", + "ports": {{json .NetworkSettings.Ports}}, + "status": {{json .State.Status}} + }"#, name, ]) .await .context("failed to inspect a started docker container (did it crash?)")?; let output = String::from_utf8_lossy(&output); - - let (status, ip_addr) = output - .split_once("|") + let Output { status, ip, ports } = serde_json::from_str(&output) .with_context(|| format!("malformed docker container inspection output: {output}"))?; if status != "running" { anyhow::bail!("container failed to start; did it crash? (docker status is {status:?})"); } - let ip_addr: std::net::IpAddr = ip_addr.trim_end().parse().with_context(|| { - format!( - "failed to parse IP address from docker inspect output {:?}", - ip_addr.trim_end() - ) - })?; + let mut mapped_host_ports = BTreeMap::new(); + + for (container_port, mappings) in ports { + let Some(mappings) = mappings else { continue }; + + for HostPort { host_ip, host_port } in mappings { + if container_port.ends_with("/udp") { + continue; // Not supported. + } - Ok(ip_addr) + // Technically, ports are allowed to appear without the '/tcp' suffix. + let container_port = container_port + .strip_suffix("/tcp") + .unwrap_or(&container_port); + + let container_port = container_port.parse::().with_context(|| { + format!("invalid port in inspected NetworkSettings.Ports '{container_port}'") + })?; + let host_port = host_port.parse::().with_context(|| { + format!("invalid port in inspected NetworkSettings.Ports.*.HostPort '{host_port}'") + })?; + + _ = mapped_host_ports.insert( + container_port as u32, + if host_ip.is_ipv6() { + format!("[{host_ip}]:{host_port}") + } else { + format!("{host_ip}:{host_port}") + }, + ); + } + } + + Ok((ip, mapped_host_ports)) } fn parse_network_ports(content: &[u8]) -> anyhow::Result> { - use std::collections::BTreeMap; - #[derive(serde::Deserialize)] #[serde(rename_all = "PascalCase")] struct InspectConfig { @@ -335,6 +389,59 @@ fn parse_network_ports(content: &[u8]) -> anyhow::Result> Ok(ports) } +async fn find_connector_init_and_copy(tmp_path: &std::path::Path) -> anyhow::Result<()> { + // If we can locate an installed flow-connector-init, use that. + // This is common when developing or within a container workspace. + if let Ok(connector_init) = locate_bin::locate("flow-connector-init") { + tokio::fs::copy(connector_init, tmp_path).await?; + return Ok(()); + } + + // Create -- but don't start -- a container. + let name = format!("{}_fci", unique_container_name()); + docker_cmd(&[ + "create", + "--platform=linux/amd64", + &format!("--name={name}"), + CONNECTOR_INIT_IMAGE, + ]) + .await?; + + // Ask docker to copy the binary to our temp location. + docker_cmd(&[ + "cp", + &format!("{name}:{CONNECTOR_INIT_IMAGE_PATH}"), + &tmp_path.to_str().expect("temp is UTF-8"), + ]) + .await?; + + // Clean up the created container. + docker_cmd(&["rm", "--volumes", &name]).await?; + + Ok(()) +} + +async fn inspect_image_and_copy( + image: &str, + tmp_path: &std::path::Path, +) -> anyhow::Result> { + if !image.ends_with(":local") { + _ = docker_cmd(&["pull", &image, "--quiet"]).await?; + } + let inspect_content = docker_cmd(&["inspect", &image]).await?; + + tokio::fs::write(tmp_path, &inspect_content) + .await + .context("writing docker inspect output")?; + + parse_network_ports(&inspect_content) +} + +// TODO(johnny): Consider better packaging and versioning of `flow-connector-init`. +// TODO(johnny): Update tag once https://github.com/estuary/flow/pull/1167 is merged. +const CONNECTOR_INIT_IMAGE: &str = "ghcr.io/estuary/flow:v0.3.5-40-g1751ed2af"; +const CONNECTOR_INIT_IMAGE_PATH: &str = "/usr/local/bin/flow-connector-init"; + #[cfg(test)] mod test { use super::{parse_network_ports, start}; @@ -389,6 +496,11 @@ mod test { public: true }] ); + + #[cfg(target_os = "linux")] + assert_eq!(container.mapped_host_ports, super::BTreeMap::new()); + #[cfg(not(target_os = "linux"))] + assert_ne!(container.mapped_host_ports, super::BTreeMap::new()); } #[tokio::test] diff --git a/crates/validation/tests/scenario_tests.rs b/crates/validation/tests/scenario_tests.rs index 19e8747182..fb34478d4e 100644 --- a/crates/validation/tests/scenario_tests.rs +++ b/crates/validation/tests/scenario_tests.rs @@ -1602,6 +1602,7 @@ impl validation::Connectors for MockDriverCalls { internal.container = Some(Container { ip_addr: "1.2.3.4".to_string(), network_ports: call.network_ports.clone(), + mapped_host_ports: Default::default(), }); })) } @@ -1677,6 +1678,7 @@ impl validation::Connectors for MockDriverCalls { internal.container = Some(Container { ip_addr: "1.2.3.4".to_string(), network_ports: call.network_ports.clone(), + mapped_host_ports: Default::default(), }); })) } @@ -1750,6 +1752,7 @@ impl validation::Connectors for MockDriverCalls { internal.container = Some(Container { ip_addr: "1.2.3.4".to_string(), network_ports: call.network_ports.clone(), + mapped_host_ports: Default::default(), }); })) } diff --git a/go/protocols/runtime/runtime.pb.go b/go/protocols/runtime/runtime.pb.go index b9aefc3a63..8931bb1c89 100644 --- a/go/protocols/runtime/runtime.pb.go +++ b/go/protocols/runtime/runtime.pb.go @@ -276,11 +276,19 @@ var xxx_messageInfo_RocksDBDescriptor proto.InternalMessageInfo // Container is a description of a running connector container. type Container struct { - IpAddr string `protobuf:"bytes,1,opt,name=ip_addr,json=ipAddr,proto3" json:"ip_addr,omitempty"` - NetworkPorts []*flow.NetworkPort `protobuf:"bytes,2,rep,name=network_ports,json=networkPorts,proto3" json:"network_ports,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + // IP Address of the running container. + // If this IP is accessible (it may not be, in contexts like Docker Desktop for Mac), + // then it is *only* accessible from the hosting server. + IpAddr string `protobuf:"bytes,1,opt,name=ip_addr,json=ipAddr,proto3" json:"ip_addr,omitempty"` + // Network ports which are available for this container. + NetworkPorts []*flow.NetworkPort `protobuf:"bytes,2,rep,name=network_ports,json=networkPorts,proto3" json:"network_ports,omitempty"` + // Mapping of ports from `network_ports` to a corresponding "host-ip:port" address, + // as either IPv4 or IPv6, through which the port can be accessed. If empty, + // then the container `ip_addr` should be used directly. + MappedHostPorts map[uint32]string `protobuf:"bytes,3,rep,name=mapped_host_ports,json=mappedHostPorts,proto3" json:"mapped_host_ports,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *Container) Reset() { *m = Container{} } @@ -734,6 +742,7 @@ func init() { proto.RegisterType((*ShuffleResponse)(nil), "runtime.ShuffleResponse") proto.RegisterType((*RocksDBDescriptor)(nil), "runtime.RocksDBDescriptor") proto.RegisterType((*Container)(nil), "runtime.Container") + proto.RegisterMapType((map[uint32]string)(nil), "runtime.Container.MappedHostPortsEntry") proto.RegisterType((*CaptureRequestExt)(nil), "runtime.CaptureRequestExt") proto.RegisterType((*CaptureResponseExt)(nil), "runtime.CaptureResponseExt") proto.RegisterType((*DeriveRequestExt)(nil), "runtime.DeriveRequestExt") @@ -751,87 +760,91 @@ func init() { } var fileDescriptor_73af6e0737ce390c = []byte{ - // 1267 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x56, 0x4f, 0x6f, 0x13, 0x47, - 0x14, 0xc7, 0xc4, 0xb1, 0xb3, 0xcf, 0x49, 0x88, 0x47, 0x14, 0x8c, 0xdb, 0x26, 0xc6, 0x05, 0x29, - 0x22, 0x74, 0x4d, 0x43, 0x55, 0xa9, 0x52, 0x45, 0x45, 0x1c, 0x22, 0x4c, 0x1b, 0x48, 0xc7, 0xd0, - 0x43, 0x55, 0x69, 0x35, 0xde, 0x19, 0xdb, 0x53, 0xaf, 0x77, 0x96, 0xd9, 0xd9, 0xfc, 0xe1, 0x93, - 0xf4, 0xd8, 0x8f, 0xc3, 0xb1, 0xea, 0x07, 0x88, 0x54, 0x7a, 0xec, 0xb5, 0x97, 0xe6, 0x54, 0xcd, - 0x9f, 0x5d, 0x13, 0x42, 0x11, 0x0a, 0x87, 0xc4, 0x3b, 0xbf, 0xf7, 0x7e, 0xbf, 0x79, 0x6f, 0xf6, - 0xbd, 0x37, 0x0b, 0xed, 0x91, 0xe8, 0x24, 0x52, 0x28, 0x11, 0x8a, 0x28, 0xed, 0xc8, 0x2c, 0x56, - 0x7c, 0xca, 0xf2, 0x5f, 0xdf, 0x58, 0x50, 0xd5, 0x2d, 0x9b, 0xab, 0x03, 0x29, 0x26, 0x4c, 0x16, - 0x84, 0xe2, 0xc1, 0x3a, 0x36, 0x5b, 0xa1, 0x88, 0xd3, 0x6c, 0xfa, 0x0e, 0x8f, 0x4f, 0x4e, 0x6d, - 0x37, 0x8c, 0xc4, 0x81, 0xf9, 0xe7, 0xac, 0xcd, 0x53, 0x56, 0x91, 0x98, 0x3f, 0x67, 0xbb, 0x3c, - 0x12, 0x23, 0x61, 0x1e, 0x3b, 0xfa, 0xc9, 0xa2, 0xed, 0x5f, 0x4b, 0x50, 0x7f, 0x4a, 0xd2, 0x49, - 0x9f, 0xc9, 0x7d, 0x1e, 0xb2, 0xae, 0x88, 0x87, 0x7c, 0x84, 0x56, 0xa1, 0x16, 0x89, 0x51, 0x30, - 0xe4, 0x11, 0x0b, 0x86, 0xb4, 0x51, 0x6a, 0x95, 0xd6, 0xe7, 0xb1, 0x17, 0x89, 0xd1, 0x0e, 0x8f, - 0xd8, 0x0e, 0x45, 0x1f, 0x83, 0xa7, 0x48, 0x3a, 0x09, 0x62, 0x32, 0x65, 0x8d, 0x8b, 0xad, 0xd2, - 0xba, 0x87, 0x17, 0x34, 0xf0, 0x98, 0x4c, 0x19, 0xba, 0x06, 0x0b, 0x19, 0x4d, 0x83, 0x84, 0xa8, - 0x71, 0x63, 0xce, 0xd8, 0xaa, 0x19, 0x4d, 0xf7, 0x88, 0x1a, 0xa3, 0x0d, 0xa8, 0x87, 0x22, 0x56, - 0x84, 0xc7, 0x4c, 0x06, 0x31, 0x53, 0x07, 0x42, 0x4e, 0x1a, 0x65, 0xe3, 0xb3, 0x52, 0x18, 0x1e, - 0x5b, 0xbc, 0xfd, 0x6f, 0x19, 0x96, 0xfb, 0xe3, 0x6c, 0x38, 0x8c, 0x18, 0x66, 0xcf, 0x33, 0x96, - 0x2a, 0xd4, 0x83, 0xea, 0x2f, 0x22, 0x93, 0x31, 0x89, 0x4c, 0x4c, 0xde, 0x56, 0xe7, 0xe4, 0x78, - 0x6d, 0x63, 0x24, 0xfc, 0x11, 0x79, 0xc1, 0x94, 0x62, 0x3e, 0x65, 0xfb, 0x9d, 0x50, 0x48, 0xd6, - 0x79, 0xe3, 0xa0, 0xfd, 0x47, 0x96, 0x86, 0x73, 0x3e, 0xba, 0x02, 0x15, 0xc9, 0x92, 0x88, 0x1c, - 0x99, 0xf8, 0x17, 0xb0, 0x5b, 0xe9, 0xe8, 0x07, 0x19, 0x8f, 0x68, 0xc0, 0x69, 0x1e, 0xbd, 0x59, - 0xf7, 0x28, 0xda, 0x81, 0x8a, 0x18, 0x0e, 0x53, 0xa6, 0x4c, 0xc8, 0x73, 0x5b, 0xfe, 0xc9, 0xf1, - 0xda, 0xad, 0xf7, 0xd9, 0xfc, 0x89, 0x61, 0x61, 0xc7, 0x46, 0xbb, 0x00, 0x2c, 0xa6, 0x81, 0xd3, - 0x9a, 0x3f, 0x97, 0x96, 0xc7, 0x62, 0x6a, 0x1f, 0xd1, 0x06, 0xcc, 0x4b, 0x12, 0x8f, 0x58, 0xa3, - 0xd2, 0x2a, 0xad, 0xd7, 0x36, 0x2f, 0xf9, 0xa6, 0x20, 0xb0, 0x86, 0xfa, 0x09, 0x0b, 0xb7, 0xca, - 0x2f, 0x8f, 0xd7, 0x2e, 0x60, 0xeb, 0x83, 0xfa, 0x50, 0x0b, 0x85, 0x90, 0x94, 0xc7, 0x44, 0x09, - 0xd9, 0xa8, 0x9a, 0x53, 0xfc, 0xe2, 0xe4, 0x78, 0xed, 0xf3, 0xb7, 0x6d, 0x7e, 0xa6, 0x1c, 0xfd, - 0xfe, 0x98, 0x48, 0xda, 0xdb, 0xc6, 0xaf, 0xab, 0xa0, 0x3b, 0x00, 0x92, 0xa5, 0x22, 0xca, 0x14, - 0x17, 0x71, 0x63, 0xc1, 0x84, 0xb1, 0xe2, 0x17, 0x9c, 0x87, 0x8c, 0x50, 0x26, 0xf1, 0x6b, 0x3e, - 0xe8, 0x33, 0x58, 0x4a, 0xed, 0xab, 0x0d, 0x78, 0x4c, 0xd9, 0x61, 0xc3, 0x6b, 0x95, 0xd6, 0x97, - 0xf0, 0xa2, 0x03, 0x7b, 0x1a, 0x43, 0x5f, 0x02, 0x50, 0x26, 0xf9, 0x3e, 0x31, 0xb2, 0x60, 0x64, - 0x2f, 0xdb, 0xec, 0xba, 0x22, 0x8a, 0x58, 0xa8, 0x71, 0x9d, 0x22, 0x7e, 0xcd, 0x0f, 0x75, 0xe1, - 0xd2, 0x94, 0x28, 0x26, 0x39, 0x89, 0xf8, 0x0b, 0x4b, 0xad, 0x19, 0xea, 0x35, 0x4b, 0xdd, 0x3d, - 0x6d, 0x34, 0xfc, 0x37, 0x19, 0xed, 0x3f, 0xca, 0x70, 0xa9, 0xa8, 0xbd, 0x34, 0x11, 0x71, 0xca, - 0xd0, 0x3a, 0x54, 0x52, 0x45, 0x54, 0x96, 0x9a, 0xda, 0x5b, 0xde, 0x5c, 0xf1, 0xf3, 0xe3, 0xf1, - 0xfb, 0x06, 0xc7, 0xce, 0xae, 0x3d, 0xc7, 0x26, 0x67, 0x53, 0x5b, 0x6f, 0x3b, 0x0b, 0x67, 0x47, - 0x37, 0x61, 0x59, 0x31, 0x39, 0xe5, 0x31, 0x89, 0x02, 0x26, 0xa5, 0x90, 0xae, 0xe6, 0x96, 0x72, - 0xf4, 0x81, 0x06, 0xd1, 0x0f, 0xb0, 0x28, 0x19, 0xa1, 0x81, 0x1a, 0x4b, 0x91, 0x8d, 0xc6, 0xe7, - 0xac, 0xbf, 0x9a, 0xd6, 0x78, 0x6a, 0x25, 0x74, 0x11, 0x1e, 0x48, 0xae, 0x58, 0xa0, 0x23, 0x39, - 0x6f, 0x11, 0x1a, 0x05, 0x9d, 0x12, 0xea, 0xc1, 0x3c, 0x91, 0x2c, 0x26, 0xa6, 0x08, 0x17, 0xb7, - 0xee, 0x9e, 0x1c, 0xaf, 0x75, 0x46, 0x5c, 0x8d, 0xb3, 0x81, 0x1f, 0x8a, 0x69, 0x87, 0xa5, 0x2a, - 0x23, 0xf2, 0xc8, 0x0e, 0xac, 0x33, 0x23, 0xcc, 0xbf, 0xaf, 0xa9, 0xd8, 0x2a, 0xa0, 0x9b, 0x50, - 0xa6, 0x22, 0x4c, 0x1b, 0xd5, 0xd6, 0xdc, 0x7a, 0x6d, 0xb3, 0x66, 0xdf, 0x5a, 0x3f, 0xe2, 0x21, - 0x73, 0xa5, 0x6c, 0xcc, 0xe8, 0x21, 0x54, 0x6d, 0x07, 0xa5, 0x8d, 0x85, 0xd6, 0xdc, 0x39, 0xa2, - 0xcf, 0xe9, 0xba, 0xce, 0xb2, 0x8c, 0xd3, 0x20, 0x21, 0x52, 0xa5, 0x0d, 0xcf, 0x6c, 0xeb, 0xba, - 0xe8, 0xd9, 0xb3, 0xde, 0xf6, 0x9e, 0x86, 0xdd, 0xd6, 0x9e, 0x76, 0x34, 0x80, 0x2e, 0xfa, 0x84, - 0x84, 0x13, 0x46, 0x83, 0x09, 0x3b, 0x6a, 0xc0, 0xff, 0x05, 0xeb, 0x59, 0xa7, 0xef, 0xd8, 0x51, - 0x9b, 0x42, 0x1d, 0x8b, 0x70, 0x92, 0x6e, 0x6f, 0x6d, 0xb3, 0x34, 0x94, 0x3c, 0xd1, 0xbd, 0x73, - 0x1b, 0x90, 0xd4, 0x20, 0x1d, 0x04, 0x2c, 0xde, 0x0f, 0xa6, 0x6c, 0x9a, 0x28, 0x69, 0x2a, 0xac, - 0x82, 0x57, 0x9c, 0xe5, 0x41, 0xbc, 0xbf, 0x6b, 0x70, 0x74, 0x1d, 0x16, 0x73, 0x6f, 0x33, 0x5f, - 0xed, 0xec, 0xad, 0x39, 0x4c, 0xcf, 0xd8, 0xf6, 0xcf, 0xe0, 0x75, 0xf3, 0x51, 0x8a, 0xae, 0x42, - 0x95, 0x27, 0x01, 0xa1, 0xd4, 0x4a, 0x7a, 0xb8, 0xc2, 0x93, 0xfb, 0x94, 0x4a, 0xf4, 0x15, 0x2c, - 0xb9, 0xf9, 0x1b, 0x24, 0x42, 0xa7, 0x7d, 0xd1, 0x24, 0x50, 0xb7, 0x09, 0xb8, 0x11, 0xbc, 0x27, - 0xa4, 0xc2, 0x8b, 0xf1, 0x6c, 0x91, 0xb6, 0xbf, 0x85, 0x7a, 0x97, 0x24, 0x2a, 0x93, 0xf9, 0x4c, - 0x7e, 0x70, 0xa8, 0xd0, 0x2d, 0xa8, 0x44, 0x64, 0xc0, 0x22, 0xdb, 0x19, 0xb5, 0x4d, 0xe4, 0xeb, - 0x6b, 0xc7, 0x8c, 0x8a, 0xef, 0x35, 0xce, 0xe3, 0x11, 0x76, 0x1e, 0xed, 0x1d, 0x40, 0x85, 0x80, - 0x6d, 0x2c, 0xad, 0x70, 0x07, 0xbc, 0x62, 0xfe, 0x17, 0x22, 0xf9, 0x25, 0x5a, 0xa4, 0x83, 0x67, - 0x4e, 0xed, 0xbf, 0x4b, 0xb0, 0xb2, 0xad, 0xbb, 0xfe, 0x9c, 0x81, 0xa0, 0x4d, 0x28, 0x8b, 0x84, - 0xc5, 0xae, 0x45, 0x57, 0x8b, 0xdd, 0xde, 0x14, 0xf5, 0x9f, 0x24, 0x2c, 0xc6, 0xc6, 0xb7, 0x79, - 0x00, 0x65, 0xbd, 0x42, 0x37, 0x60, 0x39, 0x7d, 0x1e, 0xe9, 0xee, 0xd9, 0x1f, 0xa6, 0x41, 0x26, - 0xb9, 0x3b, 0xdd, 0x45, 0x8b, 0xfe, 0x38, 0x4c, 0x9f, 0x49, 0x8e, 0x7a, 0xb3, 0x57, 0x4b, 0x8b, - 0x17, 0xee, 0xf6, 0x6b, 0x16, 0xfb, 0x9d, 0x29, 0x09, 0x5c, 0x77, 0xac, 0x19, 0xd4, 0xfe, 0x67, - 0x0e, 0xea, 0x79, 0x60, 0x1f, 0x70, 0x6a, 0xe8, 0x6b, 0xa8, 0xe8, 0x44, 0x18, 0x75, 0x61, 0x5c, - 0x3f, 0x93, 0x76, 0xa1, 0x6e, 0xf2, 0x66, 0x14, 0x3b, 0x02, 0xda, 0x02, 0x2f, 0xc9, 0x06, 0x11, - 0x4f, 0xc7, 0xcc, 0xde, 0x8c, 0xb5, 0xcd, 0x1b, 0xef, 0x60, 0xef, 0xe5, 0xbe, 0x78, 0x46, 0x43, - 0xdf, 0x40, 0x75, 0x18, 0x65, 0x46, 0xa1, 0x6c, 0x14, 0xda, 0xef, 0x50, 0xd8, 0xb1, 0x9e, 0x38, - 0xa7, 0x34, 0x77, 0xa1, 0x62, 0x63, 0x42, 0x5d, 0x40, 0x8e, 0x17, 0x84, 0x63, 0x16, 0x4e, 0x12, - 0xc1, 0x63, 0xe5, 0x4e, 0xe0, 0xf2, 0x6c, 0x2c, 0x77, 0x0b, 0x1b, 0xae, 0x3b, 0xff, 0x19, 0xd4, - 0x54, 0xe0, 0x15, 0x41, 0xea, 0x2f, 0x9a, 0x29, 0x39, 0x0c, 0xc2, 0x48, 0x84, 0x13, 0xd7, 0x7d, - 0x0b, 0x53, 0x72, 0xd8, 0xd5, 0x6b, 0xf4, 0x29, 0xc0, 0x84, 0x1d, 0x05, 0xb6, 0x93, 0xcd, 0xc9, - 0x2d, 0x62, 0x6f, 0xc2, 0x8e, 0xf6, 0x0c, 0xa0, 0xbf, 0x6a, 0xf4, 0xe8, 0xe0, 0xfa, 0xe6, 0x48, - 0x73, 0xaf, 0x39, 0xe3, 0xb5, 0x32, 0x33, 0x58, 0xe7, 0xe6, 0x06, 0x54, 0x5d, 0x62, 0xa8, 0x05, - 0xf3, 0xfa, 0xc2, 0xc8, 0x8b, 0x15, 0x6c, 0xb1, 0x6a, 0x04, 0x5b, 0x43, 0xbb, 0x0b, 0x1f, 0xcd, - 0xae, 0xab, 0xf3, 0x76, 0xdc, 0x23, 0xb8, 0x72, 0x4a, 0xe4, 0x03, 0xea, 0x67, 0xf3, 0x11, 0x2c, - 0xb8, 0x6b, 0x51, 0xa2, 0x7b, 0x50, 0x75, 0xcf, 0xe8, 0x6a, 0xc1, 0x3a, 0xfd, 0xc1, 0xd6, 0x6c, - 0x9c, 0x35, 0xd8, 0xed, 0xef, 0x94, 0xb6, 0xee, 0xbd, 0xfc, 0x73, 0xf5, 0xc2, 0xcb, 0x57, 0xab, - 0xa5, 0xdf, 0x5f, 0xad, 0x96, 0x7e, 0xfb, 0x6b, 0xb5, 0xf4, 0xd3, 0xed, 0xf7, 0xba, 0x31, 0x9c, - 0xe2, 0xa0, 0x62, 0xa0, 0xbb, 0xff, 0x05, 0x00, 0x00, 0xff, 0xff, 0xb9, 0x8a, 0xa5, 0x5c, 0x82, - 0x0b, 0x00, 0x00, + // 1337 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x56, 0x4f, 0x73, 0x13, 0xc7, + 0x12, 0x67, 0x91, 0x2c, 0x79, 0x5b, 0xb6, 0xb1, 0xa6, 0xfc, 0x40, 0xe8, 0xbd, 0x67, 0x0b, 0x3d, + 0xa8, 0xe7, 0xc2, 0x64, 0x45, 0x4c, 0x2a, 0x95, 0xa4, 0x52, 0xa4, 0x90, 0x6c, 0x17, 0x26, 0x31, + 0x38, 0x2b, 0xc8, 0x21, 0x97, 0xad, 0xf1, 0xce, 0x48, 0xda, 0x68, 0xb5, 0xb3, 0xcc, 0xcc, 0xda, + 0x16, 0x9f, 0x24, 0xc7, 0x7c, 0x1c, 0x8e, 0xa9, 0x7c, 0x00, 0x57, 0x85, 0x1c, 0x73, 0x4d, 0x0e, + 0xf1, 0x29, 0x35, 0x7f, 0x76, 0x85, 0x31, 0xa1, 0x28, 0x73, 0x00, 0xcf, 0xfc, 0xfa, 0xf7, 0xeb, + 0xe9, 0x1e, 0xf5, 0x74, 0x2f, 0xb4, 0x87, 0xac, 0x93, 0x72, 0x26, 0x59, 0xc8, 0x62, 0xd1, 0xe1, + 0x59, 0x22, 0xa3, 0x09, 0xcd, 0xff, 0x7a, 0xda, 0x82, 0xaa, 0x76, 0xdb, 0x5c, 0x3d, 0xe0, 0x6c, + 0x4c, 0x79, 0x21, 0x28, 0x16, 0x86, 0xd8, 0x6c, 0x85, 0x2c, 0x11, 0xd9, 0xe4, 0x1d, 0x8c, 0xff, + 0x9c, 0x39, 0x6e, 0x10, 0xb3, 0x23, 0xfd, 0x9f, 0xb5, 0x36, 0xcf, 0x58, 0x59, 0xaa, 0xff, 0x59, + 0xdb, 0xca, 0x90, 0x0d, 0x99, 0x5e, 0x76, 0xd4, 0xca, 0xa0, 0xed, 0x1f, 0x1d, 0xa8, 0x3f, 0xc5, + 0x62, 0xdc, 0xa7, 0xfc, 0x30, 0x0a, 0x69, 0x8f, 0x25, 0x83, 0x68, 0x88, 0x56, 0xa1, 0x16, 0xb3, + 0x61, 0x30, 0x88, 0x62, 0x1a, 0x0c, 0x48, 0xc3, 0x69, 0x39, 0xeb, 0x73, 0xbe, 0x1b, 0xb3, 0xe1, + 0x4e, 0x14, 0xd3, 0x1d, 0x82, 0xfe, 0x0d, 0xae, 0xc4, 0x62, 0x1c, 0x24, 0x78, 0x42, 0x1b, 0x97, + 0x5b, 0xce, 0xba, 0xeb, 0xcf, 0x2b, 0xe0, 0x31, 0x9e, 0x50, 0x74, 0x1d, 0xe6, 0x33, 0x22, 0x82, + 0x14, 0xcb, 0x51, 0xa3, 0xa4, 0x6d, 0xd5, 0x8c, 0x88, 0x7d, 0x2c, 0x47, 0x68, 0x03, 0xea, 0x21, + 0x4b, 0x24, 0x8e, 0x12, 0xca, 0x83, 0x84, 0xca, 0x23, 0xc6, 0xc7, 0x8d, 0xb2, 0xe6, 0x2c, 0x17, + 0x86, 0xc7, 0x06, 0x6f, 0xff, 0x55, 0x86, 0xa5, 0xfe, 0x28, 0x1b, 0x0c, 0x62, 0xea, 0xd3, 0xe7, + 0x19, 0x15, 0x12, 0xed, 0x42, 0xf5, 0x07, 0x96, 0xf1, 0x04, 0xc7, 0x3a, 0x26, 0xb7, 0xdb, 0x39, + 0x3d, 0x59, 0xdb, 0x18, 0x32, 0x6f, 0x88, 0x5f, 0x50, 0x29, 0xa9, 0x47, 0xe8, 0x61, 0x27, 0x64, + 0x9c, 0x76, 0xde, 0xb8, 0x68, 0xef, 0x91, 0x91, 0xf9, 0xb9, 0x1e, 0x5d, 0x85, 0x0a, 0xa7, 0x69, + 0x8c, 0xa7, 0x3a, 0xfe, 0x79, 0xdf, 0xee, 0x54, 0xf4, 0x07, 0x59, 0x14, 0x93, 0x20, 0x22, 0x79, + 0xf4, 0x7a, 0xbf, 0x4b, 0xd0, 0x0e, 0x54, 0xd8, 0x60, 0x20, 0xa8, 0xd4, 0x21, 0x97, 0xba, 0xde, + 0xe9, 0xc9, 0xda, 0xed, 0xf7, 0x39, 0xfc, 0x89, 0x56, 0xf9, 0x56, 0x8d, 0xf6, 0x00, 0x68, 0x42, + 0x02, 0xeb, 0x6b, 0xee, 0x42, 0xbe, 0x5c, 0x9a, 0x10, 0xb3, 0x44, 0x1b, 0x30, 0xc7, 0x71, 0x32, + 0xa4, 0x8d, 0x4a, 0xcb, 0x59, 0xaf, 0x6d, 0x5e, 0xf1, 0x74, 0x41, 0xf8, 0x0a, 0xea, 0xa7, 0x34, + 0xec, 0x96, 0x5f, 0x9e, 0xac, 0x5d, 0xf2, 0x0d, 0x07, 0xf5, 0xa1, 0x16, 0x32, 0xc6, 0x49, 0x94, + 0x60, 0xc9, 0x78, 0xa3, 0xaa, 0x6f, 0xf1, 0xe3, 0xd3, 0x93, 0xb5, 0x8f, 0xde, 0x76, 0xf8, 0xb9, + 0x72, 0xf4, 0xfa, 0x23, 0xcc, 0xc9, 0xee, 0x96, 0xff, 0xba, 0x17, 0x74, 0x17, 0x80, 0x53, 0xc1, + 0xe2, 0x4c, 0x46, 0x2c, 0x69, 0xcc, 0xeb, 0x30, 0x96, 0xbd, 0x42, 0xf3, 0x90, 0x62, 0x42, 0xb9, + 0xff, 0x1a, 0x07, 0xfd, 0x0f, 0x16, 0x85, 0xf9, 0x69, 0x83, 0x28, 0x21, 0xf4, 0xb8, 0xe1, 0xb6, + 0x9c, 0xf5, 0x45, 0x7f, 0xc1, 0x82, 0xbb, 0x0a, 0x43, 0x9f, 0x00, 0x10, 0xca, 0xa3, 0x43, 0xac, + 0xdd, 0x82, 0x76, 0xbb, 0x62, 0xb2, 0xeb, 0xb1, 0x38, 0xa6, 0xa1, 0xc2, 0x55, 0x8a, 0xfe, 0x6b, + 0x3c, 0xd4, 0x83, 0x2b, 0x13, 0x2c, 0x29, 0x8f, 0x70, 0x1c, 0xbd, 0x30, 0xd2, 0x9a, 0x96, 0x5e, + 0x37, 0xd2, 0xbd, 0xb3, 0x46, 0xad, 0x7f, 0x53, 0xd1, 0xfe, 0xa5, 0x0c, 0x57, 0x8a, 0xda, 0x13, + 0x29, 0x4b, 0x04, 0x45, 0xeb, 0x50, 0x11, 0x12, 0xcb, 0x4c, 0xe8, 0xda, 0x5b, 0xda, 0x5c, 0xf6, + 0xf2, 0xeb, 0xf1, 0xfa, 0x1a, 0xf7, 0xad, 0x5d, 0x31, 0x47, 0x3a, 0x67, 0x5d, 0x5b, 0x6f, 0xbb, + 0x0b, 0x6b, 0x47, 0xb7, 0x60, 0x49, 0x52, 0x3e, 0x89, 0x12, 0x1c, 0x07, 0x94, 0x73, 0xc6, 0x6d, + 0xcd, 0x2d, 0xe6, 0xe8, 0xb6, 0x02, 0xd1, 0xb7, 0xb0, 0xc0, 0x29, 0x26, 0x81, 0x1c, 0x71, 0x96, + 0x0d, 0x47, 0x17, 0xac, 0xbf, 0x9a, 0xf2, 0xf1, 0xd4, 0xb8, 0x50, 0x45, 0x78, 0xc4, 0x23, 0x49, + 0x03, 0x15, 0xc9, 0x45, 0x8b, 0x50, 0x7b, 0x50, 0x29, 0xa1, 0x5d, 0x98, 0xc3, 0x9c, 0x26, 0x58, + 0x17, 0xe1, 0x42, 0xf7, 0xde, 0xe9, 0xc9, 0x5a, 0x67, 0x18, 0xc9, 0x51, 0x76, 0xe0, 0x85, 0x6c, + 0xd2, 0xa1, 0x42, 0x66, 0x98, 0x4f, 0x4d, 0xc3, 0x3a, 0xd7, 0xc2, 0xbc, 0x07, 0x4a, 0xea, 0x1b, + 0x0f, 0xe8, 0x16, 0x94, 0x09, 0x0b, 0x45, 0xa3, 0xda, 0x2a, 0xad, 0xd7, 0x36, 0x6b, 0xe6, 0x57, + 0xeb, 0xc7, 0x51, 0x48, 0x6d, 0x29, 0x6b, 0x33, 0x7a, 0x08, 0x55, 0xf3, 0x82, 0x44, 0x63, 0xbe, + 0x55, 0xba, 0x40, 0xf4, 0xb9, 0x5c, 0xd5, 0x59, 0x96, 0x45, 0x24, 0x48, 0x31, 0x97, 0xa2, 0xe1, + 0xea, 0x63, 0xed, 0x2b, 0x7a, 0xf6, 0x6c, 0x77, 0x6b, 0x5f, 0xc1, 0xf6, 0x68, 0x57, 0x11, 0x35, + 0xa0, 0x8a, 0x3e, 0xc5, 0xe1, 0x98, 0x92, 0x60, 0x4c, 0xa7, 0x0d, 0xf8, 0xa7, 0x60, 0x5d, 0x43, + 0xfa, 0x9a, 0x4e, 0xdb, 0x04, 0xea, 0x3e, 0x0b, 0xc7, 0x62, 0xab, 0xbb, 0x45, 0x45, 0xc8, 0xa3, + 0x54, 0xbd, 0x9d, 0x3b, 0x80, 0xb8, 0x02, 0xc9, 0x41, 0x40, 0x93, 0xc3, 0x60, 0x42, 0x27, 0xa9, + 0xe4, 0xba, 0xc2, 0x2a, 0xfe, 0xb2, 0xb5, 0x6c, 0x27, 0x87, 0x7b, 0x1a, 0x47, 0x37, 0x60, 0x21, + 0x67, 0xeb, 0xfe, 0x6a, 0x7a, 0x6f, 0xcd, 0x62, 0xaa, 0xc7, 0xb6, 0xff, 0x74, 0xc0, 0xed, 0xe5, + 0xbd, 0x14, 0x5d, 0x83, 0x6a, 0x94, 0x06, 0x98, 0x10, 0xe3, 0xd3, 0xf5, 0x2b, 0x51, 0xfa, 0x80, + 0x10, 0x8e, 0x3e, 0x85, 0x45, 0xdb, 0x80, 0x83, 0x94, 0xa9, 0xbc, 0x2f, 0xeb, 0x0c, 0xea, 0x26, + 0x03, 0xdb, 0x83, 0xf7, 0x19, 0x97, 0xfe, 0x42, 0x32, 0xdb, 0x08, 0xd4, 0x87, 0xfa, 0x04, 0xa7, + 0x29, 0x25, 0xc1, 0x88, 0x09, 0x69, 0xb5, 0x25, 0xad, 0xfd, 0xbf, 0x97, 0x8f, 0xbd, 0xe2, 0x7c, + 0x6f, 0x4f, 0x73, 0x1f, 0x32, 0x21, 0xb5, 0x7c, 0x3b, 0x91, 0x7c, 0xaa, 0x9e, 0xdb, 0x19, 0xb4, + 0xd9, 0x85, 0x95, 0xb7, 0x11, 0xd1, 0x32, 0x94, 0xd4, 0xe5, 0x3a, 0xba, 0x39, 0xa8, 0x25, 0x5a, + 0x81, 0xb9, 0x43, 0x1c, 0x67, 0xf9, 0xd4, 0x31, 0x9b, 0x2f, 0x2e, 0x7f, 0xe6, 0xb4, 0xbf, 0x82, + 0x7a, 0x0f, 0xa7, 0x32, 0xe3, 0xf9, 0xb4, 0xd8, 0x3e, 0x96, 0xe8, 0x36, 0x54, 0x62, 0x7c, 0x40, + 0x63, 0xf3, 0x66, 0x6b, 0x9b, 0xc8, 0x53, 0x03, 0x51, 0x37, 0xb1, 0x6f, 0x14, 0x1e, 0x25, 0x43, + 0xdf, 0x32, 0xda, 0x3b, 0x80, 0x0a, 0x07, 0xe6, 0xc9, 0x2b, 0x0f, 0x77, 0xc1, 0x2d, 0x26, 0x53, + 0xe1, 0xe4, 0x5c, 0x9e, 0xfe, 0x8c, 0xd4, 0xfe, 0xdd, 0x81, 0xe5, 0x2d, 0xd5, 0x8f, 0x2e, 0x18, + 0x08, 0xda, 0x84, 0x32, 0x4b, 0x69, 0x62, 0x9b, 0xc7, 0x6a, 0x71, 0xda, 0x9b, 0x4e, 0xbd, 0x27, + 0x29, 0x4d, 0x7c, 0xcd, 0x6d, 0x1e, 0x41, 0x59, 0xed, 0xd0, 0x4d, 0x58, 0x12, 0xcf, 0x63, 0xf5, + 0xae, 0x0f, 0x07, 0x22, 0xc8, 0x78, 0x64, 0x7f, 0xf6, 0x05, 0x83, 0x7e, 0x37, 0x10, 0xcf, 0x78, + 0x84, 0x76, 0x67, 0x45, 0x47, 0x8a, 0x52, 0xb4, 0xe7, 0x35, 0x8b, 0xf3, 0xce, 0x15, 0xab, 0x5f, + 0xb7, 0xaa, 0x19, 0xd4, 0xfe, 0xa3, 0x04, 0xf5, 0x3c, 0xb0, 0x0f, 0xb8, 0x35, 0xf4, 0x39, 0x54, + 0x54, 0x22, 0x94, 0xd8, 0x30, 0x6e, 0x9c, 0x4b, 0xbb, 0xf0, 0xae, 0xf3, 0xa6, 0xc4, 0xb7, 0x02, + 0xd4, 0x05, 0x37, 0xcd, 0x0e, 0xe2, 0x48, 0x8c, 0xa8, 0x99, 0xd9, 0xb5, 0xcd, 0x9b, 0xef, 0x50, + 0xef, 0xe7, 0x5c, 0x7f, 0x26, 0x43, 0x5f, 0x42, 0x75, 0x10, 0x67, 0xda, 0x43, 0x59, 0x7b, 0x68, + 0xbf, 0xc3, 0xc3, 0x8e, 0x61, 0xfa, 0xb9, 0xa4, 0xb9, 0x07, 0x15, 0x13, 0x13, 0xea, 0x01, 0xb2, + 0xba, 0x20, 0x1c, 0xd1, 0x70, 0x9c, 0xb2, 0x28, 0x91, 0xf6, 0x06, 0x56, 0x66, 0x03, 0xa3, 0x57, + 0xd8, 0xfc, 0xba, 0xe5, 0xcf, 0xa0, 0xa6, 0x04, 0xb7, 0x08, 0x52, 0x7d, 0x6b, 0x4d, 0xf0, 0x71, + 0x10, 0xc6, 0x2c, 0x1c, 0xdb, 0xbe, 0x30, 0x3f, 0xc1, 0xc7, 0x3d, 0xb5, 0x47, 0xff, 0x05, 0x18, + 0xd3, 0x69, 0x60, 0x7a, 0x8c, 0xbe, 0xb9, 0x05, 0xdf, 0x1d, 0xd3, 0xe9, 0xbe, 0x06, 0xd4, 0xf7, + 0x96, 0x6a, 0x6a, 0x91, 0x9a, 0x69, 0x22, 0x67, 0x95, 0x34, 0x6b, 0x79, 0x66, 0x30, 0xe4, 0xe6, + 0x06, 0x54, 0x6d, 0x62, 0xa8, 0x05, 0x73, 0x6a, 0x94, 0xe5, 0xc5, 0x0a, 0xa6, 0x58, 0x15, 0xe2, + 0x1b, 0x43, 0xbb, 0x07, 0xff, 0x9a, 0x0d, 0xd2, 0x8b, 0xbe, 0xb8, 0x47, 0x70, 0xf5, 0x8c, 0x93, + 0x0f, 0xa8, 0x9f, 0xcd, 0x47, 0x30, 0x6f, 0x07, 0x36, 0x47, 0xf7, 0xa1, 0x6a, 0xd7, 0xe8, 0x5a, + 0xa1, 0x3a, 0xfb, 0x29, 0xd9, 0x6c, 0x9c, 0x37, 0x98, 0xe3, 0xef, 0x3a, 0xdd, 0xfb, 0x2f, 0x7f, + 0x5d, 0xbd, 0xf4, 0xf2, 0xd5, 0xaa, 0xf3, 0xf3, 0xab, 0x55, 0xe7, 0xa7, 0xdf, 0x56, 0x9d, 0xef, + 0xef, 0xbc, 0xd7, 0x2c, 0xb3, 0x1e, 0x0f, 0x2a, 0x1a, 0xba, 0xf7, 0x77, 0x00, 0x00, 0x00, 0xff, + 0xff, 0xbf, 0xea, 0x80, 0xdf, 0x1c, 0x0c, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -1306,6 +1319,23 @@ func (m *Container) MarshalToSizedBuffer(dAtA []byte) (int, error) { i -= len(m.XXX_unrecognized) copy(dAtA[i:], m.XXX_unrecognized) } + if len(m.MappedHostPorts) > 0 { + for k := range m.MappedHostPorts { + v := m.MappedHostPorts[k] + baseI := i + i -= len(v) + copy(dAtA[i:], v) + i = encodeVarintRuntime(dAtA, i, uint64(len(v))) + i-- + dAtA[i] = 0x12 + i = encodeVarintRuntime(dAtA, i, uint64(k)) + i-- + dAtA[i] = 0x8 + i = encodeVarintRuntime(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x1a + } + } if len(m.NetworkPorts) > 0 { for iNdEx := len(m.NetworkPorts) - 1; iNdEx >= 0; iNdEx-- { { @@ -1964,6 +1994,14 @@ func (m *Container) ProtoSize() (n int) { n += 1 + l + sovRuntime(uint64(l)) } } + if len(m.MappedHostPorts) > 0 { + for k, v := range m.MappedHostPorts { + _ = k + _ = v + mapEntrySize := 1 + sovRuntime(uint64(k)) + 1 + len(v) + sovRuntime(uint64(len(v))) + n += mapEntrySize + 1 + sovRuntime(uint64(mapEntrySize)) + } + } if m.XXX_unrecognized != nil { n += len(m.XXX_unrecognized) } @@ -3270,6 +3308,119 @@ func (m *Container) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex + case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field MappedHostPorts", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowRuntime + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthRuntime + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthRuntime + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.MappedHostPorts == nil { + m.MappedHostPorts = make(map[uint32]string) + } + var mapkey uint32 + var mapvalue string + for iNdEx < postIndex { + entryPreIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowRuntime + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + if fieldNum == 1 { + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowRuntime + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + mapkey |= uint32(b&0x7F) << shift + if b < 0x80 { + break + } + } + } else if fieldNum == 2 { + var stringLenmapvalue uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowRuntime + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLenmapvalue |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLenmapvalue := int(stringLenmapvalue) + if intStringLenmapvalue < 0 { + return ErrInvalidLengthRuntime + } + postStringIndexmapvalue := iNdEx + intStringLenmapvalue + if postStringIndexmapvalue < 0 { + return ErrInvalidLengthRuntime + } + if postStringIndexmapvalue > l { + return io.ErrUnexpectedEOF + } + mapvalue = string(dAtA[iNdEx:postStringIndexmapvalue]) + iNdEx = postStringIndexmapvalue + } else { + iNdEx = entryPreIndex + skippy, err := skipRuntime(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthRuntime + } + if (iNdEx + skippy) > postIndex { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + m.MappedHostPorts[mapkey] = mapvalue + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipRuntime(dAtA[iNdEx:]) diff --git a/go/protocols/runtime/runtime.proto b/go/protocols/runtime/runtime.proto index f5a775ebdf..101a99a465 100644 --- a/go/protocols/runtime/runtime.proto +++ b/go/protocols/runtime/runtime.proto @@ -125,8 +125,16 @@ message RocksDBDescriptor { // Container is a description of a running connector container. message Container { + // IP Address of the running container. + // If this IP is accessible (it may not be, in contexts like Docker Desktop for Mac), + // then it is *only* accessible from the hosting server. string ip_addr = 1; + // Network ports which are available for this container. repeated flow.NetworkPort network_ports = 2; + // Mapping of ports from `network_ports` to a corresponding "host-ip:port" address, + // as either IPv4 or IPv6, through which the port can be accessed. If empty, + // then the container `ip_addr` should be used directly. + map mapped_host_ports = 3; } message CaptureRequestExt {