fgerlits commented on code in PR #1420:
URL: https://github.com/apache/nifi-minifi-cpp/pull/1420#discussion_r1005794943
##########
libminifi/src/core/FlowConfiguration.cpp:
##########
@@ -97,24 +97,24 @@
std::unique_ptr<core::reporting::SiteToSiteProvenanceReportingTask> FlowConfigur
return processor;
}
-std::unique_ptr<core::ProcessGroup> FlowConfiguration::updateFromPayload(const
std::string& url, const std::string& yamlConfigPayload) {
+std::unique_ptr<core::ProcessGroup> FlowConfiguration::updateFromPayload(const
std::string& url, const std::string& yamlConfigPayload, const
std::optional<std::string>& flow_id) {
auto old_services = controller_services_;
auto old_provider = service_provider_;
controller_services_ =
std::make_shared<core::controller::ControllerServiceMap>();
service_provider_ =
std::make_shared<core::controller::StandardControllerServiceProvider>(controller_services_,
nullptr, configuration_);
auto payload = getRootFromPayload(yamlConfigPayload);
if (!url.empty() && payload != nullptr) {
- std::string flow_id;
+ std::string payload_flow_id;
std::string bucket_id;
auto path_split = utils::StringUtils::split(url, "/");
for (auto it = path_split.cbegin(); it != path_split.cend(); ++it) {
if (*it == "flows" && std::next(it) != path_split.cend()) {
- flow_id = *++it;
+ payload_flow_id = *++it;
} else if (*it == "buckets" && std::next(it) != path_split.cend()) {
bucket_id = *++it;
}
}
- flow_version_->setFlowVersion(url, bucket_id, flow_id);
+ flow_version_->setFlowVersion(url, bucket_id, flow_id ? *flow_id :
payload_flow_id);
Review Comment:
Is it normal behavior if the flow ID in the payload is different from the
original flow ID? If not, we could log that something unexpected has happened.
##########
docker/test/integration/minifi/core/MinifiC2ServerSslContainer.py:
##########
@@ -0,0 +1,36 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+from .Container import Container
+
+
+class MinifiC2ServerSslContainer(Container):
+ def __init__(self, name, vols, network, image_store, command=None):
+ super().__init__(name, 'minifi-c2-server-ssl', vols, network,
image_store, command)
Review Comment:
Since the name of the engine is the only difference between
`MinifiC2ServerContainer` and `MinifiC2ServerSslContainer`, could the name of
the engine be a parameter of the constructor, so we can have one class instead
of two?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
