From 27f3c263a06dd43ca164860f646192e353f3c26b Mon Sep 17 00:00:00 2001 From: Kurdakov Alexander <kusancho12@gmail.com> Date: Mon, 3 Feb 2025 18:11:59 +0300 Subject: [PATCH] fix: remove plugin_dir from output of `picodata config default` Since it's deprecated option, it should not appear anywhere except of explicit user intention. --- src/config.rs | 1 + test/int/test_config_file.py | 1 + 2 files changed, 2 insertions(+) diff --git a/src/config.rs b/src/config.rs index 7d72df4634..4d634b84ed 100644 --- a/src/config.rs +++ b/src/config.rs @@ -1143,6 +1143,7 @@ pub struct InstanceConfig { pub admin_socket: Option<PathBuf>, #[deprecated = "use share_dir instead"] + #[serde(skip_serializing_if = "Option::is_none")] pub plugin_dir: Option<PathBuf>, #[introspection(config_default = "/usr/share/picodata/")] diff --git a/test/int/test_config_file.py b/test/int/test_config_file.py index 04fff49557..980413f250 100644 --- a/test/int/test_config_file.py +++ b/test/int/test_config_file.py @@ -400,6 +400,7 @@ def test_picodata_default_config(cluster: Cluster): default_config_dict = yaml.safe_load(default_config) assert "listen" not in default_config_dict["instance"] assert "advertise" not in default_config_dict["instance"] + assert "plugin_dir" not in default_config_dict["instance"] # Explicit filename subprocess.call( -- GitLab