chore: clean license message (databendlabs#14509)

src/common/license/Cargo.toml

@@ -16,3 +16,5 @@ databend-common-base = { path = "../base" }
 databend-common-exception = { path = "../exception" }
 jwt-simple = "0.11.0"
 serde = { workspace = true }
+strum = "0.24.1"
+strum_macros = "0.24.3"

src/common/license/src/license.rs

@@ -17,8 +17,11 @@ use std::fmt::Formatter;
 
 use serde::Deserialize;
 use serde::Serialize;
+use strum::IntoEnumIterator;
+use strum_macros::EnumIter;
 
 // All enterprise features are defined here.
+#[derive(Debug, PartialEq, EnumIter)]
 pub enum Feature {
     LicenseInfo,
     Vacuum,
@@ -77,3 +80,23 @@ pub struct LicenseInfo {
     pub tenants: Option<Vec<String>>,
     pub features: Option<Vec<String>>,
 }
+
+impl LicenseInfo {
+    pub fn display_features(&self) -> String {
+        // sort all features in alphabet order and ignore test feature
+        let mut binding = self.features.clone().unwrap_or_default();
+        if binding.is_empty() {
+            binding = Feature::iter().map(|f| f.to_string()).collect::<Vec<_>>();
+        }
+        let mut features = binding
+            .iter()
+            .filter(|f| *f != &Feature::Test.to_string())
+            .collect::<Vec<_>>();
+        features.sort();
+        features
+            .iter()
+            .map(|f| f.to_string())
+            .collect::<Vec<_>>()
+            .join(",")
+    }
+}

src/query/ee/src/license/license_mgr.rs

@@ -131,8 +131,9 @@ impl RealLicenseManager {
         let features = l.custom.features.as_ref().unwrap();
         if !features.contains(&feature.to_string()) {
             return Err(ErrorCode::LicenseKeyInvalid(format!(
-                "license key does not support feature {}, supported features: {:?}",
-                feature, features
+                "license key does not support feature {}, supported features: {}",
+                feature,
+                l.custom.display_features()
             )));
         }
         Ok(())

src/query/service/src/table_functions/others/license_info.rs

@@ -69,6 +69,7 @@ impl LicenseInfoTable {
             TableField::new("expire_at", TableDataType::Timestamp),
             // formatted string calculate the available time from now to expiry of license
             TableField::new("available_time_until_expiry", TableDataType::String),
+            TableField::new("features", TableDataType::String),
         ])
     }
 
@@ -156,6 +157,8 @@ impl LicenseInfoSource {
         let available_time = info.expires_at.unwrap_or_default().sub(now).as_micros();
         let human_readable_available_time =
             HumanDuration::from(Duration::from_micros(available_time)).to_string();
+
+        let feature_str = info.custom.display_features();
         Ok(DataBlock::new(
             vec![
                 BlockEntry::new(
@@ -192,6 +195,7 @@ impl LicenseInfoSource {
                     DataType::String,
                     Value::Scalar(Scalar::String(human_readable_available_time)),
                 ),
+                BlockEntry::new(DataType::String, Value::Scalar(Scalar::String(feature_str))),
             ],
             1,
         ))

tests/suites/5_ee/00_check/00_0014_license_info.py

@@ -48,15 +48,16 @@ def get_license():
         organization = license[0][2]
         issue_at = license[0][3]
         expire_at = license[0][4]
+        features = license[0][6]
         now = datetime.utcnow()
 
         if now < issue_at or now > expire_at:
             print(
                 f"License is invalid: issuer: {issuer}, type: {type_}, "
-                f"org: {organization}, issue_at: {issue_at}, expire_at: {expire_at}"
+                f"org: {organization}, issue_at: {issue_at}, expire_at: {expire_at}, features: {features}"
             )
             sys.exit(1)
-
+        print(features)
         mycursor = mydb.cursor()
         mycursor.execute(
             "select count(*) from system.processes where type = 'FlightSQL';"

tests/suites/5_ee/00_check/00_0014_license_info.result

@@ -1,2 +1,3 @@
 []
+aggregate_index,background_service,computed_column,data_mask,license_info,storage_encryption,stream,vacuum,virtual_column
 [(0,)]