adding more checksum algorithms and adding test logger

Author: pulimsr

src/aws-cpp-sdk-transfer/source/transfer/TransferManager.cpp

@@ -9,6 +9,8 @@
 #include <aws/core/utils/crypto/Hash.h>
 #include <aws/core/utils/crypto/CRC32.h>
 #include <aws/core/utils/crypto/CRC64.h>
+#include <aws/core/utils/crypto/Sha1.h>
+#include <aws/core/utils/crypto/Sha256.h>
 #include <aws/core/utils/memory/AWSMemory.h>
 #include <aws/core/utils/memory/stl/AWSStreamFwd.h>
 #include <aws/core/utils/memory/stl/AWSStringStream.h>
@@ -402,14 +404,24 @@ namespace Aws
             bool isRetry = !handle->GetMultiPartId().empty();
             uint64_t sentBytes = 0;
 
-            std::shared_ptr<Aws::Utils::Crypto::Hash> fullObjectHashCalculator;
-            if (handle->GetChecksum().empty() && !isRetry) {
-                if (m_transferConfig.checksumAlgorithm == S3::Model::ChecksumAlgorithm::CRC32C) {
-                    fullObjectHashCalculator = Aws::MakeShared<Aws::Utils::Crypto::CRC32C>("TransferManager");
-                } else{
-                    fullObjectHashCalculator = Aws::MakeShared<Aws::Utils::Crypto::CRC64>("TransferManager");
+            const auto fullObjectHashCalculator = [](const std::shared_ptr<TransferHandle>& handle, bool isRetry, S3::Model::ChecksumAlgorithm algorithm) -> std::shared_ptr<Aws::Utils::Crypto::Hash> {
+                if (handle->GetChecksum().empty() && !isRetry) {
+                    if (algorithm == S3::Model::ChecksumAlgorithm::CRC32) {
+                        return Aws::MakeShared<Aws::Utils::Crypto::CRC32>("TransferManager");
+                    }
+                    if (algorithm == S3::Model::ChecksumAlgorithm::CRC32C) {
+                        return Aws::MakeShared<Aws::Utils::Crypto::CRC32C>("TransferManager");
+                    }
+                    if (algorithm == S3::Model::ChecksumAlgorithm::SHA1) {
+                        return Aws::MakeShared<Aws::Utils::Crypto::Sha1>("TransferManager");
+                    }
+                    if (algorithm == S3::Model::ChecksumAlgorithm::SHA256) {
+                        return Aws::MakeShared<Aws::Utils::Crypto::Sha256>("TransferManager");
+                    }
+                    return Aws::MakeShared<Aws::Utils::Crypto::CRC64>("TransferManager");
                 }
-            }
+                return nullptr;
+            }(handle, isRetry, m_transferConfig.checksumAlgorithm);
 
             if (!isRetry) {
               Aws::S3::Model::CreateMultipartUploadRequest createMultipartRequest = m_transferConfig.createMultipartUploadTemplate;

tests/aws-cpp-sdk-transfer-tests/TransferTests.cpp

@@ -164,15 +164,15 @@ class MockS3Client : public S3Client
     // Override to verify checksum is being sent
     Model::CompleteMultipartUploadOutcome CompleteMultipartUpload(const Model::CompleteMultipartUploadRequest& request) const override
     {
-        std::cout << "=== CompleteMultipartUpload Request ===" << std::endl;
-        std::cout << "Available ChecksumAlgorithm enum values:" << std::endl;
-        std::cout << "ChecksumType: " << (int)request.GetChecksumType() << std::endl;
-        std::cout << "ChecksumCRC32: " << request.GetChecksumCRC32() << std::endl;
-        std::cout << "ChecksumCRC32C: " << request.GetChecksumCRC32C() << std::endl;
-        std::cout << "ChecksumCRC64NVME: " << request.GetChecksumCRC64NVME() << std::endl;
-        std::cout << "ChecksumSHA1: " << request.GetChecksumSHA1() << std::endl;
-        std::cout << "ChecksumSHA256: " << request.GetChecksumSHA256() << std::endl;
-        std::cout << "=======================================" << std::endl;
+        AWS_LOGSTREAM_INFO("TransferTests", "=== CompleteMultipartUpload Request ===");
+        AWS_LOGSTREAM_INFO("TransferTests", "Available ChecksumAlgorithm enum values:");
+        AWS_LOGSTREAM_INFO("TransferTests", "ChecksumType: " << (int)request.GetChecksumType());
+        AWS_LOGSTREAM_INFO("TransferTests", "ChecksumCRC32: " << request.GetChecksumCRC32());
+        AWS_LOGSTREAM_INFO("TransferTests", "ChecksumCRC32C: " << request.GetChecksumCRC32C());
+        AWS_LOGSTREAM_INFO("TransferTests", "ChecksumCRC64NVME: " << request.GetChecksumCRC64NVME());
+        AWS_LOGSTREAM_INFO("TransferTests", "ChecksumSHA1: " << request.GetChecksumSHA1());
+        AWS_LOGSTREAM_INFO("TransferTests", "ChecksumSHA256: " << request.GetChecksumSHA256());
+        AWS_LOGSTREAM_INFO("TransferTests", "=======================================");
         return S3Client::CompleteMultipartUpload(request);
     }