use license key in opt

Signed-off-by: Bugen Zhao <[email protected]>
risingwavelabs · Aug 6, 2024 · 5045523 · 5045523
1 parent ddf3a19
commit 5045523
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git 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
@@ -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>,