MINIFICPP-2787 Do not encrypt empty properties and parameters#2217
Open
fgerlits wants to merge 2 commits into
Open
MINIFICPP-2787 Do not encrypt empty properties and parameters#2217fgerlits wants to merge 2 commits into
fgerlits wants to merge 2 commits into
Conversation
This also fixes a bug: if a sensitive value was set as sensitive_property: instead of sensitive_property: "" in a YAML flow configuration, then the value was null instead of an empty string, and it got expanded to the string "null", and then encrypted.
fgerlits
force-pushed
the
MINIFICPP-2787_Do-not-encrypt-empty-properties
branch
from
July 24, 2026 13:19
124e95a to
8242544
Compare
szaszm
reviewed
Jul 24, 2026
Comment on lines
+65
to
+71
| if (!expected) { | ||
| return "error: " + Catch::Detail::stringify(expected.error()); | ||
| } | ||
| if constexpr (!std::is_void_v<T>) { | ||
| return Catch::Detail::stringify(*expected); | ||
| } | ||
| return "OK"; |
Member
There was a problem hiding this comment.
I would represent expected alternatives like this. What do you think?
Suggested change
| if (!expected) { | |
| return "error: " + Catch::Detail::stringify(expected.error()); | |
| } | |
| if constexpr (!std::is_void_v<T>) { | |
| return Catch::Detail::stringify(*expected); | |
| } | |
| return "OK"; | |
| if (expected.has_value() && std::is_void_v<T>) { | |
| return "expected(void)"; | |
| } else if (expected.has_value()) { | |
| return fmt::format("expected({})", Catch::Detail::stringify(expected.value())); | |
| } else { | |
| return fmt::format("unexpected({})", Catch::Detail::stringify(expected.error())); | |
| } |
Contributor
Author
There was a problem hiding this comment.
Not sure -- I think
CHECK(processor_after->getProperty("invokehttp-proxy-password") == "")
with expansion:
"null" == ""
reads better than
CHECK(processor_after->getProperty("invokehttp-proxy-password") == "")
with expansion:
expected("null") == ""
but the second option has its advantages, too. If you still like the second option better after sleeping on it, I don't mind changing it.
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This also fixes a bug: if a sensitive value was set as
instead of
in a YAML flow configuration, then the value was null instead of an empty string, and it got expanded to the string "null", and then encrypted.
https://issues.apache.org/jira/browse/MINIFICPP-2787
Thank you for submitting a contribution to Apache NiFi - MiNiFi C++.
In order to streamline the review of the contribution we ask you to ensure the following steps have been taken:
For all changes:
Is there a JIRA ticket associated with this PR? Is it referenced in the commit message?
Does your PR title start with MINIFICPP-XXXX where XXXX is the JIRA number you are trying to resolve? Pay particular attention to the hyphen "-" character.
Has your PR been rebased against the latest commit within the target branch (typically main)?
Is your initial contribution a single, squashed commit?
For code changes:
For documentation related changes:
Note:
Please ensure that once the PR is submitted, you check GitHub Actions CI results for build issues and submit an update to your PR as soon as possible.