Replaces yaml cpp with libyaml in SCA module #840
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
aritosteles
force-pushed
the
enhancement/30599-replace-yaml-cpp-with-libyaml
branch
from
7d01940 to
e828afd
Compare
jr0me
reviewed
Jul 7, 2025
| try | ||
| { | ||
| if (!IsValidYamlFile(filename.string())) | ||
| std::cout << "*** PolicyParser(" << filename.c_str() << ")\n"; |
| { | ||
| std::vector<std::string> values; | ||
| for (const auto& item : yamlNode) | ||
| auto items = yamlNode.AsSequence(); |
| if (root.HasKey("variables")) | ||
| { | ||
| for (const auto& var : variables) | ||
| auto variablesNode = root["variables"]; |
| { | ||
| std::vector<std::string> values; | ||
| for (const auto& item : yamlNode) | ||
| auto items = yamlNode.AsSequence(); |
| try | ||
| { | ||
| if (!IsValidYamlFile(filename.string())) | ||
| std::cout << "*** PolicyParser(" << filename.c_str() << ")\n"; |
There was a problem hiding this comment.
Those were in a separate commit ready to be removed, done
| return nullptr; | ||
| } | ||
|
|
||
| std::cout << "*** Policy parsed successfully\n"; |
There was a problem hiding this comment.
There a few more couts, can we remove them?
| #include <filesystem> | ||
| #include <string> | ||
|
|
||
| class YamlNode; |
There was a problem hiding this comment.
Is this forward declaration needed?
There was a problem hiding this comment.
No, it isn´t. Removed.
Comment on lines
21
to
23
| YamlDocument() | ||
| : m_loaded(false) {}; |
There was a problem hiding this comment.
Can we move this to the source file?
Comment on lines
33
to
37
| bool IsValidDocument() const | ||
| { | ||
| return m_loaded; | ||
| } |
There was a problem hiding this comment.
Can we move this to the source file?
Comment on lines
31
to
52
| YamlNode() = default; | ||
|
|
||
| /// @brief Gets the type of the YAML node | ||
| /// @return Type of the node | ||
| Type GetNodeType() const | ||
| { | ||
| return m_type; | ||
| } | ||
|
|
||
| /// @brief Gets the type of the YAML node as a string | ||
| /// @return String representation of the node type | ||
| std::string GetNodeTypeAsString() const | ||
| { | ||
| switch (m_type) | ||
| { | ||
| case Type::Scalar: return "Scalar"; | ||
| case Type::Sequence: return "Sequence"; | ||
| case Type::Mapping: return "Mapping"; | ||
| case Type::Undefined: // fallthrough | ||
| default: return "Undefined"; | ||
| } | ||
| } | ||
|
|
||
| /// @brief Checks if the YAML node is a scalar | ||
| /// @return True if the node is a scalar, false otherwise | ||
| bool IsScalar() const | ||
| { | ||
| return m_type == Type::Scalar; | ||
| } | ||
|
|
||
| /// @brief Checks if the YAML node is a sequence | ||
| /// @return True if the node is a sequence, false otherwise | ||
| bool IsSequence() const | ||
| { | ||
| return m_type == Type::Sequence; | ||
| } | ||
|
|
||
| /// @brief Checks if the YAML node is a map | ||
| /// @return True if the node is a map, false otherwise | ||
| bool IsMap() const | ||
| { | ||
| return m_type == Type::Mapping; | ||
| } | ||
|
|
aritosteles
force-pushed
the
enhancement/30599-replace-yaml-cpp-with-libyaml
branch
4 times, most recently
from
03e6414 to
a703eff
Compare
aritosteles
force-pushed
the
enhancement/30599-replace-yaml-cpp-with-libyaml
branch
2 times, most recently
from
25c0516 to
86a66d4
Compare
aritosteles
force-pushed
the
enhancement/30599-replace-yaml-cpp-with-libyaml
branch
from
86a66d4 to
bf23261
Compare
aritosteles
force-pushed
the
enhancement/30599-replace-yaml-cpp-with-libyaml
branch
from
b59153b to
6838ef0
Compare
jr0me
approved these changes
Jul 8, 2025
jr0me
merged commit 7e8df06
into
enhancement/30270-migrate-sca-6x-code-to-5x-and-compile
0 of 7 checks passed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
To port SCA from 6.x to 5.x we need to replace the YAML parsing library used so we avoid adding new external dependencies to 5.x. This replacement needs only to be done for the 5.x migration.
Results and Evidence
YAML Document is loaded and policy parsed successfully:
Tests pass:
YamlDocument and YamlNode tests:
PolicyParser tests are mostly the same as existed in 6.x except for a couple that became irrelevant.
PolicyParserTest:
Full set of agent tests: