feat(managed): etcd mTLS + managed-mode switch (skip admin/UI/Playground)

[moonming]

Summary

Adds two closely-related DP-side capabilities required for AISIX to act as an aisix.cloud tenant:

1. etcd mTLS client — the aisix.cloud DP Manager serves etcd v3 over mTLS, so the DP needs to read a CA + client cert + client key from disk and wire them into the existing etcd-clientConnectOptions.
2. Managed-mode switch — when enabled, the admin API listener, admin UI, and Playground endpoint are not bound. All configuration flows from etcd; resource mutations happen through the cloud control plane.

This is the first of ~three DP-side PRs. Registration (fetching the mTLS bundle from cp-api at boot), heartbeat, and local snapshot fallback land in follow-ups.

Config shape

etcd:
endpoints: ["https://etcd.aisix.cloud:2379"]tls:
ca_cert_file: "/etc/aisix/mtls/ca.crt"client_cert_file: "/etc/aisix/mtls/client.crt"client_key_file: "/etc/aisix/mtls/client.key"# domain_name: "etcd.aisix.cloud" # optional; defaults to endpoints[0] hostproxy:
addr: "0.0.0.0:3000"managed:
enabled: true

Standalone users are unaffected: new fields are all optional and defaulted, validate() keeps the existing invariants when managed.enabled = false.

What the managed switch actually flips

