Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(engine): allow null init_config for plugin info #3372

Merged
merged 2 commits into from
Oct 8, 2024
Merged

fix(engine): allow null init_config for plugin info #3372

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
07aec7e
fix(engine): allow null init_config for plugin info
LucaGuerra Oct 8, 2024
d7261b0
update(tests): add tests for plugin init_config
LucaGuerra Oct 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 30 additions & 0 deletions unit_tests/falco/test_configuration_schema.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ limitations under the License.
#include <gtest/gtest.h>
#include <falco/configuration.h>
#include <falco_test_var.h>
#include <nlohmann/json.hpp>

#define EXPECT_VALIDATION_STATUS(res, status) \
do { \
Expand Down Expand Up @@ -102,8 +103,13 @@ TEST(Configuration, plugin_init_config) {
sslCertificate: /etc/falco/falco.pem
)";

auto plugin_config_json = nlohmann::json::parse(
R"({"maxEventSize": 262144, "sslCertificate": "/etc/falco/falco.pem"})");

EXPECT_NO_THROW(res = falco_config.init_from_content(config, {}));
EXPECT_VALIDATION_STATUS(res, yaml_helper::validation_ok);
auto parsed_init_config = nlohmann::json::parse(falco_config.m_plugins[0].m_init_config);
EXPECT_EQ(parsed_init_config, plugin_config_json);

config = R"(
plugins:
Expand All @@ -114,6 +120,30 @@ TEST(Configuration, plugin_init_config) {

EXPECT_NO_THROW(res = falco_config.init_from_content(config, {}));
EXPECT_VALIDATION_STATUS(res, yaml_helper::validation_ok);
parsed_init_config = nlohmann::json::parse(falco_config.m_plugins[0].m_init_config);
EXPECT_EQ(parsed_init_config, plugin_config_json);

config = R"(
plugins:
- name: k8saudit
library_path: libk8saudit.so
init_config: ""
)";

EXPECT_NO_THROW(res = falco_config.init_from_content(config, {}));
EXPECT_VALIDATION_STATUS(res, yaml_helper::validation_ok);
EXPECT_EQ(falco_config.m_plugins[0].m_init_config, "");

config = R"(
plugins:
- name: k8saudit
library_path: libk8saudit.so
init_config: null
)";

EXPECT_NO_THROW(res = falco_config.init_from_content(config, {}));
EXPECT_VALIDATION_STATUS(res, yaml_helper::validation_ok);
EXPECT_EQ(falco_config.m_plugins[0].m_init_config, "");
}

TEST(Configuration, schema_yaml_helper_validator) {
Expand Down
3 changes: 3 additions & 0 deletions userspace/falco/config_json_schema.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -596,6 +596,9 @@ const char config_schema_string[] = LONG_STRING_CONST(
},
{
"type": "string"
},
{
"type": "null"
}
]
},
Expand Down
Loading