Skip to content

feat(etcd): support TLS via OpenSSL #49

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bzp2010 merged 21 commits into from
Apr 20, 2026
Merged

feat(etcd): support TLS via OpenSSL #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
7b2c171
feat(etcd): support TLS via OpenSSL
AlinsRan Apr 20, 2026
6dbc75c
fix(etcd): update Cargo.lock for tls-openssl feature and add unit tests
AlinsRan Apr 20, 2026
9638eb3
fix(etcd): address code review feedback
AlinsRan Apr 20, 2026
f40d024
fix(etcd): use pretty_assertions and assert_matches in tests
AlinsRan Apr 20, 2026
f590cb3
update etcd
AlinsRan Apr 20, 2026
feb9b03
refactor(etcd): simplify TLS config to file-only with insecure_skip_v…
AlinsRan Apr 20, 2026
73b5805
fix(etcd): validate cert/key pair before file I/O, redact Debug outpu…
AlinsRan Apr 20, 2026
f137ea5
feat(etcd): support inline PEM strings alongside file-based TLS config
AlinsRan Apr 20, 2026
7cf830d
refactor(etcd): extract config validation, add typed errors, fix Debu…
AlinsRan Apr 20, 2026
d382915
refactor(etcd): remove inline PEM fields, keep file-path-only TLS config
AlinsRan Apr 20, 2026
a91ee15
refactor(etcd): introduce EtcdTlsCertConfig enum for inline PEM and f…
AlinsRan Apr 20, 2026
aa6b536
Update config.yaml
AlinsRan Apr 20, 2026
8eebec1
Apply suggestion from @bzp2010
AlinsRan Apr 20, 2026
c6fb64a
Update src/config/etcd.rs
AlinsRan Apr 20, 2026
369e97a
refactor(etcd): simplify TLS config serde and move validation to new()
AlinsRan Apr 20, 2026
a6b121a
revert(etcd): restore EtcdTlsCertConfig struct variants and EtcdTlsCo…
AlinsRan Apr 20, 2026
829d0f7
Merge branch 'main' into feat/etcd-tls-openssl
AlinsRan Apr 20, 2026
fb69117
refactor(etcd): replace EtcdTlsConfigRaw with serde native flatten/un…
AlinsRan Apr 20, 2026
2cd76e2
Update src/config/etcd.rs
bzp2010 Apr 20, 2026
81a5ef5
Apply suggestion from @bzp2010
bzp2010 Apr 20, 2026
e1cc62b
Apply suggestion from @bzp2010
bzp2010 Apr 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 38 additions & 0 deletions Cargo.lock
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ axum = { version = "0.8.9", features = [
], default-features = false }
serde = "1.0.228"
serde_json = "1.0"
etcd-client = "0.18.0"
etcd-client = { version = "0.18.0", features = ["tls-openssl"] }
async-trait = "0.1"
futures = "0.3"
bytes = "1.0"
Expand Down
5 changes: 5 additions & 0 deletions config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@ deployment:
- "http://127.0.0.1:2379"
prefix: /aisix
timeout: 30
tls:
ca_file: ca.pem
cert_file: cert.pem
key_file: key.pem
insecure_skip_verify: false
admin:
admin_key:
- key: admin
Expand Down
Loading
Loading