Component	Standalone	Managed
Proxy listener	✅ bound	✅ bound
etcd provider + watch supervisor	✅	✅
Admin etcd client (write path)	✅	❌ skipped
Admin router (/admin/v1/*, UI, Playground)	✅ bound	❌ never constructed
Admin TCP listener	✅ bound	❌ never bound
/metrics (currently mounted on admin)	✅ served	❌ not served

The last row is worth calling out: Phase 1 mounts Prometheus on the admin listener, so managed mode loses it. Adding a dedicated observability listener is a follow-up; for aisix.cloud tenants, Prometheus scraping is expected to happen on the cloud control plane side anyway.

New helper

build_etcd_connect_options(&EtcdConfig) -> anyhow::Result<Option<ConnectOptions>>:

• Returns None for plain HTTP etcd (keeps the hot path cheap — no pointless ConnectOptions::new() allocation when nothing needs wiring).
• Reads the three PEM files and constructs TlsOptions::new().domain_name(...).ca_certificate(...).identity(...).
• Missing files surface with the config key name (etcd.tls.ca_cert_file = "/...") in the error so operators don't have to diff config against filesystem state.

default_domain_from_endpoint() extracts the SNI from URL-ish strings: http://, https://, bare host:port, and IPv6 literals [::1]:2379 — table-tested.

Tests

cargo test --workspace --all-features green (407 tests). New cases:

• aisix-core::config::tests::managed_mode_lets_admin_fields_be_omitted — minimum aisix.cloud tenant YAML loads cleanly.
• aisix-core::config::tests::standalone_still_requires_admin_keys_even_with_managed_false — original invariant preserved.
• aisix-core::config::tests::parses_etcd_tls_block — round-trip for all four TLS fields.
• aisix-server::tests::default_domain_strips_scheme_port_and_brackets — SNI extractor table.
• aisix-server::tests::build_connect_options_none_when_plain_http — hot path stays zero-cost.
• aisix-server::tests::build_connect_options_surfaces_missing_cert_files — operator-friendly error.

cargo fmt + cargo clippy --workspace --all-targets -- -D warnings clean.

Explicitly out of scope (follow-up PRs on this branch's successor stack)

• Registration flow: the DP currently expects the mTLS bundle already on disk. The next PR adds POST /dp/register client that exchanges a one-time Deployment Token for the bundle at boot and persists it atomically.
• Heartbeat: periodic POST /api/ai_dataplane/heartbeat so cp-api knows the DP is alive (and so the Gateway page in aisix.cloud shows green dots).
• Local config snapshot: continue serving proxy traffic when the etcd watch disconnects mid-flight (see aisix.cloud PRD prd-09 §9.7.2).
• Structured request logs + hashes: the observability schema aisix.cloud telemetry consumes.

Relationship

Paired with the aisix.cloud side in api7/AISIX-Cloud#8: that PR's GatewayHandlers.create calls IssueDataplaneCertificate on api7ee CP and returns the bundle to the user, who then drops it on their DP machine. The DP then boots with this PR's new config block pointing at those files.

[Copilot]

Pull request overview

Adds dataplane support for aisix.cloud tenants by introducing etcd mTLS client wiring and a managed-mode switch that disables the standalone admin surface.

Changes:

• Add etcd.tls config (CA/cert/key + optional domain_name) and build etcd-clientConnectOptions with mTLS.
• Add managed.enabled config and skip admin etcd client + admin router/listener when managed mode is on.
• Update example config and add tests for domain derivation, connect options behavior, and managed/standalone config validation.

Reviewed changes

Copilot reviewed 4 out of 4 changed files in this pull request and generated 4 comments.

File	Description
crates/aisix-server/src/main.rs	Build etcd ConnectOptions (mTLS/auth) and gate admin listener/router creation behind managed mode.
crates/aisix-core/src/lib.rs	Re-export new config types (EtcdTlsConfig, ManagedConfig).
crates/aisix-core/src/config.rs	Extend config schema with etcd.tls + managed, default admin for managed configs, and update validation rules.
config.example.yaml	Document new etcd.tls block and managed.enabled toggle.

---

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

[Copilot]

build_etcd_connect_options() only applies basic auth if bothetcd.user and etcd.password_env are set. If a user sets only one of these fields (common config mistake), it will silently skip auth and likely fail with an opaque etcd permission error. Prefer returning a config error (or add a Config::validate() check) when exactly one of the two is set.

Suggested change

	iflet(Some(user),Some(env_key)) = (etcd.user.as_ref(), etcd.password_env.as_ref()){
	let pw = std::env::var(env_key).map_err(|_| {
	anyhow::anyhow!("etcd.password_env = {env_key:?} is set but the env var is missing")
	})?;
	options = options.with_user(user.clone(), pw);
	needs_options = true;
	match(etcd.user.as_ref(), etcd.password_env.as_ref()){
	(Some(user),Some(env_key)) => {
	let pw = std::env::var(env_key).map_err(|_| {
	anyhow::anyhow!("etcd.password_env = {env_key:?} is set but the env var is missing")
	})?;
	options = options.with_user(user.clone(), pw);
	needs_options = true;
	}
	(None,None) => {}
	(Some(_),None) => {
	returnErr(anyhow::anyhow!(
	"etcd.user is set but etcd.password_env is missing; set both fields to enable etcd basic auth"
	));
	}
	(None,Some(_)) => {
	returnErr(anyhow::anyhow!(
	"etcd.password_env is set but etcd.user is missing; set both fields to enable etcd basic auth"
	));
	}

[Copilot]

EtcdConfig exposes dial_timeout_ms and request_timeout_ms, but build_etcd_connect_options() never uses them and there are no other call sites wiring these into etcd-client. This makes the timeout knobs in config.example.yaml ineffective. Consider setting the appropriate timeouts on ConnectOptions (and marking needs_options = true accordingly) so the config fields actually take effect.

Suggested change

	ifletSome(dial_timeout_ms) = etcd.dial_timeout_ms{
	options = options.with_connect_timeout(std::time::Duration::from_millis(dial_timeout_ms));
	needs_options = true;
	}
	ifletSome(request_timeout_ms) = etcd.request_timeout_ms{
	options = options.with_timeout(std::time::Duration::from_millis(request_timeout_ms));
	needs_options = true;
	}

[Copilot]

The doc comment says cert/key I/O failures “bubble up as a … BootstrapError”, but this helper returns anyhow::Result and the produced errors are anyhow::Error strings. Consider adjusting the wording to avoid implying a specific error type here.

Suggested change

	/// failure bubbles up as a nicely-contextualised BootstrapError at
	/// the same point as other etcd connection errors.
	/// failure bubbles up as a nicelycontextualised error at the same
	/// point as other etcd connection errors.

[Copilot]

AdminConfig::default_addr() sets 127.0.0.1:0, and Config::validate() only checks that admin.addr parses (in standalone mode). This allows a standalone config that omits admin.addr (but sets admin_keys) to bind the admin listener on an ephemeral port, which contradicts the comment and is operationally surprising. Consider either (a) defaulting to the previous explicit port, or (b) rejecting port 0 / the default value in validate() when managed.enabled is false with a clear error message.

Suggested change

	ifself.admin.addr.parse::<std::net::SocketAddr>().is_err(){
	returnErr(BootstrapError::Config(format!(
	"admin.addr invalid socket address: {}",
	self.admin.addr
	)));
	let admin_addr = self
	.admin
	.addr
	.parse::<std::net::SocketAddr>()
	.map_err(|_| {
	BootstrapError::Config(format!(
	"admin.addr invalid socket address: {}",
	self.admin.addr
	))
	})?;
	if admin_addr.port() == 0{
	returnErr(BootstrapError::Config(
	"admin.addr must use an explicit non-zero port \
	(required when managed.enabled is false)"
	.into(),
	));

[moonming]

Summary

Adds two closely-related DP-side capabilities required for AISIX to act as an aisix.cloud tenant:

1. etcd mTLS client — the aisix.cloud DP Manager serves etcd v3 over mTLS, so the DP needs to read a CA + client cert + client key from disk and wire them into the existing etcd-clientConnectOptions.
2. Managed-mode switch — when enabled, the admin API listener, admin UI, and Playground endpoint are not bound. All configuration flows from etcd; resource mutations happen through the cloud control plane.

This is the first of ~three DP-side PRs. Registration (fetching the mTLS bundle from cp-api at boot), heartbeat, and local snapshot fallback land in follow-ups.

Config shape

etcd:
endpoints: ["https://etcd.aisix.cloud:2379"]tls:
ca_cert_file: "/etc/aisix/mtls/ca.crt"client_cert_file: "/etc/aisix/mtls/client.crt"client_key_file: "/etc/aisix/mtls/client.key"# domain_name: "etcd.aisix.cloud" # optional; defaults to endpoints[0] hostproxy:
addr: "0.0.0.0:3000"managed:
enabled: true

Standalone users are unaffected: new fields are all optional and defaulted, validate() keeps the existing invariants when managed.enabled = false.

What the managed switch actually flips

Component	Standalone	Managed
Proxy listener	✅ bound	✅ bound
etcd provider + watch supervisor	✅	✅
Admin etcd client (write path)	✅	❌ skipped
Admin router (/admin/v1/*, UI, Playground)	✅ bound	❌ never constructed
Admin TCP listener	✅ bound	❌ never bound
/metrics (currently mounted on admin)	✅ served	❌ not served

The last row is worth calling out: Phase 1 mounts Prometheus on the admin listener, so managed mode loses it. Adding a dedicated observability listener is a follow-up; for aisix.cloud tenants, Prometheus scraping is expected to happen on the cloud control plane side anyway.

New helper

build_etcd_connect_options(&EtcdConfig) -> anyhow::Result<Option<ConnectOptions>>:

• Returns None for plain HTTP etcd (keeps the hot path cheap — no pointless ConnectOptions::new() allocation when nothing needs wiring).
• Reads the three PEM files and constructs TlsOptions::new().domain_name(...).ca_certificate(...).identity(...).
• Missing files surface with the config key name (etcd.tls.ca_cert_file = "/...") in the error so operators don't have to diff config against filesystem state.

default_domain_from_endpoint() extracts the SNI from URL-ish strings: http://, https://, bare host:port, and IPv6 literals [::1]:2379 — table-tested.

Tests

cargo test --workspace --all-features green (407 tests). New cases:

• aisix-core::config::tests::managed_mode_lets_admin_fields_be_omitted — minimum aisix.cloud tenant YAML loads cleanly.
• aisix-core::config::tests::standalone_still_requires_admin_keys_even_with_managed_false — original invariant preserved.
• aisix-core::config::tests::parses_etcd_tls_block — round-trip for all four TLS fields.
• aisix-server::tests::default_domain_strips_scheme_port_and_brackets — SNI extractor table.
• aisix-server::tests::build_connect_options_none_when_plain_http — hot path stays zero-cost.
• aisix-server::tests::build_connect_options_surfaces_missing_cert_files — operator-friendly error.

cargo fmt + cargo clippy --workspace --all-targets -- -D warnings clean.

Explicitly out of scope (follow-up PRs on this branch's successor stack)

• Registration flow: the DP currently expects the mTLS bundle already on disk. The next PR adds POST /dp/register client that exchanges a one-time Deployment Token for the bundle at boot and persists it atomically.
• Heartbeat: periodic POST /api/ai_dataplane/heartbeat so cp-api knows the DP is alive (and so the Gateway page in aisix.cloud shows green dots).
• Local config snapshot: continue serving proxy traffic when the etcd watch disconnects mid-flight (see aisix.cloud PRD prd-09 §9.7.2).
• Structured request logs + hashes: the observability schema aisix.cloud telemetry consumes.

Relationship

Paired with the aisix.cloud side in api7/AISIX-Cloud#8: that PR's GatewayHandlers.create calls IssueDataplaneCertificate on api7ee CP and returns the bundle to the user, who then drops it on their DP machine. The DP then boots with this PR's new config block pointing at those files.

[Copilot]

Pull request overview

Adds dataplane support for aisix.cloud tenants by introducing etcd mTLS client wiring and a managed-mode switch that disables the standalone admin surface.

Changes:

• Add etcd.tls config (CA/cert/key + optional domain_name) and build etcd-clientConnectOptions with mTLS.
• Add managed.enabled config and skip admin etcd client + admin router/listener when managed mode is on.
• Update example config and add tests for domain derivation, connect options behavior, and managed/standalone config validation.

Reviewed changes

Copilot reviewed 4 out of 4 changed files in this pull request and generated 4 comments.

File	Description
crates/aisix-server/src/main.rs	Build etcd ConnectOptions (mTLS/auth) and gate admin listener/router creation behind managed mode.
crates/aisix-core/src/lib.rs	Re-export new config types (EtcdTlsConfig, ManagedConfig).
crates/aisix-core/src/config.rs	Extend config schema with etcd.tls + managed, default admin for managed configs, and update validation rules.
config.example.yaml	Document new etcd.tls block and managed.enabled toggle.

---

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

[Copilot]

build_etcd_connect_options() only applies basic auth if bothetcd.user and etcd.password_env are set. If a user sets only one of these fields (common config mistake), it will silently skip auth and likely fail with an opaque etcd permission error. Prefer returning a config error (or add a Config::validate() check) when exactly one of the two is set.

Suggested change

	iflet(Some(user),Some(env_key)) = (etcd.user.as_ref(), etcd.password_env.as_ref()){
	let pw = std::env::var(env_key).map_err(|_| {
	anyhow::anyhow!("etcd.password_env = {env_key:?} is set but the env var is missing")
	})?;
	options = options.with_user(user.clone(), pw);
	needs_options = true;
	match(etcd.user.as_ref(), etcd.password_env.as_ref()){
	(Some(user),Some(env_key)) => {
	let pw = std::env::var(env_key).map_err(|_| {
	anyhow::anyhow!("etcd.password_env = {env_key:?} is set but the env var is missing")
	})?;
	options = options.with_user(user.clone(), pw);
	needs_options = true;
	}
	(None,None) => {}
	(Some(_),None) => {
	returnErr(anyhow::anyhow!(
	"etcd.user is set but etcd.password_env is missing; set both fields to enable etcd basic auth"
	));
	}
	(None,Some(_)) => {
	returnErr(anyhow::anyhow!(
	"etcd.password_env is set but etcd.user is missing; set both fields to enable etcd basic auth"
	));
	}

[Copilot]

EtcdConfig exposes dial_timeout_ms and request_timeout_ms, but build_etcd_connect_options() never uses them and there are no other call sites wiring these into etcd-client. This makes the timeout knobs in config.example.yaml ineffective. Consider setting the appropriate timeouts on ConnectOptions (and marking needs_options = true accordingly) so the config fields actually take effect.

Suggested change

	ifletSome(dial_timeout_ms) = etcd.dial_timeout_ms{
	options = options.with_connect_timeout(std::time::Duration::from_millis(dial_timeout_ms));
	needs_options = true;
	}
	ifletSome(request_timeout_ms) = etcd.request_timeout_ms{
	options = options.with_timeout(std::time::Duration::from_millis(request_timeout_ms));
	needs_options = true;
	}

[Copilot]

The doc comment says cert/key I/O failures “bubble up as a … BootstrapError”, but this helper returns anyhow::Result and the produced errors are anyhow::Error strings. Consider adjusting the wording to avoid implying a specific error type here.

Suggested change

	/// failure bubbles up as a nicely-contextualised BootstrapError at
	/// the same point as other etcd connection errors.
	/// failure bubbles up as a nicelycontextualised error at the same
	/// point as other etcd connection errors.

[Copilot]

AdminConfig::default_addr() sets 127.0.0.1:0, and Config::validate() only checks that admin.addr parses (in standalone mode). This allows a standalone config that omits admin.addr (but sets admin_keys) to bind the admin listener on an ephemeral port, which contradicts the comment and is operationally surprising. Consider either (a) defaulting to the previous explicit port, or (b) rejecting port 0 / the default value in validate() when managed.enabled is false with a clear error message.

Suggested change

	ifself.admin.addr.parse::<std::net::SocketAddr>().is_err(){
	returnErr(BootstrapError::Config(format!(
	"admin.addr invalid socket address: {}",
	self.admin.addr
	)));
	let admin_addr = self
	.admin
	.addr
	.parse::<std::net::SocketAddr>()
	.map_err(|_| {
	BootstrapError::Config(format!(
	"admin.addr invalid socket address: {}",
	self.admin.addr
	))
	})?;
	if admin_addr.port() == 0{
	returnErr(BootstrapError::Config(
	"admin.addr must use an explicit non-zero port \
	(required when managed.enabled is false)"
	.into(),
	));

[moonming]

Summary

Adds two closely-related DP-side capabilities required for AISIX to act as an aisix.cloud tenant:

1. etcd mTLS client — the aisix.cloud DP Manager serves etcd v3 over mTLS, so the DP needs to read a CA + client cert + client key from disk and wire them into the existing etcd-clientConnectOptions.
2. Managed-mode switch — when enabled, the admin API listener, admin UI, and Playground endpoint are not bound. All configuration flows from etcd; resource mutations happen through the cloud control plane.

This is the first of ~three DP-side PRs. Registration (fetching the mTLS bundle from cp-api at boot), heartbeat, and local snapshot fallback land in follow-ups.

Config shape

etcd:
endpoints: ["https://etcd.aisix.cloud:2379"]tls:
ca_cert_file: "/etc/aisix/mtls/ca.crt"client_cert_file: "/etc/aisix/mtls/client.crt"client_key_file: "/etc/aisix/mtls/client.key"# domain_name: "etcd.aisix.cloud" # optional; defaults to endpoints[0] hostproxy:
addr: "0.0.0.0:3000"managed:
enabled: true

Standalone users are unaffected: new fields are all optional and defaulted, validate() keeps the existing invariants when managed.enabled = false.

What the managed switch actually flips

Component	Standalone	Managed
Proxy listener	✅ bound	✅ bound
etcd provider + watch supervisor	✅	✅
Admin etcd client (write path)	✅	❌ skipped
Admin router (/admin/v1/*, UI, Playground)	✅ bound	❌ never constructed
Admin TCP listener	✅ bound	❌ never bound
/metrics (currently mounted on admin)	✅ served	❌ not served

The last row is worth calling out: Phase 1 mounts Prometheus on the admin listener, so managed mode loses it. Adding a dedicated observability listener is a follow-up; for aisix.cloud tenants, Prometheus scraping is expected to happen on the cloud control plane side anyway.

New helper

build_etcd_connect_options(&EtcdConfig) -> anyhow::Result<Option<ConnectOptions>>:

• Returns None for plain HTTP etcd (keeps the hot path cheap — no pointless ConnectOptions::new() allocation when nothing needs wiring).
• Reads the three PEM files and constructs TlsOptions::new().domain_name(...).ca_certificate(...).identity(...).
• Missing files surface with the config key name (etcd.tls.ca_cert_file = "/...") in the error so operators don't have to diff config against filesystem state.

default_domain_from_endpoint() extracts the SNI from URL-ish strings: http://, https://, bare host:port, and IPv6 literals [::1]:2379 — table-tested.

Tests

cargo test --workspace --all-features green (407 tests). New cases:

• aisix-core::config::tests::managed_mode_lets_admin_fields_be_omitted — minimum aisix.cloud tenant YAML loads cleanly.
• aisix-core::config::tests::standalone_still_requires_admin_keys_even_with_managed_false — original invariant preserved.
• aisix-core::config::tests::parses_etcd_tls_block — round-trip for all four TLS fields.
• aisix-server::tests::default_domain_strips_scheme_port_and_brackets — SNI extractor table.
• aisix-server::tests::build_connect_options_none_when_plain_http — hot path stays zero-cost.
• aisix-server::tests::build_connect_options_surfaces_missing_cert_files — operator-friendly error.

cargo fmt + cargo clippy --workspace --all-targets -- -D warnings clean.

Explicitly out of scope (follow-up PRs on this branch's successor stack)

• Registration flow: the DP currently expects the mTLS bundle already on disk. The next PR adds POST /dp/register client that exchanges a one-time Deployment Token for the bundle at boot and persists it atomically.
• Heartbeat: periodic POST /api/ai_dataplane/heartbeat so cp-api knows the DP is alive (and so the Gateway page in aisix.cloud shows green dots).
• Local config snapshot: continue serving proxy traffic when the etcd watch disconnects mid-flight (see aisix.cloud PRD prd-09 §9.7.2).
• Structured request logs + hashes: the observability schema aisix.cloud telemetry consumes.

Relationship

Paired with the aisix.cloud side in api7/AISIX-Cloud#8: that PR's GatewayHandlers.create calls IssueDataplaneCertificate on api7ee CP and returns the bundle to the user, who then drops it on their DP machine. The DP then boots with this PR's new config block pointing at those files.

[Copilot]

Pull request overview

Adds dataplane support for aisix.cloud tenants by introducing etcd mTLS client wiring and a managed-mode switch that disables the standalone admin surface.

Changes:

• Add etcd.tls config (CA/cert/key + optional domain_name) and build etcd-clientConnectOptions with mTLS.
• Add managed.enabled config and skip admin etcd client + admin router/listener when managed mode is on.
• Update example config and add tests for domain derivation, connect options behavior, and managed/standalone config validation.

Reviewed changes

Copilot reviewed 4 out of 4 changed files in this pull request and generated 4 comments.

File	Description
crates/aisix-server/src/main.rs	Build etcd ConnectOptions (mTLS/auth) and gate admin listener/router creation behind managed mode.
crates/aisix-core/src/lib.rs	Re-export new config types (EtcdTlsConfig, ManagedConfig).
crates/aisix-core/src/config.rs	Extend config schema with etcd.tls + managed, default admin for managed configs, and update validation rules.
config.example.yaml	Document new etcd.tls block and managed.enabled toggle.

---

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

[Copilot]

build_etcd_connect_options() only applies basic auth if bothetcd.user and etcd.password_env are set. If a user sets only one of these fields (common config mistake), it will silently skip auth and likely fail with an opaque etcd permission error. Prefer returning a config error (or add a Config::validate() check) when exactly one of the two is set.

Suggested change

	iflet(Some(user),Some(env_key)) = (etcd.user.as_ref(), etcd.password_env.as_ref()){
	let pw = std::env::var(env_key).map_err(|_| {
	anyhow::anyhow!("etcd.password_env = {env_key:?} is set but the env var is missing")
	})?;
	options = options.with_user(user.clone(), pw);
	needs_options = true;
	match(etcd.user.as_ref(), etcd.password_env.as_ref()){
	(Some(user),Some(env_key)) => {
	let pw = std::env::var(env_key).map_err(|_| {
	anyhow::anyhow!("etcd.password_env = {env_key:?} is set but the env var is missing")
	})?;
	options = options.with_user(user.clone(), pw);
	needs_options = true;
	}
	(None,None) => {}
	(Some(_),None) => {
	returnErr(anyhow::anyhow!(
	"etcd.user is set but etcd.password_env is missing; set both fields to enable etcd basic auth"
	));
	}
	(None,Some(_)) => {
	returnErr(anyhow::anyhow!(
	"etcd.password_env is set but etcd.user is missing; set both fields to enable etcd basic auth"
	));
	}

[Copilot]

EtcdConfig exposes dial_timeout_ms and request_timeout_ms, but build_etcd_connect_options() never uses them and there are no other call sites wiring these into etcd-client. This makes the timeout knobs in config.example.yaml ineffective. Consider setting the appropriate timeouts on ConnectOptions (and marking needs_options = true accordingly) so the config fields actually take effect.

Suggested change

	ifletSome(dial_timeout_ms) = etcd.dial_timeout_ms{
	options = options.with_connect_timeout(std::time::Duration::from_millis(dial_timeout_ms));
	needs_options = true;
	}
	ifletSome(request_timeout_ms) = etcd.request_timeout_ms{
	options = options.with_timeout(std::time::Duration::from_millis(request_timeout_ms));
	needs_options = true;
	}

[Copilot]

The doc comment says cert/key I/O failures “bubble up as a … BootstrapError”, but this helper returns anyhow::Result and the produced errors are anyhow::Error strings. Consider adjusting the wording to avoid implying a specific error type here.

Suggested change

	/// failure bubbles up as a nicely-contextualised BootstrapError at
	/// the same point as other etcd connection errors.
	/// failure bubbles up as a nicelycontextualised error at the same
	/// point as other etcd connection errors.

[Copilot]

AdminConfig::default_addr() sets 127.0.0.1:0, and Config::validate() only checks that admin.addr parses (in standalone mode). This allows a standalone config that omits admin.addr (but sets admin_keys) to bind the admin listener on an ephemeral port, which contradicts the comment and is operationally surprising. Consider either (a) defaulting to the previous explicit port, or (b) rejecting port 0 / the default value in validate() when managed.enabled is false with a clear error message.

Suggested change

	ifself.admin.addr.parse::<std::net::SocketAddr>().is_err(){
	returnErr(BootstrapError::Config(format!(
	"admin.addr invalid socket address: {}",
	self.admin.addr
	)));
	let admin_addr = self
	.admin
	.addr
	.parse::<std::net::SocketAddr>()
	.map_err(|_| {
	BootstrapError::Config(format!(
	"admin.addr invalid socket address: {}",
	self.admin.addr
	))
	})?;
	if admin_addr.port() == 0{
	returnErr(BootstrapError::Config(
	"admin.addr must use an explicit non-zero port \
	(required when managed.enabled is false)"
	.into(),
	));

[moonming]

Summary

Adds two closely-related DP-side capabilities required for AISIX to act as an aisix.cloud tenant:

1. etcd mTLS client — the aisix.cloud DP Manager serves etcd v3 over mTLS, so the DP needs to read a CA + client cert + client key from disk and wire them into the existing etcd-clientConnectOptions.
2. Managed-mode switch — when enabled, the admin API listener, admin UI, and Playground endpoint are not bound. All configuration flows from etcd; resource mutations happen through the cloud control plane.

This is the first of ~three DP-side PRs. Registration (fetching the mTLS bundle from cp-api at boot), heartbeat, and local snapshot fallback land in follow-ups.

Config shape

etcd:
endpoints: ["https://etcd.aisix.cloud:2379"]tls:
ca_cert_file: "/etc/aisix/mtls/ca.crt"client_cert_file: "/etc/aisix/mtls/client.crt"client_key_file: "/etc/aisix/mtls/client.key"# domain_name: "etcd.aisix.cloud" # optional; defaults to endpoints[0] hostproxy:
addr: "0.0.0.0:3000"managed:
enabled: true

Standalone users are unaffected: new fields are all optional and defaulted, validate() keeps the existing invariants when managed.enabled = false.

What the managed switch actually flips

Component	Standalone	Managed
Proxy listener	✅ bound	✅ bound
etcd provider + watch supervisor	✅	✅
Admin etcd client (write path)	✅	❌ skipped
Admin router (/admin/v1/*, UI, Playground)	✅ bound	❌ never constructed
Admin TCP listener	✅ bound	❌ never bound
/metrics (currently mounted on admin)	✅ served	❌ not served

The last row is worth calling out: Phase 1 mounts Prometheus on the admin listener, so managed mode loses it. Adding a dedicated observability listener is a follow-up; for aisix.cloud tenants, Prometheus scraping is expected to happen on the cloud control plane side anyway.

New helper

build_etcd_connect_options(&EtcdConfig) -> anyhow::Result<Option<ConnectOptions>>:

• Returns None for plain HTTP etcd (keeps the hot path cheap — no pointless ConnectOptions::new() allocation when nothing needs wiring).
• Reads the three PEM files and constructs TlsOptions::new().domain_name(...).ca_certificate(...).identity(...).
• Missing files surface with the config key name (etcd.tls.ca_cert_file = "/...") in the error so operators don't have to diff config against filesystem state.

default_domain_from_endpoint() extracts the SNI from URL-ish strings: http://, https://, bare host:port, and IPv6 literals [::1]:2379 — table-tested.

Tests

cargo test --workspace --all-features green (407 tests). New cases:

• aisix-core::config::tests::managed_mode_lets_admin_fields_be_omitted — minimum aisix.cloud tenant YAML loads cleanly.
• aisix-core::config::tests::standalone_still_requires_admin_keys_even_with_managed_false — original invariant preserved.
• aisix-core::config::tests::parses_etcd_tls_block — round-trip for all four TLS fields.
• aisix-server::tests::default_domain_strips_scheme_port_and_brackets — SNI extractor table.
• aisix-server::tests::build_connect_options_none_when_plain_http — hot path stays zero-cost.
• aisix-server::tests::build_connect_options_surfaces_missing_cert_files — operator-friendly error.

cargo fmt + cargo clippy --workspace --all-targets -- -D warnings clean.

Explicitly out of scope (follow-up PRs on this branch's successor stack)

• Registration flow: the DP currently expects the mTLS bundle already on disk. The next PR adds POST /dp/register client that exchanges a one-time Deployment Token for the bundle at boot and persists it atomically.
• Heartbeat: periodic POST /api/ai_dataplane/heartbeat so cp-api knows the DP is alive (and so the Gateway page in aisix.cloud shows green dots).
• Local config snapshot: continue serving proxy traffic when the etcd watch disconnects mid-flight (see aisix.cloud PRD prd-09 §9.7.2).
• Structured request logs + hashes: the observability schema aisix.cloud telemetry consumes.

Relationship

Paired with the aisix.cloud side in api7/AISIX-Cloud#8: that PR's GatewayHandlers.create calls IssueDataplaneCertificate on api7ee CP and returns the bundle to the user, who then drops it on their DP machine. The DP then boots with this PR's new config block pointing at those files.

[Copilot]

Pull request overview

Adds dataplane support for aisix.cloud tenants by introducing etcd mTLS client wiring and a managed-mode switch that disables the standalone admin surface.

Changes:

• Add etcd.tls config (CA/cert/key + optional domain_name) and build etcd-clientConnectOptions with mTLS.
• Add managed.enabled config and skip admin etcd client + admin router/listener when managed mode is on.
• Update example config and add tests for domain derivation, connect options behavior, and managed/standalone config validation.

Reviewed changes

Copilot reviewed 4 out of 4 changed files in this pull request and generated 4 comments.

File	Description
crates/aisix-server/src/main.rs	Build etcd ConnectOptions (mTLS/auth) and gate admin listener/router creation behind managed mode.
crates/aisix-core/src/lib.rs	Re-export new config types (EtcdTlsConfig, ManagedConfig).
crates/aisix-core/src/config.rs	Extend config schema with etcd.tls + managed, default admin for managed configs, and update validation rules.
config.example.yaml	Document new etcd.tls block and managed.enabled toggle.

---

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

[Copilot]

build_etcd_connect_options() only applies basic auth if bothetcd.user and etcd.password_env are set. If a user sets only one of these fields (common config mistake), it will silently skip auth and likely fail with an opaque etcd permission error. Prefer returning a config error (or add a Config::validate() check) when exactly one of the two is set.

Suggested change

	iflet(Some(user),Some(env_key)) = (etcd.user.as_ref(), etcd.password_env.as_ref()){
	let pw = std::env::var(env_key).map_err(|_| {
	anyhow::anyhow!("etcd.password_env = {env_key:?} is set but the env var is missing")
	})?;
	options = options.with_user(user.clone(), pw);
	needs_options = true;
	match(etcd.user.as_ref(), etcd.password_env.as_ref()){
	(Some(user),Some(env_key)) => {
	let pw = std::env::var(env_key).map_err(|_| {
	anyhow::anyhow!("etcd.password_env = {env_key:?} is set but the env var is missing")
	})?;
	options = options.with_user(user.clone(), pw);
	needs_options = true;
	}
	(None,None) => {}
	(Some(_),None) => {
	returnErr(anyhow::anyhow!(
	"etcd.user is set but etcd.password_env is missing; set both fields to enable etcd basic auth"
	));
	}
	(None,Some(_)) => {
	returnErr(anyhow::anyhow!(
	"etcd.password_env is set but etcd.user is missing; set both fields to enable etcd basic auth"
	));
	}

[Copilot]

EtcdConfig exposes dial_timeout_ms and request_timeout_ms, but build_etcd_connect_options() never uses them and there are no other call sites wiring these into etcd-client. This makes the timeout knobs in config.example.yaml ineffective. Consider setting the appropriate timeouts on ConnectOptions (and marking needs_options = true accordingly) so the config fields actually take effect.

Suggested change

	ifletSome(dial_timeout_ms) = etcd.dial_timeout_ms{
	options = options.with_connect_timeout(std::time::Duration::from_millis(dial_timeout_ms));
	needs_options = true;
	}
	ifletSome(request_timeout_ms) = etcd.request_timeout_ms{
	options = options.with_timeout(std::time::Duration::from_millis(request_timeout_ms));
	needs_options = true;
	}

[Copilot]

The doc comment says cert/key I/O failures “bubble up as a … BootstrapError”, but this helper returns anyhow::Result and the produced errors are anyhow::Error strings. Consider adjusting the wording to avoid implying a specific error type here.

Suggested change

	/// failure bubbles up as a nicely-contextualised BootstrapError at
	/// the same point as other etcd connection errors.
	/// failure bubbles up as a nicelycontextualised error at the same
	/// point as other etcd connection errors.

[Copilot]

AdminConfig::default_addr() sets 127.0.0.1:0, and Config::validate() only checks that admin.addr parses (in standalone mode). This allows a standalone config that omits admin.addr (but sets admin_keys) to bind the admin listener on an ephemeral port, which contradicts the comment and is operationally surprising. Consider either (a) defaulting to the previous explicit port, or (b) rejecting port 0 / the default value in validate() when managed.enabled is false with a clear error message.

Suggested change

	ifself.admin.addr.parse::<std::net::SocketAddr>().is_err(){
	returnErr(BootstrapError::Config(format!(
	"admin.addr invalid socket address: {}",
	self.admin.addr
	)));
	let admin_addr = self
	.admin
	.addr
	.parse::<std::net::SocketAddr>()
	.map_err(|_| {
	BootstrapError::Config(format!(
	"admin.addr invalid socket address: {}",
	self.admin.addr
	))
	})?;
	if admin_addr.port() == 0{
	returnErr(BootstrapError::Config(
	"admin.addr must use an explicit non-zero port \
	(required when managed.enabled is false)"
	.into(),
	));

[moonming]

Summary

Adds two closely-related DP-side capabilities required for AISIX to act as an aisix.cloud tenant:

1. etcd mTLS client — the aisix.cloud DP Manager serves etcd v3 over mTLS, so the DP needs to read a CA + client cert + client key from disk and wire them into the existing etcd-clientConnectOptions.
2. Managed-mode switch — when enabled, the admin API listener, admin UI, and Playground endpoint are not bound. All configuration flows from etcd; resource mutations happen through the cloud control plane.

This is the first of ~three DP-side PRs. Registration (fetching the mTLS bundle from cp-api at boot), heartbeat, and local snapshot fallback land in follow-ups.

Config shape

etcd:
endpoints: ["https://etcd.aisix.cloud:2379"]tls:
ca_cert_file: "/etc/aisix/mtls/ca.crt"client_cert_file: "/etc/aisix/mtls/client.crt"client_key_file: "/etc/aisix/mtls/client.key"# domain_name: "etcd.aisix.cloud" # optional; defaults to endpoints[0] hostproxy:
addr: "0.0.0.0:3000"managed:
enabled: true

Standalone users are unaffected: new fields are all optional and defaulted, validate() keeps the existing invariants when managed.enabled = false.

What the managed switch actually flips

Component	Standalone	Managed
Proxy listener	✅ bound	✅ bound
etcd provider + watch supervisor	✅	✅
Admin etcd client (write path)	✅	❌ skipped
Admin router (/admin/v1/*, UI, Playground)	✅ bound	❌ never constructed
Admin TCP listener	✅ bound	❌ never bound
/metrics (currently mounted on admin)	✅ served	❌ not served

The last row is worth calling out: Phase 1 mounts Prometheus on the admin listener, so managed mode loses it. Adding a dedicated observability listener is a follow-up; for aisix.cloud tenants, Prometheus scraping is expected to happen on the cloud control plane side anyway.

New helper

build_etcd_connect_options(&EtcdConfig) -> anyhow::Result<Option<ConnectOptions>>:

• Returns None for plain HTTP etcd (keeps the hot path cheap — no pointless ConnectOptions::new() allocation when nothing needs wiring).
• Reads the three PEM files and constructs TlsOptions::new().domain_name(...).ca_certificate(...).identity(...).
• Missing files surface with the config key name (etcd.tls.ca_cert_file = "/...") in the error so operators don't have to diff config against filesystem state.

default_domain_from_endpoint() extracts the SNI from URL-ish strings: http://, https://, bare host:port, and IPv6 literals [::1]:2379 — table-tested.

Tests

cargo test --workspace --all-features green (407 tests). New cases:

• aisix-core::config::tests::managed_mode_lets_admin_fields_be_omitted — minimum aisix.cloud tenant YAML loads cleanly.
• aisix-core::config::tests::standalone_still_requires_admin_keys_even_with_managed_false — original invariant preserved.
• aisix-core::config::tests::parses_etcd_tls_block — round-trip for all four TLS fields.
• aisix-server::tests::default_domain_strips_scheme_port_and_brackets — SNI extractor table.
• aisix-server::tests::build_connect_options_none_when_plain_http — hot path stays zero-cost.
• aisix-server::tests::build_connect_options_surfaces_missing_cert_files — operator-friendly error.

cargo fmt + cargo clippy --workspace --all-targets -- -D warnings clean.

Explicitly out of scope (follow-up PRs on this branch's successor stack)

• Registration flow: the DP currently expects the mTLS bundle already on disk. The next PR adds POST /dp/register client that exchanges a one-time Deployment Token for the bundle at boot and persists it atomically.
• Heartbeat: periodic POST /api/ai_dataplane/heartbeat so cp-api knows the DP is alive (and so the Gateway page in aisix.cloud shows green dots).
• Local config snapshot: continue serving proxy traffic when the etcd watch disconnects mid-flight (see aisix.cloud PRD prd-09 §9.7.2).
• Structured request logs + hashes: the observability schema aisix.cloud telemetry consumes.

Relationship

Paired with the aisix.cloud side in api7/AISIX-Cloud#8: that PR's GatewayHandlers.create calls IssueDataplaneCertificate on api7ee CP and returns the bundle to the user, who then drops it on their DP machine. The DP then boots with this PR's new config block pointing at those files.

[Copilot]

Pull request overview

Adds dataplane support for aisix.cloud tenants by introducing etcd mTLS client wiring and a managed-mode switch that disables the standalone admin surface.

Changes:

• Add etcd.tls config (CA/cert/key + optional domain_name) and build etcd-clientConnectOptions with mTLS.
• Add managed.enabled config and skip admin etcd client + admin router/listener when managed mode is on.
• Update example config and add tests for domain derivation, connect options behavior, and managed/standalone config validation.

Reviewed changes

Copilot reviewed 4 out of 4 changed files in this pull request and generated 4 comments.

File	Description
crates/aisix-server/src/main.rs	Build etcd ConnectOptions (mTLS/auth) and gate admin listener/router creation behind managed mode.
crates/aisix-core/src/lib.rs	Re-export new config types (EtcdTlsConfig, ManagedConfig).
crates/aisix-core/src/config.rs	Extend config schema with etcd.tls + managed, default admin for managed configs, and update validation rules.
config.example.yaml	Document new etcd.tls block and managed.enabled toggle.

---

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

[Copilot]

build_etcd_connect_options() only applies basic auth if bothetcd.user and etcd.password_env are set. If a user sets only one of these fields (common config mistake), it will silently skip auth and likely fail with an opaque etcd permission error. Prefer returning a config error (or add a Config::validate() check) when exactly one of the two is set.

Suggested change

	iflet(Some(user),Some(env_key)) = (etcd.user.as_ref(), etcd.password_env.as_ref()){
	let pw = std::env::var(env_key).map_err(|_| {
	anyhow::anyhow!("etcd.password_env = {env_key:?} is set but the env var is missing")
	})?;
	options = options.with_user(user.clone(), pw);
	needs_options = true;
	match(etcd.user.as_ref(), etcd.password_env.as_ref()){
	(Some(user),Some(env_key)) => {
	let pw = std::env::var(env_key).map_err(|_| {
	anyhow::anyhow!("etcd.password_env = {env_key:?} is set but the env var is missing")
	})?;
	options = options.with_user(user.clone(), pw);
	needs_options = true;
	}
	(None,None) => {}
	(Some(_),None) => {
	returnErr(anyhow::anyhow!(
	"etcd.user is set but etcd.password_env is missing; set both fields to enable etcd basic auth"
	));
	}
	(None,Some(_)) => {
	returnErr(anyhow::anyhow!(
	"etcd.password_env is set but etcd.user is missing; set both fields to enable etcd basic auth"
	));
	}

[Copilot]

EtcdConfig exposes dial_timeout_ms and request_timeout_ms, but build_etcd_connect_options() never uses them and there are no other call sites wiring these into etcd-client. This makes the timeout knobs in config.example.yaml ineffective. Consider setting the appropriate timeouts on ConnectOptions (and marking needs_options = true accordingly) so the config fields actually take effect.

Suggested change

	ifletSome(dial_timeout_ms) = etcd.dial_timeout_ms{
	options = options.with_connect_timeout(std::time::Duration::from_millis(dial_timeout_ms));
	needs_options = true;
	}
	ifletSome(request_timeout_ms) = etcd.request_timeout_ms{
	options = options.with_timeout(std::time::Duration::from_millis(request_timeout_ms));
	needs_options = true;
	}

[Copilot]

The doc comment says cert/key I/O failures “bubble up as a … BootstrapError”, but this helper returns anyhow::Result and the produced errors are anyhow::Error strings. Consider adjusting the wording to avoid implying a specific error type here.

Suggested change

	/// failure bubbles up as a nicely-contextualised BootstrapError at
	/// the same point as other etcd connection errors.
	/// failure bubbles up as a nicelycontextualised error at the same
	/// point as other etcd connection errors.

[Copilot]

AdminConfig::default_addr() sets 127.0.0.1:0, and Config::validate() only checks that admin.addr parses (in standalone mode). This allows a standalone config that omits admin.addr (but sets admin_keys) to bind the admin listener on an ephemeral port, which contradicts the comment and is operationally surprising. Consider either (a) defaulting to the previous explicit port, or (b) rejecting port 0 / the default value in validate() when managed.enabled is false with a clear error message.

Suggested change

	ifself.admin.addr.parse::<std::net::SocketAddr>().is_err(){
	returnErr(BootstrapError::Config(format!(
	"admin.addr invalid socket address: {}",
	self.admin.addr
	)));
	let admin_addr = self
	.admin
	.addr
	.parse::<std::net::SocketAddr>()
	.map_err(|_| {
	BootstrapError::Config(format!(
	"admin.addr invalid socket address: {}",
	self.admin.addr
	))
	})?;
	if admin_addr.port() == 0{
	returnErr(BootstrapError::Config(
	"admin.addr must use an explicit non-zero port \
	(required when managed.enabled is false)"
	.into(),
	));

[moonming]

Summary

Adds two closely-related DP-side capabilities required for AISIX to act as an aisix.cloud tenant:

1. etcd mTLS client — the aisix.cloud DP Manager serves etcd v3 over mTLS, so the DP needs to read a CA + client cert + client key from disk and wire them into the existing etcd-clientConnectOptions.
2. Managed-mode switch — when enabled, the admin API listener, admin UI, and Playground endpoint are not bound. All configuration flows from etcd; resource mutations happen through the cloud control plane.

This is the first of ~three DP-side PRs. Registration (fetching the mTLS bundle from cp-api at boot), heartbeat, and local snapshot fallback land in follow-ups.

Config shape

etcd:
endpoints: ["https://etcd.aisix.cloud:2379"]tls:
ca_cert_file: "/etc/aisix/mtls/ca.crt"client_cert_file: "/etc/aisix/mtls/client.crt"client_key_file: "/etc/aisix/mtls/client.key"# domain_name: "etcd.aisix.cloud" # optional; defaults to endpoints[0] hostproxy:
addr: "0.0.0.0:3000"managed:
enabled: true

Standalone users are unaffected: new fields are all optional and defaulted, validate() keeps the existing invariants when managed.enabled = false.

What the managed switch actually flips

Component	Standalone	Managed
Proxy listener	✅ bound	✅ bound
etcd provider + watch supervisor	✅	✅
Admin etcd client (write path)	✅	❌ skipped
Admin router (/admin/v1/*, UI, Playground)	✅ bound	❌ never constructed
Admin TCP listener	✅ bound	❌ never bound
/metrics (currently mounted on admin)	✅ served	❌ not served

The last row is worth calling out: Phase 1 mounts Prometheus on the admin listener, so managed mode loses it. Adding a dedicated observability listener is a follow-up; for aisix.cloud tenants, Prometheus scraping is expected to happen on the cloud control plane side anyway.

New helper

build_etcd_connect_options(&EtcdConfig) -> anyhow::Result<Option<ConnectOptions>>:

• Returns None for plain HTTP etcd (keeps the hot path cheap — no pointless ConnectOptions::new() allocation when nothing needs wiring).
• Reads the three PEM files and constructs TlsOptions::new().domain_name(...).ca_certificate(...).identity(...).
• Missing files surface with the config key name (etcd.tls.ca_cert_file = "/...") in the error so operators don't have to diff config against filesystem state.

default_domain_from_endpoint() extracts the SNI from URL-ish strings: http://, https://, bare host:port, and IPv6 literals [::1]:2379 — table-tested.

Tests

cargo test --workspace --all-features green (407 tests). New cases:

• aisix-core::config::tests::managed_mode_lets_admin_fields_be_omitted — minimum aisix.cloud tenant YAML loads cleanly.
• aisix-core::config::tests::standalone_still_requires_admin_keys_even_with_managed_false — original invariant preserved.
• aisix-core::config::tests::parses_etcd_tls_block — round-trip for all four TLS fields.
• aisix-server::tests::default_domain_strips_scheme_port_and_brackets — SNI extractor table.
• aisix-server::tests::build_connect_options_none_when_plain_http — hot path stays zero-cost.
• aisix-server::tests::build_connect_options_surfaces_missing_cert_files — operator-friendly error.

cargo fmt + cargo clippy --workspace --all-targets -- -D warnings clean.

Explicitly out of scope (follow-up PRs on this branch's successor stack)

• Registration flow: the DP currently expects the mTLS bundle already on disk. The next PR adds POST /dp/register client that exchanges a one-time Deployment Token for the bundle at boot and persists it atomically.
• Heartbeat: periodic POST /api/ai_dataplane/heartbeat so cp-api knows the DP is alive (and so the Gateway page in aisix.cloud shows green dots).
• Local config snapshot: continue serving proxy traffic when the etcd watch disconnects mid-flight (see aisix.cloud PRD prd-09 §9.7.2).
• Structured request logs + hashes: the observability schema aisix.cloud telemetry consumes.

Relationship

Paired with the aisix.cloud side in api7/AISIX-Cloud#8: that PR's GatewayHandlers.create calls IssueDataplaneCertificate on api7ee CP and returns the bundle to the user, who then drops it on their DP machine. The DP then boots with this PR's new config block pointing at those files.

[Copilot]

Pull request overview

Adds dataplane support for aisix.cloud tenants by introducing etcd mTLS client wiring and a managed-mode switch that disables the standalone admin surface.

Changes:

• Add etcd.tls config (CA/cert/key + optional domain_name) and build etcd-clientConnectOptions with mTLS.
• Add managed.enabled config and skip admin etcd client + admin router/listener when managed mode is on.
• Update example config and add tests for domain derivation, connect options behavior, and managed/standalone config validation.

Reviewed changes

Copilot reviewed 4 out of 4 changed files in this pull request and generated 4 comments.

File	Description
crates/aisix-server/src/main.rs	Build etcd ConnectOptions (mTLS/auth) and gate admin listener/router creation behind managed mode.
crates/aisix-core/src/lib.rs	Re-export new config types (EtcdTlsConfig, ManagedConfig).
crates/aisix-core/src/config.rs	Extend config schema with etcd.tls + managed, default admin for managed configs, and update validation rules.
config.example.yaml	Document new etcd.tls block and managed.enabled toggle.

---

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

[Copilot]

build_etcd_connect_options() only applies basic auth if bothetcd.user and etcd.password_env are set. If a user sets only one of these fields (common config mistake), it will silently skip auth and likely fail with an opaque etcd permission error. Prefer returning a config error (or add a Config::validate() check) when exactly one of the two is set.

Suggested change

	iflet(Some(user),Some(env_key)) = (etcd.user.as_ref(), etcd.password_env.as_ref()){
	let pw = std::env::var(env_key).map_err(|_| {
	anyhow::anyhow!("etcd.password_env = {env_key:?} is set but the env var is missing")
	})?;
	options = options.with_user(user.clone(), pw);
	needs_options = true;
	match(etcd.user.as_ref(), etcd.password_env.as_ref()){
	(Some(user),Some(env_key)) => {
	let pw = std::env::var(env_key).map_err(|_| {
	anyhow::anyhow!("etcd.password_env = {env_key:?} is set but the env var is missing")
	})?;
	options = options.with_user(user.clone(), pw);
	needs_options = true;
	}
	(None,None) => {}
	(Some(_),None) => {
	returnErr(anyhow::anyhow!(
	"etcd.user is set but etcd.password_env is missing; set both fields to enable etcd basic auth"
	));
	}
	(None,Some(_)) => {
	returnErr(anyhow::anyhow!(
	"etcd.password_env is set but etcd.user is missing; set both fields to enable etcd basic auth"
	));
	}

[Copilot]

EtcdConfig exposes dial_timeout_ms and request_timeout_ms, but build_etcd_connect_options() never uses them and there are no other call sites wiring these into etcd-client. This makes the timeout knobs in config.example.yaml ineffective. Consider setting the appropriate timeouts on ConnectOptions (and marking needs_options = true accordingly) so the config fields actually take effect.

Suggested change

	ifletSome(dial_timeout_ms) = etcd.dial_timeout_ms{
	options = options.with_connect_timeout(std::time::Duration::from_millis(dial_timeout_ms));
	needs_options = true;
	}
	ifletSome(request_timeout_ms) = etcd.request_timeout_ms{
	options = options.with_timeout(std::time::Duration::from_millis(request_timeout_ms));
	needs_options = true;
	}

[Copilot]

The doc comment says cert/key I/O failures “bubble up as a … BootstrapError”, but this helper returns anyhow::Result and the produced errors are anyhow::Error strings. Consider adjusting the wording to avoid implying a specific error type here.

Suggested change

	/// failure bubbles up as a nicely-contextualised BootstrapError at
	/// the same point as other etcd connection errors.
	/// failure bubbles up as a nicelycontextualised error at the same
	/// point as other etcd connection errors.

[Copilot]

AdminConfig::default_addr() sets 127.0.0.1:0, and Config::validate() only checks that admin.addr parses (in standalone mode). This allows a standalone config that omits admin.addr (but sets admin_keys) to bind the admin listener on an ephemeral port, which contradicts the comment and is operationally surprising. Consider either (a) defaulting to the previous explicit port, or (b) rejecting port 0 / the default value in validate() when managed.enabled is false with a clear error message.

Suggested change

	ifself.admin.addr.parse::<std::net::SocketAddr>().is_err(){
	returnErr(BootstrapError::Config(format!(
	"admin.addr invalid socket address: {}",
	self.admin.addr
	)));
	let admin_addr = self
	.admin
	.addr
	.parse::<std::net::SocketAddr>()
	.map_err(|_| {
	BootstrapError::Config(format!(
	"admin.addr invalid socket address: {}",
	self.admin.addr
	))
	})?;
	if admin_addr.port() == 0{
	returnErr(BootstrapError::Config(
	"admin.addr must use an explicit non-zero port \
	(required when managed.enabled is false)"
	.into(),
	));

[moonming]

Summary

Adds two closely-related DP-side capabilities required for AISIX to act as an aisix.cloud tenant:

1. etcd mTLS client — the aisix.cloud DP Manager serves etcd v3 over mTLS, so the DP needs to read a CA + client cert + client key from disk and wire them into the existing etcd-clientConnectOptions.
2. Managed-mode switch — when enabled, the admin API listener, admin UI, and Playground endpoint are not bound. All configuration flows from etcd; resource mutations happen through the cloud control plane.

This is the first of ~three DP-side PRs. Registration (fetching the mTLS bundle from cp-api at boot), heartbeat, and local snapshot fallback land in follow-ups.

Config shape

etcd:
endpoints: ["https://etcd.aisix.cloud:2379"]tls:
ca_cert_file: "/etc/aisix/mtls/ca.crt"client_cert_file: "/etc/aisix/mtls/client.crt"client_key_file: "/etc/aisix/mtls/client.key"# domain_name: "etcd.aisix.cloud" # optional; defaults to endpoints[0] hostproxy:
addr: "0.0.0.0:3000"managed:
enabled: true

Standalone users are unaffected: new fields are all optional and defaulted, validate() keeps the existing invariants when managed.enabled = false.

What the managed switch actually flips

Component	Standalone	Managed
Proxy listener	✅ bound	✅ bound
etcd provider + watch supervisor	✅	✅
Admin etcd client (write path)	✅	❌ skipped
Admin router (/admin/v1/*, UI, Playground)	✅ bound	❌ never constructed
Admin TCP listener	✅ bound	❌ never bound
/metrics (currently mounted on admin)	✅ served	❌ not served

The last row is worth calling out: Phase 1 mounts Prometheus on the admin listener, so managed mode loses it. Adding a dedicated observability listener is a follow-up; for aisix.cloud tenants, Prometheus scraping is expected to happen on the cloud control plane side anyway.

New helper

build_etcd_connect_options(&EtcdConfig) -> anyhow::Result<Option<ConnectOptions>>:

• Returns None for plain HTTP etcd (keeps the hot path cheap — no pointless ConnectOptions::new() allocation when nothing needs wiring).
• Reads the three PEM files and constructs TlsOptions::new().domain_name(...).ca_certificate(...).identity(...).
• Missing files surface with the config key name (etcd.tls.ca_cert_file = "/...") in the error so operators don't have to diff config against filesystem state.

default_domain_from_endpoint() extracts the SNI from URL-ish strings: http://, https://, bare host:port, and IPv6 literals [::1]:2379 — table-tested.

Tests

cargo test --workspace --all-features green (407 tests). New cases:

• aisix-core::config::tests::managed_mode_lets_admin_fields_be_omitted — minimum aisix.cloud tenant YAML loads cleanly.
• aisix-core::config::tests::standalone_still_requires_admin_keys_even_with_managed_false — original invariant preserved.
• aisix-core::config::tests::parses_etcd_tls_block — round-trip for all four TLS fields.
• aisix-server::tests::default_domain_strips_scheme_port_and_brackets — SNI extractor table.
• aisix-server::tests::build_connect_options_none_when_plain_http — hot path stays zero-cost.
• aisix-server::tests::build_connect_options_surfaces_missing_cert_files — operator-friendly error.

cargo fmt + cargo clippy --workspace --all-targets -- -D warnings clean.

Explicitly out of scope (follow-up PRs on this branch's successor stack)

• Registration flow: the DP currently expects the mTLS bundle already on disk. The next PR adds POST /dp/register client that exchanges a one-time Deployment Token for the bundle at boot and persists it atomically.
• Heartbeat: periodic POST /api/ai_dataplane/heartbeat so cp-api knows the DP is alive (and so the Gateway page in aisix.cloud shows green dots).
• Local config snapshot: continue serving proxy traffic when the etcd watch disconnects mid-flight (see aisix.cloud PRD prd-09 §9.7.2).
• Structured request logs + hashes: the observability schema aisix.cloud telemetry consumes.

Relationship

Paired with the aisix.cloud side in api7/AISIX-Cloud#8: that PR's GatewayHandlers.create calls IssueDataplaneCertificate on api7ee CP and returns the bundle to the user, who then drops it on their DP machine. The DP then boots with this PR's new config block pointing at those files.

[Copilot]

Pull request overview

Adds dataplane support for aisix.cloud tenants by introducing etcd mTLS client wiring and a managed-mode switch that disables the standalone admin surface.

Changes:

• Add etcd.tls config (CA/cert/key + optional domain_name) and build etcd-clientConnectOptions with mTLS.
• Add managed.enabled config and skip admin etcd client + admin router/listener when managed mode is on.
• Update example config and add tests for domain derivation, connect options behavior, and managed/standalone config validation.

Reviewed changes

Copilot reviewed 4 out of 4 changed files in this pull request and generated 4 comments.

File	Description
crates/aisix-server/src/main.rs	Build etcd ConnectOptions (mTLS/auth) and gate admin listener/router creation behind managed mode.
crates/aisix-core/src/lib.rs	Re-export new config types (EtcdTlsConfig, ManagedConfig).
crates/aisix-core/src/config.rs	Extend config schema with etcd.tls + managed, default admin for managed configs, and update validation rules.
config.example.yaml	Document new etcd.tls block and managed.enabled toggle.

---

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

[Copilot]

build_etcd_connect_options() only applies basic auth if bothetcd.user and etcd.password_env are set. If a user sets only one of these fields (common config mistake), it will silently skip auth and likely fail with an opaque etcd permission error. Prefer returning a config error (or add a Config::validate() check) when exactly one of the two is set.

Suggested change

	iflet(Some(user),Some(env_key)) = (etcd.user.as_ref(), etcd.password_env.as_ref()){
	let pw = std::env::var(env_key).map_err(|_| {
	anyhow::anyhow!("etcd.password_env = {env_key:?} is set but the env var is missing")
	})?;
	options = options.with_user(user.clone(), pw);
	needs_options = true;
	match(etcd.user.as_ref(), etcd.password_env.as_ref()){
	(Some(user),Some(env_key)) => {
	let pw = std::env::var(env_key).map_err(|_| {
	anyhow::anyhow!("etcd.password_env = {env_key:?} is set but the env var is missing")
	})?;
	options = options.with_user(user.clone(), pw);
	needs_options = true;
	}
	(None,None) => {}
	(Some(_),None) => {
	returnErr(anyhow::anyhow!(
	"etcd.user is set but etcd.password_env is missing; set both fields to enable etcd basic auth"
	));
	}
	(None,Some(_)) => {
	returnErr(anyhow::anyhow!(
	"etcd.password_env is set but etcd.user is missing; set both fields to enable etcd basic auth"
	));
	}

[Copilot]

EtcdConfig exposes dial_timeout_ms and request_timeout_ms, but build_etcd_connect_options() never uses them and there are no other call sites wiring these into etcd-client. This makes the timeout knobs in config.example.yaml ineffective. Consider setting the appropriate timeouts on ConnectOptions (and marking needs_options = true accordingly) so the config fields actually take effect.

Suggested change

	ifletSome(dial_timeout_ms) = etcd.dial_timeout_ms{
	options = options.with_connect_timeout(std::time::Duration::from_millis(dial_timeout_ms));
	needs_options = true;
	}
	ifletSome(request_timeout_ms) = etcd.request_timeout_ms{
	options = options.with_timeout(std::time::Duration::from_millis(request_timeout_ms));
	needs_options = true;
	}

[Copilot]

The doc comment says cert/key I/O failures “bubble up as a … BootstrapError”, but this helper returns anyhow::Result and the produced errors are anyhow::Error strings. Consider adjusting the wording to avoid implying a specific error type here.

Suggested change

	/// failure bubbles up as a nicely-contextualised BootstrapError at
	/// the same point as other etcd connection errors.
	/// failure bubbles up as a nicelycontextualised error at the same
	/// point as other etcd connection errors.

[Copilot]

AdminConfig::default_addr() sets 127.0.0.1:0, and Config::validate() only checks that admin.addr parses (in standalone mode). This allows a standalone config that omits admin.addr (but sets admin_keys) to bind the admin listener on an ephemeral port, which contradicts the comment and is operationally surprising. Consider either (a) defaulting to the previous explicit port, or (b) rejecting port 0 / the default value in validate() when managed.enabled is false with a clear error message.

Suggested change

	ifself.admin.addr.parse::<std::net::SocketAddr>().is_err(){
	returnErr(BootstrapError::Config(format!(
	"admin.addr invalid socket address: {}",
	self.admin.addr
	)));
	let admin_addr = self
	.admin
	.addr
	.parse::<std::net::SocketAddr>()
	.map_err(|_| {
	BootstrapError::Config(format!(
	"admin.addr invalid socket address: {}",
	self.admin.addr
	))
	})?;
	if admin_addr.port() == 0{
	returnErr(BootstrapError::Config(
	"admin.addr must use an explicit non-zero port \
	(required when managed.enabled is false)"
	.into(),
	));

[moonming]

Summary

Adds two closely-related DP-side capabilities required for AISIX to act as an aisix.cloud tenant:

1. etcd mTLS client — the aisix.cloud DP Manager serves etcd v3 over mTLS, so the DP needs to read a CA + client cert + client key from disk and wire them into the existing etcd-clientConnectOptions.
2. Managed-mode switch — when enabled, the admin API listener, admin UI, and Playground endpoint are not bound. All configuration flows from etcd; resource mutations happen through the cloud control plane.

This is the first of ~three DP-side PRs. Registration (fetching the mTLS bundle from cp-api at boot), heartbeat, and local snapshot fallback land in follow-ups.

Config shape

etcd:
endpoints: ["https://etcd.aisix.cloud:2379"]tls:
ca_cert_file: "/etc/aisix/mtls/ca.crt"client_cert_file: "/etc/aisix/mtls/client.crt"client_key_file: "/etc/aisix/mtls/client.key"# domain_name: "etcd.aisix.cloud" # optional; defaults to endpoints[0] hostproxy:
addr: "0.0.0.0:3000"managed:
enabled: true

Standalone users are unaffected: new fields are all optional and defaulted, validate() keeps the existing invariants when managed.enabled = false.

What the managed switch actually flips

Component	Standalone	Managed
Proxy listener	✅ bound	✅ bound
etcd provider + watch supervisor	✅	✅
Admin etcd client (write path)	✅	❌ skipped
Admin router (/admin/v1/*, UI, Playground)	✅ bound	❌ never constructed
Admin TCP listener	✅ bound	❌ never bound
/metrics (currently mounted on admin)	✅ served	❌ not served

The last row is worth calling out: Phase 1 mounts Prometheus on the admin listener, so managed mode loses it. Adding a dedicated observability listener is a follow-up; for aisix.cloud tenants, Prometheus scraping is expected to happen on the cloud control plane side anyway.

New helper

build_etcd_connect_options(&EtcdConfig) -> anyhow::Result<Option<ConnectOptions>>:

• Returns None for plain HTTP etcd (keeps the hot path cheap — no pointless ConnectOptions::new() allocation when nothing needs wiring).
• Reads the three PEM files and constructs TlsOptions::new().domain_name(...).ca_certificate(...).identity(...).
• Missing files surface with the config key name (etcd.tls.ca_cert_file = "/...") in the error so operators don't have to diff config against filesystem state.

default_domain_from_endpoint() extracts the SNI from URL-ish strings: http://, https://, bare host:port, and IPv6 literals [::1]:2379 — table-tested.

Tests

cargo test --workspace --all-features green (407 tests). New cases:

• aisix-core::config::tests::managed_mode_lets_admin_fields_be_omitted — minimum aisix.cloud tenant YAML loads cleanly.
• aisix-core::config::tests::standalone_still_requires_admin_keys_even_with_managed_false — original invariant preserved.
• aisix-core::config::tests::parses_etcd_tls_block — round-trip for all four TLS fields.
• aisix-server::tests::default_domain_strips_scheme_port_and_brackets — SNI extractor table.
• aisix-server::tests::build_connect_options_none_when_plain_http — hot path stays zero-cost.
• aisix-server::tests::build_connect_options_surfaces_missing_cert_files — operator-friendly error.

cargo fmt + cargo clippy --workspace --all-targets -- -D warnings clean.

Explicitly out of scope (follow-up PRs on this branch's successor stack)

• Registration flow: the DP currently expects the mTLS bundle already on disk. The next PR adds POST /dp/register client that exchanges a one-time Deployment Token for the bundle at boot and persists it atomically.
• Heartbeat: periodic POST /api/ai_dataplane/heartbeat so cp-api knows the DP is alive (and so the Gateway page in aisix.cloud shows green dots).
• Local config snapshot: continue serving proxy traffic when the etcd watch disconnects mid-flight (see aisix.cloud PRD prd-09 §9.7.2).
• Structured request logs + hashes: the observability schema aisix.cloud telemetry consumes.

Relationship

Paired with the aisix.cloud side in api7/AISIX-Cloud#8: that PR's GatewayHandlers.create calls IssueDataplaneCertificate on api7ee CP and returns the bundle to the user, who then drops it on their DP machine. The DP then boots with this PR's new config block pointing at those files.

[Copilot]

Pull request overview

Adds dataplane support for aisix.cloud tenants by introducing etcd mTLS client wiring and a managed-mode switch that disables the standalone admin surface.

Changes:

• Add etcd.tls config (CA/cert/key + optional domain_name) and build etcd-clientConnectOptions with mTLS.
• Add managed.enabled config and skip admin etcd client + admin router/listener when managed mode is on.
• Update example config and add tests for domain derivation, connect options behavior, and managed/standalone config validation.

Reviewed changes

Copilot reviewed 4 out of 4 changed files in this pull request and generated 4 comments.

File	Description
crates/aisix-server/src/main.rs	Build etcd ConnectOptions (mTLS/auth) and gate admin listener/router creation behind managed mode.
crates/aisix-core/src/lib.rs	Re-export new config types (EtcdTlsConfig, ManagedConfig).
crates/aisix-core/src/config.rs	Extend config schema with etcd.tls + managed, default admin for managed configs, and update validation rules.
config.example.yaml	Document new etcd.tls block and managed.enabled toggle.

---

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

[Copilot]

build_etcd_connect_options() only applies basic auth if bothetcd.user and etcd.password_env are set. If a user sets only one of these fields (common config mistake), it will silently skip auth and likely fail with an opaque etcd permission error. Prefer returning a config error (or add a Config::validate() check) when exactly one of the two is set.

Suggested change

	iflet(Some(user),Some(env_key)) = (etcd.user.as_ref(), etcd.password_env.as_ref()){
	let pw = std::env::var(env_key).map_err(|_| {
	anyhow::anyhow!("etcd.password_env = {env_key:?} is set but the env var is missing")
	})?;
	options = options.with_user(user.clone(), pw);
	needs_options = true;
	match(etcd.user.as_ref(), etcd.password_env.as_ref()){
	(Some(user),Some(env_key)) => {
	let pw = std::env::var(env_key).map_err(|_| {
	anyhow::anyhow!("etcd.password_env = {env_key:?} is set but the env var is missing")
	})?;
	options = options.with_user(user.clone(), pw);
	needs_options = true;
	}
	(None,None) => {}
	(Some(_),None) => {
	returnErr(anyhow::anyhow!(
	"etcd.user is set but etcd.password_env is missing; set both fields to enable etcd basic auth"
	));
	}
	(None,Some(_)) => {
	returnErr(anyhow::anyhow!(
	"etcd.password_env is set but etcd.user is missing; set both fields to enable etcd basic auth"
	));
	}

[Copilot]

EtcdConfig exposes dial_timeout_ms and request_timeout_ms, but build_etcd_connect_options() never uses them and there are no other call sites wiring these into etcd-client. This makes the timeout knobs in config.example.yaml ineffective. Consider setting the appropriate timeouts on ConnectOptions (and marking needs_options = true accordingly) so the config fields actually take effect.

Suggested change

	ifletSome(dial_timeout_ms) = etcd.dial_timeout_ms{
	options = options.with_connect_timeout(std::time::Duration::from_millis(dial_timeout_ms));
	needs_options = true;
	}
	ifletSome(request_timeout_ms) = etcd.request_timeout_ms{
	options = options.with_timeout(std::time::Duration::from_millis(request_timeout_ms));
	needs_options = true;
	}

[Copilot]

The doc comment says cert/key I/O failures “bubble up as a … BootstrapError”, but this helper returns anyhow::Result and the produced errors are anyhow::Error strings. Consider adjusting the wording to avoid implying a specific error type here.

Suggested change

	/// failure bubbles up as a nicely-contextualised BootstrapError at
	/// the same point as other etcd connection errors.
	/// failure bubbles up as a nicelycontextualised error at the same
	/// point as other etcd connection errors.

[Copilot]

AdminConfig::default_addr() sets 127.0.0.1:0, and Config::validate() only checks that admin.addr parses (in standalone mode). This allows a standalone config that omits admin.addr (but sets admin_keys) to bind the admin listener on an ephemeral port, which contradicts the comment and is operationally surprising. Consider either (a) defaulting to the previous explicit port, or (b) rejecting port 0 / the default value in validate() when managed.enabled is false with a clear error message.

Suggested change

	ifself.admin.addr.parse::<std::net::SocketAddr>().is_err(){
	returnErr(BootstrapError::Config(format!(
	"admin.addr invalid socket address: {}",
	self.admin.addr
	)));
	let admin_addr = self
	.admin
	.addr
	.parse::<std::net::SocketAddr>()
	.map_err(|_| {
	BootstrapError::Config(format!(
	"admin.addr invalid socket address: {}",
	self.admin.addr
	))
	})?;
	if admin_addr.port() == 0{
	returnErr(BootstrapError::Config(
	"admin.addr must use an explicit non-zero port \
	(required when managed.enabled is false)"
	.into(),
	));