From 5045523dd1c6b0fe69d199678928ada75ad17eae Mon Sep 17 00:00:00 2001
From: Bugen Zhao <i@bugenzhao.com>
Date: Tue, 6 Aug 2024 15:58:57 +0800
Subject: [PATCH] use license key in opt

Signed-off-by: Bugen Zhao <i@bugenzhao.com>
---
 src/frontend/src/handler/variable.rs | 1 -
 src/meta/node/src/lib.rs             | 6 +++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/frontend/src/handler/variable.rs b/src/frontend/src/handler/variable.rs
index 506647ad65e33..96fd232215ccd 100644
--- a/src/frontend/src/handler/variable.rs
+++ b/src/frontend/src/handler/variable.rs
@@ -152,7 +152,6 @@ async fn handle_show_system_params(handler_args: HandlerArgs) -> Result<RwPgResp
         .meta_client()
         .get_system_params()
         .await?;
-    // TODO: for secret params (like `license_key`), redact the value in the response.
     let rows = params
         .get_all()
         .into_iter()
diff --git a/src/meta/node/src/lib.rs b/src/meta/node/src/lib.rs
index b2e0ba3fecc0c..825d40b5172d9 100644
--- a/src/meta/node/src/lib.rs
+++ b/src/meta/node/src/lib.rs
@@ -25,6 +25,7 @@ use educe::Educe;
 pub use error::{MetaError, MetaResult};
 use redact::Secret;
 use risingwave_common::config::OverrideConfig;
+use risingwave_common::license::LicenseKey;
 use risingwave_common::util::meta_addr::MetaAddressStrategy;
 use risingwave_common::util::resource_util;
 use risingwave_common::util::tokio_util::sync::CancellationToken;
@@ -188,13 +189,12 @@ pub struct MetaNodeOpts {
     pub connector_rpc_endpoint: Option<String>,
 
     /// The license key to activate enterprise features.
-    #[educe(Debug(ignore))]
     #[clap(long, hide = true, env = "RW_LICENSE_KEY")]
     #[override_opts(path = system.license_key)]
-    pub license_key: Option<String>,
+    pub license_key: Option<LicenseKey>,
 
     /// 128-bit AES key for secret store in HEX format.
-    #[educe(Debug(ignore))]
+    #[educe(Debug(ignore))] // TODO: use newtype to redact debug impl
     #[clap(long, hide = true, env = "RW_SECRET_STORE_PRIVATE_KEY_HEX")]
     pub secret_store_private_key_hex: Option<String>,