lordgamez commented on a change in pull request #975:
URL: https://github.com/apache/nifi-minifi-cpp/pull/975#discussion_r560129087
##########
File path: extensions/aws/s3/S3Wrapper.h
##########
@@ -31,11 +47,190 @@ namespace minifi {
namespace aws {
namespace s3 {
-class S3Wrapper : public S3WrapperBase {
+static const std::unordered_map<std::string, Aws::S3::Model::StorageClass>
STORAGE_CLASS_MAP {
+ {"Standard", Aws::S3::Model::StorageClass::STANDARD},
+ {"ReducedRedundancy", Aws::S3::Model::StorageClass::REDUCED_REDUNDANCY},
+ {"StandardIA", Aws::S3::Model::StorageClass::STANDARD_IA},
+ {"OnezoneIA", Aws::S3::Model::StorageClass::ONEZONE_IA},
+ {"IntelligentTiering", Aws::S3::Model::StorageClass::INTELLIGENT_TIERING},
+ {"Glacier", Aws::S3::Model::StorageClass::GLACIER},
+ {"DeepArchive", Aws::S3::Model::StorageClass::DEEP_ARCHIVE}
+};
+
+static const std::unordered_map<Aws::S3::Model::ObjectStorageClass,
std::string> OBJECT_STORAGE_CLASS_MAP {
+ {Aws::S3::Model::ObjectStorageClass::STANDARD, "Standard"},
+ {Aws::S3::Model::ObjectStorageClass::REDUCED_REDUNDANCY,
"ReducedRedundancy"},
+ {Aws::S3::Model::ObjectStorageClass::STANDARD_IA, "StandardIA"},
+ {Aws::S3::Model::ObjectStorageClass::ONEZONE_IA, "OnezoneIA"},
+ {Aws::S3::Model::ObjectStorageClass::INTELLIGENT_TIERING,
"IntelligentTiering"},
+ {Aws::S3::Model::ObjectStorageClass::GLACIER, "Glacier"},
+ {Aws::S3::Model::ObjectStorageClass::DEEP_ARCHIVE, "DeepArchive"}
+};
+
+static const std::unordered_map<Aws::S3::Model::ObjectVersionStorageClass,
std::string> VERSION_STORAGE_CLASS_MAP {
+ {Aws::S3::Model::ObjectVersionStorageClass::STANDARD, "Standard"}
+};
+
+static const std::unordered_map<std::string,
Aws::S3::Model::ServerSideEncryption> SERVER_SIDE_ENCRYPTION_MAP {
+ {"None", Aws::S3::Model::ServerSideEncryption::NOT_SET},
+ {"AES256", Aws::S3::Model::ServerSideEncryption::AES256},
+ {"aws_kms", Aws::S3::Model::ServerSideEncryption::aws_kms},
+};
+
+static const std::unordered_map<std::string, Aws::S3::Model::ObjectCannedACL>
CANNED_ACL_MAP {
+ {"BucketOwnerFullControl",
Aws::S3::Model::ObjectCannedACL::bucket_owner_full_control},
+ {"BucketOwnerRead", Aws::S3::Model::ObjectCannedACL::bucket_owner_read},
+ {"AuthenticatedRead", Aws::S3::Model::ObjectCannedACL::authenticated_read},
+ {"PublicReadWrite", Aws::S3::Model::ObjectCannedACL::public_read_write},
+ {"PublicRead", Aws::S3::Model::ObjectCannedACL::public_read},
+ {"Private", Aws::S3::Model::ObjectCannedACL::private_},
+ {"AwsExecRead", Aws::S3::Model::ObjectCannedACL::aws_exec_read},
+};
+
+struct Expiration {
+ std::string expiration_time;
+ std::string expiration_time_rule_id;
+};
+
+struct PutObjectResult {
+ std::string version;
+ std::string etag;
+ std::string expiration;
+ std::string ssealgorithm;
+};
+
+struct PutObjectRequestParameters {
+ std::string bucket;
+ std::string object_key;
+ std::string storage_class;
+ std::string server_side_encryption;
+ std::string content_type;
+ std::map<std::string, std::string> user_metadata_map;
+ std::string fullcontrol_user_list;
+ std::string read_permission_user_list;
+ std::string read_acl_user_list;
+ std::string write_acl_user_list;
+ std::string canned_acl;
+};
+
+struct GetObjectRequestParameters {
+ std::string bucket;
+ std::string object_key;
+ std::string version;
+ bool requester_pays = false;
+};
+
+struct HeadObjectResult {
+ std::string path;
+ std::string absolute_path;
+ std::string filename;
+ std::string mime_type;
+ std::string etag;
+ Expiration expiration;
+ std::string ssealgorithm;
+ std::string version;
+ std::map<std::string, std::string> user_metadata_map;
+
+ void setFilePaths(const std::string& key);
+};
+
+struct GetObjectResult : public HeadObjectResult {
+ int64_t write_size = 0;
+};
+
+struct ListRequestParameters {
+ std::string bucket;
+ std::string delimiter;
+ std::string prefix;
+ bool use_versions = false;
+ uint64_t min_object_age = 0;
+};
+
+struct ListedObjectAttributes {
+ std::string filename;
+ std::string etag;
+ bool is_latest = false;
+ int64_t last_modified = 0;
+ int length = 0;
+ std::string store_class;
+ std::string version;
+};
+
+using HeadObjectRequestParameters = GetObjectRequestParameters;
+
+class S3Wrapper {
+ public:
+ S3Wrapper();
+ explicit S3Wrapper(std::unique_ptr<S3RequestSender> request_sender);
+
+ void setCredentials(const Aws::Auth::AWSCredentials& cred);
+ void setRegion(const Aws::String& region);
+ void setTimeout(uint64_t timeout);
+ void setEndpointOverrideUrl(const Aws::String& url);
+ void setProxy(const ProxyOptions& proxy);
+
+ minifi::utils::optional<PutObjectResult> putObject(const
PutObjectRequestParameters& options, std::shared_ptr<Aws::IOStream>
data_stream);
+ bool deleteObject(const std::string& bucket, const std::string& object_key,
const std::string& version = "");
+ minifi::utils::optional<GetObjectResult> getObject(const
GetObjectRequestParameters& get_object_params, const
std::shared_ptr<io::BaseStream>& fetched_body);
+ minifi::utils::optional<std::vector<ListedObjectAttributes>>
listBucket(const ListRequestParameters& params);
+ minifi::utils::optional<std::map<std::string, std::string>>
getObjectTags(const std::string& bucket, const std::string& object_key, const
std::string& version = 0);
+ minifi::utils::optional<HeadObjectResult> headObject(const
HeadObjectRequestParameters& head_object_params);
+
+ virtual ~S3Wrapper() = default;
+
protected:
- minifi::utils::optional<Aws::S3::Model::PutObjectResult>
sendPutObjectRequest(const Aws::S3::Model::PutObjectRequest& request) override;
- bool sendDeleteObjectRequest(const Aws::S3::Model::DeleteObjectRequest&
request) override;
- minifi::utils::optional<Aws::S3::Model::GetObjectResult>
sendGetObjectRequest(const Aws::S3::Model::GetObjectRequest& request) override;
+ void setCannedAcl(Aws::S3::Model::PutObjectRequest& request, const
std::string& canned_acl) const;
+ int64_t writeFetchedBody(Aws::IOStream& source, const int64_t data_size,
const std::shared_ptr<io::BaseStream>& output);
+ Expiration getExpiration(const std::string& expiration);
+ static std::string getEncryptionString(Aws::S3::Model::ServerSideEncryption
encryption);
+
+ minifi::utils::optional<std::vector<ListedObjectAttributes>>
listVersions(const ListRequestParameters& params);
+ minifi::utils::optional<std::vector<ListedObjectAttributes>>
listObjects(const ListRequestParameters& params);
+ void addListResults(const Aws::Vector<Aws::S3::Model::ObjectVersion>&
content, const uint64_t min_object_age, std::vector<ListedObjectAttributes>&
listed_objects);
+ void addListResults(const Aws::Vector<Aws::S3::Model::Object>& content,
const uint64_t min_object_age, std::vector<ListedObjectAttributes>&
listed_objects);
Review comment:
Updated in
[4507f26](https://github.com/apache/nifi-minifi-cpp/pull/975/commits/4507f26caf3e1bec015f411fc1e924a08fa2c9a3)
----------------------------------------------------------------
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:
us...@infra.apache.org
