MINIFICPP-2679 Move HTTP tests to modular docker tests #2077
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
lordgamez
added
depends-on-another-PR
low-impact
lordgamez
force-pushed
the
MINIFICPP-2679
branch
from
fe9bbfa to
4f0e4cb
Compare
lordgamez
force-pushed
the
MINIFICPP-2679
branch
from
4f0e4cb to
c10e4a5
Compare
8 tasks
szaszm
reviewed
Dec 10, 2025
| if not self.container or not self.not_empty_dir_exists(directory_path): | ||
| return False | ||
|
|
||
| command = "sh -c {}".format(shlex.quote(f"find {directory_path} -maxdepth 1 -type f -exec stat -c %s {{}} \\;")) |
Member
There was a problem hiding this comment.
This should do it in one command, and the size filtering can be removed from below. Also I don't think wrapping in sh -c is necessary, but I've raised comment this in an earlier PR too
Suggested change
| command = "sh -c {}".format(shlex.quote(f"find {directory_path} -maxdepth 1 -type f -exec stat -c %s {{}} \\;")) | |
| command = f"find \"{directory_path}\" -maxdepth 1 -type f -size +{expected_size}" |
|
|
||
|
|
||
| class NifiContainer(Container): | ||
| NIFI_VERSION = '2.2.0' |
Member
There was a problem hiding this comment.
Can we update this to the latest version? Should be 2.7.1 soon
szaszm
reviewed
Dec 10, 2025
Comment on lines
+63
to
+65
| if minifi_container_name == "nifi": | ||
| context.containers["nifi"].flow_definition.add_processor(processor) | ||
| return |
Member
There was a problem hiding this comment.
This way of deciding what to do raises a red flag for me, but I'll leave it up to @martinzink to say if this design fits in the framework or not.
fgerlits
reviewed
Dec 17, 2025
Contributor
fgerlits
left a comment
fgerlits
left a comment
There was a problem hiding this comment.
Does this also need to be added to the end of RunBehaveTests.sh?
Comment on lines
+33
to
+45
| entry_command = (r"sed -i -e 's/^\(nifi.remote.input.host\)=.*/\1={name}/' /opt/nifi/nifi-current/conf/nifi.properties && " | ||
| r"sed -i -e 's/^\(nifi.remote.input.secure\)=.*/\1=true/' /opt/nifi/nifi-current/conf/nifi.properties && " | ||
| r"sed -i -e 's/^\(nifi.sensitive.props.key\)=.*/\1=secret_key_12345/' /opt/nifi/nifi-current/conf/nifi.properties && " | ||
| r"sed -i -e 's/^\(nifi.web.https.port\)=.*/\1=8443/' /opt/nifi/nifi-current/conf/nifi.properties && " | ||
| r"sed -i -e 's/^\(nifi.web.https.host\)=.*/\1={name}/' /opt/nifi/nifi-current/conf/nifi.properties && " | ||
| r"sed -i -e 's/^\(nifi.security.keystore\)=.*/\1=\/tmp\/resources\/keystore.jks/' /opt/nifi/nifi-current/conf/nifi.properties && " | ||
| r"sed -i -e 's/^\(nifi.security.keystoreType\)=.*/\1=jks/' /opt/nifi/nifi-current/conf/nifi.properties && " | ||
| r"sed -i -e 's/^\(nifi.security.keystorePasswd\)=.*/\1=passw0rd1!/' /opt/nifi/nifi-current/conf/nifi.properties && " | ||
| r"sed -i -e 's/^\(nifi.security.keyPasswd\)=.*/#\1=passw0rd1!/' /opt/nifi/nifi-current/conf/nifi.properties && " | ||
| r"sed -i -e 's/^\(nifi.security.truststore\)=.*/\1=\/tmp\/resources\/truststore.jks/' /opt/nifi/nifi-current/conf/nifi.properties && " | ||
| r"sed -i -e 's/^\(nifi.security.truststoreType\)=.*/\1=jks/' /opt/nifi/nifi-current/conf/nifi.properties && " | ||
| r"sed -i -e 's/^\(nifi.security.truststorePasswd\)=.*/\1=passw0rd1!/' /opt/nifi/nifi-current/conf/nifi.properties && " | ||
| r"sed -i -e 's/^\(nifi.remote.input.socket.port\)=.*/\1=10443/' /opt/nifi/nifi-current/conf/nifi.properties && " |
Contributor
There was a problem hiding this comment.
this could be a single sed command, e.g.:
entry_command = (r"""sed -i -e 's/^\(nifi.remote.input.host\)=.*/\1={name}/
s/^\(nifi.remote.input.secure\)=.*/\1=true/
s/^\(nifi.sensitive.props.key\)=.*/\1=secret_key_12345/
...
s/^\(nifi.remote.input.socket.port\)=.*/\1=10443/' /opt/nifi/nifi-current/conf/nifi.properties && ... """ ...
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 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.
https://issues.apache.org/jira/browse/MINIFICPP-2679
Depends on github.com//pull/2075
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.