mirror of
https://github.com/GreptimeTeam/greptimedb.git
synced 2026-05-17 05:20:37 +00:00
chore: add tls-watch option in cmd (#7226)
* chore: add tls-watch cmd option * chore: add watch tls option to standalone and fe cmd * chore: fix clippy Signed-off-by: shuiyisong <xixing.sys@gmail.com> * chore: address CR comment Co-authored-by: Yingwen <realevenyag@gmail.com> * chore: address CR issue Signed-off-by: shuiyisong <xixing.sys@gmail.com> --------- Signed-off-by: shuiyisong <xixing.sys@gmail.com> Co-authored-by: Yingwen <realevenyag@gmail.com>
This commit is contained in:
@@ -177,6 +177,8 @@ pub struct StartCommand {
|
||||
#[clap(long)]
|
||||
tls_key_path: Option<String>,
|
||||
#[clap(long)]
|
||||
tls_watch: bool,
|
||||
#[clap(long)]
|
||||
user_provider: Option<String>,
|
||||
#[clap(long)]
|
||||
disable_dashboard: Option<bool>,
|
||||
@@ -230,6 +232,7 @@ impl StartCommand {
|
||||
self.tls_mode.clone(),
|
||||
self.tls_cert_path.clone(),
|
||||
self.tls_key_path.clone(),
|
||||
self.tls_watch,
|
||||
);
|
||||
|
||||
if let Some(addr) = &self.http_addr {
|
||||
|
||||
@@ -228,6 +228,8 @@ pub struct StartCommand {
|
||||
#[clap(long)]
|
||||
tls_key_path: Option<String>,
|
||||
#[clap(long)]
|
||||
tls_watch: bool,
|
||||
#[clap(long)]
|
||||
user_provider: Option<String>,
|
||||
#[clap(long, default_value = "GREPTIMEDB_STANDALONE")]
|
||||
pub env_prefix: String,
|
||||
@@ -277,6 +279,7 @@ impl StartCommand {
|
||||
self.tls_mode.clone(),
|
||||
self.tls_cert_path.clone(),
|
||||
self.tls_key_path.clone(),
|
||||
self.tls_watch,
|
||||
);
|
||||
|
||||
if let Some(addr) = &self.http_addr {
|
||||
@@ -769,6 +772,9 @@ mod tests {
|
||||
fn test_load_log_options_from_cli() {
|
||||
let cmd = StartCommand {
|
||||
user_provider: Some("static_user_provider:cmd:test=test".to_string()),
|
||||
mysql_addr: Some("127.0.0.1:4002".to_string()),
|
||||
postgres_addr: Some("127.0.0.1:4003".to_string()),
|
||||
tls_watch: true,
|
||||
..Default::default()
|
||||
};
|
||||
|
||||
@@ -785,6 +791,8 @@ mod tests {
|
||||
|
||||
assert_eq!("./greptimedb_data/test/logs", opts.logging.dir);
|
||||
assert_eq!("debug", opts.logging.level.unwrap());
|
||||
assert!(opts.mysql.tls.watch);
|
||||
assert!(opts.postgres.tls.watch);
|
||||
}
|
||||
|
||||
#[test]
|
||||
|
||||
@@ -68,7 +68,12 @@ pub struct TlsOption {
|
||||
}
|
||||
|
||||
impl TlsOption {
|
||||
pub fn new(mode: Option<TlsMode>, cert_path: Option<String>, key_path: Option<String>) -> Self {
|
||||
pub fn new(
|
||||
mode: Option<TlsMode>,
|
||||
cert_path: Option<String>,
|
||||
key_path: Option<String>,
|
||||
watch: bool,
|
||||
) -> Self {
|
||||
let mut tls_option = TlsOption::default();
|
||||
|
||||
if let Some(mode) = mode {
|
||||
@@ -83,6 +88,8 @@ impl TlsOption {
|
||||
tls_option.key_path = key_path
|
||||
};
|
||||
|
||||
tls_option.watch = watch;
|
||||
|
||||
tls_option
|
||||
}
|
||||
|
||||
@@ -242,13 +249,16 @@ mod tests {
|
||||
|
||||
#[test]
|
||||
fn test_new_tls_option() {
|
||||
assert_eq!(TlsOption::default(), TlsOption::new(None, None, None));
|
||||
assert_eq!(
|
||||
TlsOption::default(),
|
||||
TlsOption::new(None, None, None, false)
|
||||
);
|
||||
assert_eq!(
|
||||
TlsOption {
|
||||
mode: Disable,
|
||||
..Default::default()
|
||||
},
|
||||
TlsOption::new(Some(Disable), None, None)
|
||||
TlsOption::new(Some(Disable), None, None, false)
|
||||
);
|
||||
assert_eq!(
|
||||
TlsOption {
|
||||
@@ -261,7 +271,8 @@ mod tests {
|
||||
TlsOption::new(
|
||||
Some(Disable),
|
||||
Some("/path/to/cert_path".to_string()),
|
||||
Some("/path/to/key_path".to_string())
|
||||
Some("/path/to/key_path".to_string()),
|
||||
false
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
@@ -953,6 +953,7 @@ pub async fn test_grpc_tls_config(store_type: StorageType) {
|
||||
Some(TlsMode::Require),
|
||||
Some(server_cert_path),
|
||||
Some(server_key_path),
|
||||
false,
|
||||
);
|
||||
let config = GrpcServerConfig {
|
||||
max_recv_message_size: 1024,
|
||||
|
||||
Reference in New Issue
Block a user