lordgamez commented on a change in pull request #979: URL: https://github.com/apache/nifi-minifi-cpp/pull/979#discussion_r576323911
########## File path: extensions/azure/processors/PutAzureBlobStorage.h ########## @@ -0,0 +1,138 @@ +/** + * @file PutAzureBlobStorage.h + * PutAzureBlobStorage class declaration + * + * 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 <utility> +#include <vector> +#include <string> +#include <memory> + +#include "core/Property.h" +#include "core/Processor.h" +#include "core/logging/Logger.h" +#include "core/logging/LoggerConfiguration.h" +#include "storage/BlobStorage.h" +#include "utils/OptionalUtils.h" + +class PutAzureBlobStorageTestsFixture; + +namespace org { +namespace apache { +namespace nifi { +namespace minifi { +namespace azure { +namespace processors { + +class PutAzureBlobStorage : public core::Processor { + public: + static constexpr char const* ProcessorName = "PutAzureBlobStorage"; + + // Supported Properties + static const core::Property ContainerName; + static const core::Property AzureStorageCredentialsService; + static const core::Property StorageAccountName; + static const core::Property StorageAccountKey; + static const core::Property SASToken; + static const core::Property CommonStorageAccountEndpointSuffix; + static const core::Property ConnectionString; + static const core::Property Blob; + static const core::Property CreateContainer; + + // Supported Relationships + static const core::Relationship Failure; + static const core::Relationship Success; + + explicit PutAzureBlobStorage(std::string name, minifi::utils::Identifier uuid = minifi::utils::Identifier()) + : PutAzureBlobStorage(name, uuid, nullptr) { + } + + ~PutAzureBlobStorage() override = default; + + bool supportsDynamicProperties() override { return true; } + void initialize() override; + void onSchedule(const std::shared_ptr<core::ProcessContext> &context, const std::shared_ptr<core::ProcessSessionFactory> &sessionFactory) override; + void onTrigger(const std::shared_ptr<core::ProcessContext> &context, const std::shared_ptr<core::ProcessSession> &session) override; + + class ReadCallback : public InputStreamCallback { + public: + ReadCallback(uint64_t flow_size, azure::storage::BlobStorage& blob_storage_wrapper, const std::string &blob_name) + : flow_size_(flow_size) + , blob_storage_wrapper_(blob_storage_wrapper) + , blob_name_(blob_name) { + } + + int64_t process(const std::shared_ptr<io::BaseStream>& stream) override { + std::vector<uint8_t> buffer; + buffer.reserve(flow_size_); + int read_ret = stream->read(buffer.data(), flow_size_); Review comment: Fixed in [8853da](https://github.com/apache/nifi-minifi-cpp/pull/979/commits/8853da7346c55a08a326609e97ad09675443e7fb). Used read overload with vector parameter where resize is used already, where it was possible. ########## File path: extensions/azure/storage/AzureBlobStorage.cpp ########## @@ -0,0 +1,83 @@ +/** + * @file AzureBlobStorage.cpp + * AzureBlobStorage class implementation + * + * 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. + */ + +#include "AzureBlobStorage.h" +#include "utils/GeneralUtils.h" + +namespace org { +namespace apache { +namespace nifi { +namespace minifi { +namespace azure { +namespace storage { + +AzureBlobStorage::AzureBlobStorage(const std::string &connection_string, const std::string &container_name) + : BlobStorage(connection_string, container_name) + , container_client_(minifi::utils::make_unique<Azure::Storage::Blobs::BlobContainerClient>( + Azure::Storage::Blobs::BlobContainerClient::CreateFromConnectionString(connection_string, container_name))) { +} + +void AzureBlobStorage::resetClientIfNeeded(const std::string &connection_string, const std::string &container_name) { + if (connection_string == connection_string_ && container_name_ == container_name) { + logger_->log_debug("Client credentials have not changed, no need to reset client"); + return; + } + connection_string_ = connection_string; + container_name_ = container_name; + logger_->log_debug("Client has been reset with new credentials"); + container_client_ = minifi::utils::make_unique<Azure::Storage::Blobs::BlobContainerClient>(Azure::Storage::Blobs::BlobContainerClient::CreateFromConnectionString(connection_string, container_name)); +} + +void AzureBlobStorage::createContainer() { + try { + auto blob_client = container_client_->Create(); + logger_->log_debug("Container created"); + } catch (const std::runtime_error&) { + logger_->log_debug("Container creation failed, it already exists."); + } +} + +utils::optional<UploadBlobResult> AzureBlobStorage::uploadBlob(const std::string &blob_name, const uint8_t* buffer, std::size_t buffer_size) { + try { + auto blob_client = container_client_->GetBlockBlobClient(blob_name); + auto response = blob_client.UploadFrom(buffer, buffer_size); + if (!response.HasValue()) { + return utils::nullopt; + } + + UploadBlobResult result; + result.length = buffer_size; + result.primary_uri = container_client_->GetUrl(); + if (response->ETag.HasValue()) { + result.etag = response->ETag.ToString(); + } + result.timestamp = response->LastModified.GetString(Azure::Core::DateTime::DateFormat::Rfc1123); + return result; + } catch (const std::runtime_error&) { + return utils::nullopt; Review comment: Added logs in [8853da](https://github.com/apache/nifi-minifi-cpp/pull/979/commits/8853da7346c55a08a326609e97ad09675443e7fb) ---------------------------------------------------------------- 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. For queries about this service, please contact Infrastructure at: [email protected]
