szaszm commented on code in PR #1669: URL: https://github.com/apache/nifi-minifi-cpp/pull/1669#discussion_r1338525244
########## libminifi/include/utils/file/ArchiveUtils.h: ########## @@ -0,0 +1,31 @@ +/** + * 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. + */ +#pragma once + +#include <memory> +#include <map> +#include <string> + +#include "io/ArchiveStream.h" +#include "utils/expected.h" +#include "io/BufferStream.h" + +namespace org::apache::nifi::minifi::utils::archive { + +nonstd::expected<std::shared_ptr<io::BufferStream>, std::string> createArchive(std::map<std::string, std::unique_ptr<io::InputStream>>& files, const std::shared_ptr<core::logging::Logger>& logger); Review Comment: If this stays under utils, then it needs to be a general utility, and not depend on implementation details. - It should avoid owning pointers. It could return a buffer in a vector, or take an OutputStream as an argument if it needs to do streaming. - The `files` parameter should not be owning the files, just reading - The `files` parameter should be passed as a const ref - Maybe it should be taking a vector of pairs, instead of a map. Or even better, a pair of iterators. - Is the `logger` really necessary? If so, it should not be a `shared_ptr` Maybe this would be better placed in an anonymous namespace next to the usage site, where depending on implementation details is not so much of a problem. ########## controller/Controller.cpp: ########## @@ -225,4 +227,43 @@ bool getJstacks(const utils::net::SocketData& socket_data, std::ostream &out) { return true; } +nonstd::expected<void, std::string> getDebugBundle(const utils::net::SocketData& socket_data, const std::filesystem::path& target_dir) { + std::unique_ptr<io::BaseStream> connection_stream = std::make_unique<utils::net::AsioSocketConnection>(socket_data); Review Comment: There's no need to force conversion to the base type. ```suggestion const auto connection_stream = std::make_unique<utils::net::AsioSocketConnection>(socket_data); ``` ########## docker/test/integration/cluster/DockerCommunicator.py: ########## @@ -66,3 +66,19 @@ def write_content_to_container(self, content, container_name, dst_path): tar.addfile(info, io.BytesIO(content.encode('utf-8'))) with open(os.path.join(td, 'content.tar'), 'rb') as data: return self.__put_archive(container_name, os.path.dirname(dst_path), data.read()) + + def copy_file_from_container(self, container_name, src_path_in_container, dest_dir_on_host) -> bool: + try: + container = self.client.containers.get(container_name) + (bits, _) = container.get_archive(src_path_in_container) + tmp_tar_path = os.path.join(dest_dir_on_host, "tmp_debug.tar") Review Comment: It would be nicer to not hardcode the filename in this function. Its name gives the reader the impression that this can be used for any file. `write_content_to_container` has the same issue. -- 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]
