diff options
author | dakovalkov <dakovalkov@yandex-team.com> | 2023-12-03 13:33:55 +0300 |
---|---|---|
committer | dakovalkov <dakovalkov@yandex-team.com> | 2023-12-03 14:04:39 +0300 |
commit | 2a718325637e5302334b6d0a6430f63168f8dbb3 (patch) | |
tree | 64be81080b7df9ec1d86d053a0c394ae53fcf1fe /contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model | |
parent | e0d94a470142d95c3007e9c5d80380994940664a (diff) | |
download | ydb-2a718325637e5302334b6d0a6430f63168f8dbb3.tar.gz |
Update contrib/libs/aws-sdk-cpp to 1.11.37
Diffstat (limited to 'contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model')
135 files changed, 3371 insertions, 73 deletions
diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/AbortMultipartUploadRequest.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/AbortMultipartUploadRequest.cpp index 4d8645caab..299825faff 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/AbortMultipartUploadRequest.cpp +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/AbortMultipartUploadRequest.cpp @@ -79,3 +79,13 @@ Aws::Http::HeaderValueCollection AbortMultipartUploadRequest::GetRequestSpecific return headers; } + +AbortMultipartUploadRequest::EndpointParameters AbortMultipartUploadRequest::GetEndpointContextParams() const +{ + EndpointParameters parameters; + // Operation context parameters + if (BucketHasBeenSet()) { + parameters.emplace_back(Aws::String("Bucket"), this->GetBucket(), Aws::Endpoint::EndpointParameter::ParameterOrigin::OPERATION_CONTEXT); + } + return parameters; +} diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/Bucket.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/Bucket.cpp index 1ad9b5f310..cf66979ae2 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/Bucket.cpp +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/Bucket.cpp @@ -48,7 +48,7 @@ Bucket& Bucket::operator =(const XmlNode& xmlNode) XmlNode creationDateNode = resultNode.FirstChild("CreationDate"); if(!creationDateNode.IsNull()) { - m_creationDate = DateTime(StringUtils::Trim(Aws::Utils::Xml::DecodeEscapedXmlText(creationDateNode.GetText()).c_str()).c_str(), DateFormat::ISO_8601); + m_creationDate = DateTime(StringUtils::Trim(Aws::Utils::Xml::DecodeEscapedXmlText(creationDateNode.GetText()).c_str()).c_str(), Aws::Utils::DateFormat::ISO_8601); m_creationDateHasBeenSet = true; } } @@ -68,7 +68,7 @@ void Bucket::AddToNode(XmlNode& parentNode) const if(m_creationDateHasBeenSet) { XmlNode creationDateNode = parentNode.CreateChildElement("CreationDate"); - creationDateNode.SetText(m_creationDate.ToGmtString(DateFormat::ISO_8601)); + creationDateNode.SetText(m_creationDate.ToGmtString(Aws::Utils::DateFormat::ISO_8601)); } } diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/BucketLocationConstraint.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/BucketLocationConstraint.cpp index 1bcdd2b471..4b83e3bad1 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/BucketLocationConstraint.cpp +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/BucketLocationConstraint.cpp @@ -28,6 +28,7 @@ namespace Aws static const int ap_south_1_HASH = HashingUtils::HashString("ap-south-1"); static const int ap_southeast_1_HASH = HashingUtils::HashString("ap-southeast-1"); static const int ap_southeast_2_HASH = HashingUtils::HashString("ap-southeast-2"); + static const int ap_southeast_3_HASH = HashingUtils::HashString("ap-southeast-3"); static const int ca_central_1_HASH = HashingUtils::HashString("ca-central-1"); static const int cn_north_1_HASH = HashingUtils::HashString("cn-north-1"); static const int cn_northwest_1_HASH = HashingUtils::HashString("cn-northwest-1"); @@ -45,6 +46,7 @@ namespace Aws static const int us_gov_west_1_HASH = HashingUtils::HashString("us-gov-west-1"); static const int us_west_1_HASH = HashingUtils::HashString("us-west-1"); static const int us_west_2_HASH = HashingUtils::HashString("us-west-2"); + static const int us_iso_west_1_HASH = HashingUtils::HashString("us-iso-west-1"); static const int us_east_1_HASH = HashingUtils::HashString("us-east-1"); @@ -83,6 +85,10 @@ namespace Aws { return BucketLocationConstraint::ap_southeast_2; } + else if (hashCode == ap_southeast_3_HASH) + { + return BucketLocationConstraint::ap_southeast_3; + } else if (hashCode == ca_central_1_HASH) { return BucketLocationConstraint::ca_central_1; @@ -151,6 +157,10 @@ namespace Aws { return BucketLocationConstraint::us_west_2; } + else if (hashCode == us_iso_west_1_HASH) + { + return BucketLocationConstraint::us_iso_west_1; + } else if (hashCode == us_east_1_HASH) { return BucketLocationConstraint::us_east_1; @@ -185,6 +195,8 @@ namespace Aws return "ap-southeast-1"; case BucketLocationConstraint::ap_southeast_2: return "ap-southeast-2"; + case BucketLocationConstraint::ap_southeast_3: + return "ap-southeast-3"; case BucketLocationConstraint::ca_central_1: return "ca-central-1"; case BucketLocationConstraint::cn_north_1: @@ -219,6 +231,8 @@ namespace Aws return "us-west-1"; case BucketLocationConstraint::us_west_2: return "us-west-2"; + case BucketLocationConstraint::us_iso_west_1: + return "us-iso-west-1"; case BucketLocationConstraint::us_east_1: return "us-east-1"; default: diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/Checksum.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/Checksum.cpp new file mode 100644 index 0000000000..bd4e0f4dc4 --- /dev/null +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/Checksum.cpp @@ -0,0 +1,106 @@ +/** + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. + * SPDX-License-Identifier: Apache-2.0. + */ + +#include <aws/s3/model/Checksum.h> +#include <aws/core/utils/xml/XmlSerializer.h> +#include <aws/core/utils/StringUtils.h> +#include <aws/core/utils/memory/stl/AWSStringStream.h> + +#include <utility> + +using namespace Aws::Utils::Xml; +using namespace Aws::Utils; + +namespace Aws +{ +namespace S3 +{ +namespace Model +{ + +Checksum::Checksum() : + m_checksumCRC32HasBeenSet(false), + m_checksumCRC32CHasBeenSet(false), + m_checksumSHA1HasBeenSet(false), + m_checksumSHA256HasBeenSet(false) +{ +} + +Checksum::Checksum(const XmlNode& xmlNode) : + m_checksumCRC32HasBeenSet(false), + m_checksumCRC32CHasBeenSet(false), + m_checksumSHA1HasBeenSet(false), + m_checksumSHA256HasBeenSet(false) +{ + *this = xmlNode; +} + +Checksum& Checksum::operator =(const XmlNode& xmlNode) +{ + XmlNode resultNode = xmlNode; + + if(!resultNode.IsNull()) + { + XmlNode checksumCRC32Node = resultNode.FirstChild("ChecksumCRC32"); + if(!checksumCRC32Node.IsNull()) + { + m_checksumCRC32 = Aws::Utils::Xml::DecodeEscapedXmlText(checksumCRC32Node.GetText()); + m_checksumCRC32HasBeenSet = true; + } + XmlNode checksumCRC32CNode = resultNode.FirstChild("ChecksumCRC32C"); + if(!checksumCRC32CNode.IsNull()) + { + m_checksumCRC32C = Aws::Utils::Xml::DecodeEscapedXmlText(checksumCRC32CNode.GetText()); + m_checksumCRC32CHasBeenSet = true; + } + XmlNode checksumSHA1Node = resultNode.FirstChild("ChecksumSHA1"); + if(!checksumSHA1Node.IsNull()) + { + m_checksumSHA1 = Aws::Utils::Xml::DecodeEscapedXmlText(checksumSHA1Node.GetText()); + m_checksumSHA1HasBeenSet = true; + } + XmlNode checksumSHA256Node = resultNode.FirstChild("ChecksumSHA256"); + if(!checksumSHA256Node.IsNull()) + { + m_checksumSHA256 = Aws::Utils::Xml::DecodeEscapedXmlText(checksumSHA256Node.GetText()); + m_checksumSHA256HasBeenSet = true; + } + } + + return *this; +} + +void Checksum::AddToNode(XmlNode& parentNode) const +{ + Aws::StringStream ss; + if(m_checksumCRC32HasBeenSet) + { + XmlNode checksumCRC32Node = parentNode.CreateChildElement("ChecksumCRC32"); + checksumCRC32Node.SetText(m_checksumCRC32); + } + + if(m_checksumCRC32CHasBeenSet) + { + XmlNode checksumCRC32CNode = parentNode.CreateChildElement("ChecksumCRC32C"); + checksumCRC32CNode.SetText(m_checksumCRC32C); + } + + if(m_checksumSHA1HasBeenSet) + { + XmlNode checksumSHA1Node = parentNode.CreateChildElement("ChecksumSHA1"); + checksumSHA1Node.SetText(m_checksumSHA1); + } + + if(m_checksumSHA256HasBeenSet) + { + XmlNode checksumSHA256Node = parentNode.CreateChildElement("ChecksumSHA256"); + checksumSHA256Node.SetText(m_checksumSHA256); + } + +} + +} // namespace Model +} // namespace S3 +} // namespace Aws diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/ChecksumAlgorithm.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/ChecksumAlgorithm.cpp new file mode 100644 index 0000000000..674e726dd7 --- /dev/null +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/ChecksumAlgorithm.cpp @@ -0,0 +1,84 @@ +/** + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. + * SPDX-License-Identifier: Apache-2.0. + */ + +#include <aws/s3/model/ChecksumAlgorithm.h> +#include <aws/core/utils/HashingUtils.h> +#include <aws/core/Globals.h> +#include <aws/core/utils/EnumParseOverflowContainer.h> + +using namespace Aws::Utils; + + +namespace Aws +{ + namespace S3 + { + namespace Model + { + namespace ChecksumAlgorithmMapper + { + + static const int CRC32_HASH = HashingUtils::HashString("CRC32"); + static const int CRC32C_HASH = HashingUtils::HashString("CRC32C"); + static const int SHA1_HASH = HashingUtils::HashString("SHA1"); + static const int SHA256_HASH = HashingUtils::HashString("SHA256"); + + + ChecksumAlgorithm GetChecksumAlgorithmForName(const Aws::String& name) + { + int hashCode = HashingUtils::HashString(name.c_str()); + if (hashCode == CRC32_HASH) + { + return ChecksumAlgorithm::CRC32; + } + else if (hashCode == CRC32C_HASH) + { + return ChecksumAlgorithm::CRC32C; + } + else if (hashCode == SHA1_HASH) + { + return ChecksumAlgorithm::SHA1; + } + else if (hashCode == SHA256_HASH) + { + return ChecksumAlgorithm::SHA256; + } + EnumParseOverflowContainer* overflowContainer = Aws::GetEnumOverflowContainer(); + if(overflowContainer) + { + overflowContainer->StoreOverflow(hashCode, name); + return static_cast<ChecksumAlgorithm>(hashCode); + } + + return ChecksumAlgorithm::NOT_SET; + } + + Aws::String GetNameForChecksumAlgorithm(ChecksumAlgorithm enumValue) + { + switch(enumValue) + { + case ChecksumAlgorithm::CRC32: + return "CRC32"; + case ChecksumAlgorithm::CRC32C: + return "CRC32C"; + case ChecksumAlgorithm::SHA1: + return "SHA1"; + case ChecksumAlgorithm::SHA256: + return "SHA256"; + default: + EnumParseOverflowContainer* overflowContainer = Aws::GetEnumOverflowContainer(); + if(overflowContainer) + { + return overflowContainer->RetrieveOverflow(static_cast<int>(enumValue)); + } + + return {}; + } + } + + } // namespace ChecksumAlgorithmMapper + } // namespace Model + } // namespace S3 +} // namespace Aws diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/ChecksumMode.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/ChecksumMode.cpp new file mode 100644 index 0000000000..d3085bfb8a --- /dev/null +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/ChecksumMode.cpp @@ -0,0 +1,63 @@ +/** + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. + * SPDX-License-Identifier: Apache-2.0. + */ + +#include <aws/s3/model/ChecksumMode.h> +#include <aws/core/utils/HashingUtils.h> +#include <aws/core/Globals.h> +#include <aws/core/utils/EnumParseOverflowContainer.h> + +using namespace Aws::Utils; + + +namespace Aws +{ + namespace S3 + { + namespace Model + { + namespace ChecksumModeMapper + { + + static const int ENABLED_HASH = HashingUtils::HashString("ENABLED"); + + + ChecksumMode GetChecksumModeForName(const Aws::String& name) + { + int hashCode = HashingUtils::HashString(name.c_str()); + if (hashCode == ENABLED_HASH) + { + return ChecksumMode::ENABLED; + } + EnumParseOverflowContainer* overflowContainer = Aws::GetEnumOverflowContainer(); + if(overflowContainer) + { + overflowContainer->StoreOverflow(hashCode, name); + return static_cast<ChecksumMode>(hashCode); + } + + return ChecksumMode::NOT_SET; + } + + Aws::String GetNameForChecksumMode(ChecksumMode enumValue) + { + switch(enumValue) + { + case ChecksumMode::ENABLED: + return "ENABLED"; + default: + EnumParseOverflowContainer* overflowContainer = Aws::GetEnumOverflowContainer(); + if(overflowContainer) + { + return overflowContainer->RetrieveOverflow(static_cast<int>(enumValue)); + } + + return {}; + } + } + + } // namespace ChecksumModeMapper + } // namespace Model + } // namespace S3 +} // namespace Aws diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/CompleteMultipartUploadRequest.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/CompleteMultipartUploadRequest.cpp index 8c058ba507..03a8a23f96 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/CompleteMultipartUploadRequest.cpp +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/CompleteMultipartUploadRequest.cpp @@ -21,13 +21,42 @@ CompleteMultipartUploadRequest::CompleteMultipartUploadRequest() : m_keyHasBeenSet(false), m_multipartUploadHasBeenSet(false), m_uploadIdHasBeenSet(false), + m_checksumCRC32HasBeenSet(false), + m_checksumCRC32CHasBeenSet(false), + m_checksumSHA1HasBeenSet(false), + m_checksumSHA256HasBeenSet(false), m_requestPayer(RequestPayer::NOT_SET), m_requestPayerHasBeenSet(false), m_expectedBucketOwnerHasBeenSet(false), + m_sSECustomerAlgorithmHasBeenSet(false), + m_sSECustomerKeyHasBeenSet(false), + m_sSECustomerKeyMD5HasBeenSet(false), m_customizedAccessLogTagHasBeenSet(false) { } +bool CompleteMultipartUploadRequest::HasEmbeddedError(Aws::IOStream &body, + const Aws::Http::HeaderValueCollection &header) const +{ + // Header is unused + (void) header; + + auto readPointer = body.tellg(); + XmlDocument doc = XmlDocument::CreateFromXmlStream(body); + + if (!doc.WasParseSuccessful()) { + body.seekg(readPointer); + return false; + } + + if (doc.GetRootElement().GetName() == "Error") { + body.seekg(readPointer); + return true; + } + body.seekg(readPointer); + return false; +} + Aws::String CompleteMultipartUploadRequest::SerializePayload() const { XmlDocument payloadDoc = XmlDocument::CreateWithRootNode("CompleteMultipartUpload"); @@ -77,6 +106,34 @@ Aws::Http::HeaderValueCollection CompleteMultipartUploadRequest::GetRequestSpeci { Aws::Http::HeaderValueCollection headers; Aws::StringStream ss; + if(m_checksumCRC32HasBeenSet) + { + ss << m_checksumCRC32; + headers.emplace("x-amz-checksum-crc32", ss.str()); + ss.str(""); + } + + if(m_checksumCRC32CHasBeenSet) + { + ss << m_checksumCRC32C; + headers.emplace("x-amz-checksum-crc32c", ss.str()); + ss.str(""); + } + + if(m_checksumSHA1HasBeenSet) + { + ss << m_checksumSHA1; + headers.emplace("x-amz-checksum-sha1", ss.str()); + ss.str(""); + } + + if(m_checksumSHA256HasBeenSet) + { + ss << m_checksumSHA256; + headers.emplace("x-amz-checksum-sha256", ss.str()); + ss.str(""); + } + if(m_requestPayerHasBeenSet) { headers.emplace("x-amz-request-payer", RequestPayerMapper::GetNameForRequestPayer(m_requestPayer)); @@ -89,5 +146,36 @@ Aws::Http::HeaderValueCollection CompleteMultipartUploadRequest::GetRequestSpeci ss.str(""); } + if(m_sSECustomerAlgorithmHasBeenSet) + { + ss << m_sSECustomerAlgorithm; + headers.emplace("x-amz-server-side-encryption-customer-algorithm", ss.str()); + ss.str(""); + } + + if(m_sSECustomerKeyHasBeenSet) + { + ss << m_sSECustomerKey; + headers.emplace("x-amz-server-side-encryption-customer-key", ss.str()); + ss.str(""); + } + + if(m_sSECustomerKeyMD5HasBeenSet) + { + ss << m_sSECustomerKeyMD5; + headers.emplace("x-amz-server-side-encryption-customer-key-md5", ss.str()); + ss.str(""); + } + return headers; } + +CompleteMultipartUploadRequest::EndpointParameters CompleteMultipartUploadRequest::GetEndpointContextParams() const +{ + EndpointParameters parameters; + // Operation context parameters + if (BucketHasBeenSet()) { + parameters.emplace_back(Aws::String("Bucket"), this->GetBucket(), Aws::Endpoint::EndpointParameter::ParameterOrigin::OPERATION_CONTEXT); + } + return parameters; +} diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/CompleteMultipartUploadResult.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/CompleteMultipartUploadResult.cpp index da3f191993..ad87777a2c 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/CompleteMultipartUploadResult.cpp +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/CompleteMultipartUploadResult.cpp @@ -58,6 +58,26 @@ CompleteMultipartUploadResult& CompleteMultipartUploadResult::operator =(const A { m_eTag = Aws::Utils::Xml::DecodeEscapedXmlText(eTagNode.GetText()); } + XmlNode checksumCRC32Node = resultNode.FirstChild("ChecksumCRC32"); + if(!checksumCRC32Node.IsNull()) + { + m_checksumCRC32 = Aws::Utils::Xml::DecodeEscapedXmlText(checksumCRC32Node.GetText()); + } + XmlNode checksumCRC32CNode = resultNode.FirstChild("ChecksumCRC32C"); + if(!checksumCRC32CNode.IsNull()) + { + m_checksumCRC32C = Aws::Utils::Xml::DecodeEscapedXmlText(checksumCRC32CNode.GetText()); + } + XmlNode checksumSHA1Node = resultNode.FirstChild("ChecksumSHA1"); + if(!checksumSHA1Node.IsNull()) + { + m_checksumSHA1 = Aws::Utils::Xml::DecodeEscapedXmlText(checksumSHA1Node.GetText()); + } + XmlNode checksumSHA256Node = resultNode.FirstChild("ChecksumSHA256"); + if(!checksumSHA256Node.IsNull()) + { + m_checksumSHA256 = Aws::Utils::Xml::DecodeEscapedXmlText(checksumSHA256Node.GetText()); + } } const auto& headers = result.GetHeaderValueCollection(); diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/CompletedPart.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/CompletedPart.cpp index 8fb63ee1f3..a6bce6a9f4 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/CompletedPart.cpp +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/CompletedPart.cpp @@ -22,6 +22,10 @@ namespace Model CompletedPart::CompletedPart() : m_eTagHasBeenSet(false), + m_checksumCRC32HasBeenSet(false), + m_checksumCRC32CHasBeenSet(false), + m_checksumSHA1HasBeenSet(false), + m_checksumSHA256HasBeenSet(false), m_partNumber(0), m_partNumberHasBeenSet(false) { @@ -29,6 +33,10 @@ CompletedPart::CompletedPart() : CompletedPart::CompletedPart(const XmlNode& xmlNode) : m_eTagHasBeenSet(false), + m_checksumCRC32HasBeenSet(false), + m_checksumCRC32CHasBeenSet(false), + m_checksumSHA1HasBeenSet(false), + m_checksumSHA256HasBeenSet(false), m_partNumber(0), m_partNumberHasBeenSet(false) { @@ -47,6 +55,30 @@ CompletedPart& CompletedPart::operator =(const XmlNode& xmlNode) m_eTag = Aws::Utils::Xml::DecodeEscapedXmlText(eTagNode.GetText()); m_eTagHasBeenSet = true; } + XmlNode checksumCRC32Node = resultNode.FirstChild("ChecksumCRC32"); + if(!checksumCRC32Node.IsNull()) + { + m_checksumCRC32 = Aws::Utils::Xml::DecodeEscapedXmlText(checksumCRC32Node.GetText()); + m_checksumCRC32HasBeenSet = true; + } + XmlNode checksumCRC32CNode = resultNode.FirstChild("ChecksumCRC32C"); + if(!checksumCRC32CNode.IsNull()) + { + m_checksumCRC32C = Aws::Utils::Xml::DecodeEscapedXmlText(checksumCRC32CNode.GetText()); + m_checksumCRC32CHasBeenSet = true; + } + XmlNode checksumSHA1Node = resultNode.FirstChild("ChecksumSHA1"); + if(!checksumSHA1Node.IsNull()) + { + m_checksumSHA1 = Aws::Utils::Xml::DecodeEscapedXmlText(checksumSHA1Node.GetText()); + m_checksumSHA1HasBeenSet = true; + } + XmlNode checksumSHA256Node = resultNode.FirstChild("ChecksumSHA256"); + if(!checksumSHA256Node.IsNull()) + { + m_checksumSHA256 = Aws::Utils::Xml::DecodeEscapedXmlText(checksumSHA256Node.GetText()); + m_checksumSHA256HasBeenSet = true; + } XmlNode partNumberNode = resultNode.FirstChild("PartNumber"); if(!partNumberNode.IsNull()) { @@ -67,6 +99,30 @@ void CompletedPart::AddToNode(XmlNode& parentNode) const eTagNode.SetText(m_eTag); } + if(m_checksumCRC32HasBeenSet) + { + XmlNode checksumCRC32Node = parentNode.CreateChildElement("ChecksumCRC32"); + checksumCRC32Node.SetText(m_checksumCRC32); + } + + if(m_checksumCRC32CHasBeenSet) + { + XmlNode checksumCRC32CNode = parentNode.CreateChildElement("ChecksumCRC32C"); + checksumCRC32CNode.SetText(m_checksumCRC32C); + } + + if(m_checksumSHA1HasBeenSet) + { + XmlNode checksumSHA1Node = parentNode.CreateChildElement("ChecksumSHA1"); + checksumSHA1Node.SetText(m_checksumSHA1); + } + + if(m_checksumSHA256HasBeenSet) + { + XmlNode checksumSHA256Node = parentNode.CreateChildElement("ChecksumSHA256"); + checksumSHA256Node.SetText(m_checksumSHA256); + } + if(m_partNumberHasBeenSet) { XmlNode partNumberNode = parentNode.CreateChildElement("PartNumber"); diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/CopyObjectRequest.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/CopyObjectRequest.cpp index 94493cfdcf..e4e1b52819 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/CopyObjectRequest.cpp +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/CopyObjectRequest.cpp @@ -21,6 +21,8 @@ CopyObjectRequest::CopyObjectRequest() : m_aCLHasBeenSet(false), m_bucketHasBeenSet(false), m_cacheControlHasBeenSet(false), + m_checksumAlgorithm(ChecksumAlgorithm::NOT_SET), + m_checksumAlgorithmHasBeenSet(false), m_contentDispositionHasBeenSet(false), m_contentEncodingHasBeenSet(false), m_contentLanguageHasBeenSet(false), @@ -70,6 +72,28 @@ CopyObjectRequest::CopyObjectRequest() : { } +bool CopyObjectRequest::HasEmbeddedError(Aws::IOStream &body, + const Aws::Http::HeaderValueCollection &header) const +{ + // Header is unused + (void) header; + + auto readPointer = body.tellg(); + XmlDocument doc = XmlDocument::CreateFromXmlStream(body); + + if (!doc.WasParseSuccessful()) { + body.seekg(readPointer); + return false; + } + + if (doc.GetRootElement().GetName() == "Error") { + body.seekg(readPointer); + return true; + } + body.seekg(readPointer); + return false; +} + Aws::String CopyObjectRequest::SerializePayload() const { return {}; @@ -113,6 +137,11 @@ Aws::Http::HeaderValueCollection CopyObjectRequest::GetRequestSpecificHeaders() ss.str(""); } + if(m_checksumAlgorithmHasBeenSet) + { + headers.emplace("x-amz-checksum-algorithm", ChecksumAlgorithmMapper::GetNameForChecksumAlgorithm(m_checksumAlgorithm)); + } + if(m_contentDispositionHasBeenSet) { ss << m_contentDisposition; @@ -157,7 +186,7 @@ Aws::Http::HeaderValueCollection CopyObjectRequest::GetRequestSpecificHeaders() if(m_copySourceIfModifiedSinceHasBeenSet) { - headers.emplace("x-amz-copy-source-if-modified-since", m_copySourceIfModifiedSince.ToGmtString(DateFormat::RFC822)); + headers.emplace("x-amz-copy-source-if-modified-since", m_copySourceIfModifiedSince.ToGmtString(Aws::Utils::DateFormat::RFC822)); } if(m_copySourceIfNoneMatchHasBeenSet) @@ -169,12 +198,12 @@ Aws::Http::HeaderValueCollection CopyObjectRequest::GetRequestSpecificHeaders() if(m_copySourceIfUnmodifiedSinceHasBeenSet) { - headers.emplace("x-amz-copy-source-if-unmodified-since", m_copySourceIfUnmodifiedSince.ToGmtString(DateFormat::RFC822)); + headers.emplace("x-amz-copy-source-if-unmodified-since", m_copySourceIfUnmodifiedSince.ToGmtString(Aws::Utils::DateFormat::RFC822)); } if(m_expiresHasBeenSet) { - headers.emplace("expires", m_expires.ToGmtString(DateFormat::RFC822)); + headers.emplace("expires", m_expires.ToGmtString(Aws::Utils::DateFormat::RFC822)); } if(m_grantFullControlHasBeenSet) @@ -324,7 +353,7 @@ Aws::Http::HeaderValueCollection CopyObjectRequest::GetRequestSpecificHeaders() if(m_objectLockRetainUntilDateHasBeenSet) { - headers.emplace("x-amz-object-lock-retain-until-date", m_objectLockRetainUntilDate.ToGmtString(DateFormat::ISO_8601)); + headers.emplace("x-amz-object-lock-retain-until-date", m_objectLockRetainUntilDate.ToGmtString(Aws::Utils::DateFormat::ISO_8601)); } if(m_objectLockLegalHoldStatusHasBeenSet) @@ -348,3 +377,13 @@ Aws::Http::HeaderValueCollection CopyObjectRequest::GetRequestSpecificHeaders() return headers; } + +CopyObjectRequest::EndpointParameters CopyObjectRequest::GetEndpointContextParams() const +{ + EndpointParameters parameters; + // Operation context parameters + if (BucketHasBeenSet()) { + parameters.emplace_back(Aws::String("Bucket"), this->GetBucket(), Aws::Endpoint::EndpointParameter::ParameterOrigin::OPERATION_CONTEXT); + } + return parameters; +} diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/CopyObjectResultDetails.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/CopyObjectResultDetails.cpp index 6e03159046..313d2cde14 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/CopyObjectResultDetails.cpp +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/CopyObjectResultDetails.cpp @@ -22,13 +22,21 @@ namespace Model CopyObjectResultDetails::CopyObjectResultDetails() : m_eTagHasBeenSet(false), - m_lastModifiedHasBeenSet(false) + m_lastModifiedHasBeenSet(false), + m_checksumCRC32HasBeenSet(false), + m_checksumCRC32CHasBeenSet(false), + m_checksumSHA1HasBeenSet(false), + m_checksumSHA256HasBeenSet(false) { } CopyObjectResultDetails::CopyObjectResultDetails(const XmlNode& xmlNode) : m_eTagHasBeenSet(false), - m_lastModifiedHasBeenSet(false) + m_lastModifiedHasBeenSet(false), + m_checksumCRC32HasBeenSet(false), + m_checksumCRC32CHasBeenSet(false), + m_checksumSHA1HasBeenSet(false), + m_checksumSHA256HasBeenSet(false) { *this = xmlNode; } @@ -48,9 +56,33 @@ CopyObjectResultDetails& CopyObjectResultDetails::operator =(const XmlNode& xmlN XmlNode lastModifiedNode = resultNode.FirstChild("LastModified"); if(!lastModifiedNode.IsNull()) { - m_lastModified = DateTime(StringUtils::Trim(Aws::Utils::Xml::DecodeEscapedXmlText(lastModifiedNode.GetText()).c_str()).c_str(), DateFormat::ISO_8601); + m_lastModified = DateTime(StringUtils::Trim(Aws::Utils::Xml::DecodeEscapedXmlText(lastModifiedNode.GetText()).c_str()).c_str(), Aws::Utils::DateFormat::ISO_8601); m_lastModifiedHasBeenSet = true; } + XmlNode checksumCRC32Node = resultNode.FirstChild("ChecksumCRC32"); + if(!checksumCRC32Node.IsNull()) + { + m_checksumCRC32 = Aws::Utils::Xml::DecodeEscapedXmlText(checksumCRC32Node.GetText()); + m_checksumCRC32HasBeenSet = true; + } + XmlNode checksumCRC32CNode = resultNode.FirstChild("ChecksumCRC32C"); + if(!checksumCRC32CNode.IsNull()) + { + m_checksumCRC32C = Aws::Utils::Xml::DecodeEscapedXmlText(checksumCRC32CNode.GetText()); + m_checksumCRC32CHasBeenSet = true; + } + XmlNode checksumSHA1Node = resultNode.FirstChild("ChecksumSHA1"); + if(!checksumSHA1Node.IsNull()) + { + m_checksumSHA1 = Aws::Utils::Xml::DecodeEscapedXmlText(checksumSHA1Node.GetText()); + m_checksumSHA1HasBeenSet = true; + } + XmlNode checksumSHA256Node = resultNode.FirstChild("ChecksumSHA256"); + if(!checksumSHA256Node.IsNull()) + { + m_checksumSHA256 = Aws::Utils::Xml::DecodeEscapedXmlText(checksumSHA256Node.GetText()); + m_checksumSHA256HasBeenSet = true; + } } return *this; @@ -68,7 +100,31 @@ void CopyObjectResultDetails::AddToNode(XmlNode& parentNode) const if(m_lastModifiedHasBeenSet) { XmlNode lastModifiedNode = parentNode.CreateChildElement("LastModified"); - lastModifiedNode.SetText(m_lastModified.ToGmtString(DateFormat::ISO_8601)); + lastModifiedNode.SetText(m_lastModified.ToGmtString(Aws::Utils::DateFormat::ISO_8601)); + } + + if(m_checksumCRC32HasBeenSet) + { + XmlNode checksumCRC32Node = parentNode.CreateChildElement("ChecksumCRC32"); + checksumCRC32Node.SetText(m_checksumCRC32); + } + + if(m_checksumCRC32CHasBeenSet) + { + XmlNode checksumCRC32CNode = parentNode.CreateChildElement("ChecksumCRC32C"); + checksumCRC32CNode.SetText(m_checksumCRC32C); + } + + if(m_checksumSHA1HasBeenSet) + { + XmlNode checksumSHA1Node = parentNode.CreateChildElement("ChecksumSHA1"); + checksumSHA1Node.SetText(m_checksumSHA1); + } + + if(m_checksumSHA256HasBeenSet) + { + XmlNode checksumSHA256Node = parentNode.CreateChildElement("ChecksumSHA256"); + checksumSHA256Node.SetText(m_checksumSHA256); } } diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/CopyPartResult.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/CopyPartResult.cpp index f8f5c9809c..6c8f942caf 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/CopyPartResult.cpp +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/CopyPartResult.cpp @@ -22,13 +22,21 @@ namespace Model CopyPartResult::CopyPartResult() : m_eTagHasBeenSet(false), - m_lastModifiedHasBeenSet(false) + m_lastModifiedHasBeenSet(false), + m_checksumCRC32HasBeenSet(false), + m_checksumCRC32CHasBeenSet(false), + m_checksumSHA1HasBeenSet(false), + m_checksumSHA256HasBeenSet(false) { } CopyPartResult::CopyPartResult(const XmlNode& xmlNode) : m_eTagHasBeenSet(false), - m_lastModifiedHasBeenSet(false) + m_lastModifiedHasBeenSet(false), + m_checksumCRC32HasBeenSet(false), + m_checksumCRC32CHasBeenSet(false), + m_checksumSHA1HasBeenSet(false), + m_checksumSHA256HasBeenSet(false) { *this = xmlNode; } @@ -48,9 +56,33 @@ CopyPartResult& CopyPartResult::operator =(const XmlNode& xmlNode) XmlNode lastModifiedNode = resultNode.FirstChild("LastModified"); if(!lastModifiedNode.IsNull()) { - m_lastModified = DateTime(StringUtils::Trim(Aws::Utils::Xml::DecodeEscapedXmlText(lastModifiedNode.GetText()).c_str()).c_str(), DateFormat::ISO_8601); + m_lastModified = DateTime(StringUtils::Trim(Aws::Utils::Xml::DecodeEscapedXmlText(lastModifiedNode.GetText()).c_str()).c_str(), Aws::Utils::DateFormat::ISO_8601); m_lastModifiedHasBeenSet = true; } + XmlNode checksumCRC32Node = resultNode.FirstChild("ChecksumCRC32"); + if(!checksumCRC32Node.IsNull()) + { + m_checksumCRC32 = Aws::Utils::Xml::DecodeEscapedXmlText(checksumCRC32Node.GetText()); + m_checksumCRC32HasBeenSet = true; + } + XmlNode checksumCRC32CNode = resultNode.FirstChild("ChecksumCRC32C"); + if(!checksumCRC32CNode.IsNull()) + { + m_checksumCRC32C = Aws::Utils::Xml::DecodeEscapedXmlText(checksumCRC32CNode.GetText()); + m_checksumCRC32CHasBeenSet = true; + } + XmlNode checksumSHA1Node = resultNode.FirstChild("ChecksumSHA1"); + if(!checksumSHA1Node.IsNull()) + { + m_checksumSHA1 = Aws::Utils::Xml::DecodeEscapedXmlText(checksumSHA1Node.GetText()); + m_checksumSHA1HasBeenSet = true; + } + XmlNode checksumSHA256Node = resultNode.FirstChild("ChecksumSHA256"); + if(!checksumSHA256Node.IsNull()) + { + m_checksumSHA256 = Aws::Utils::Xml::DecodeEscapedXmlText(checksumSHA256Node.GetText()); + m_checksumSHA256HasBeenSet = true; + } } return *this; @@ -68,7 +100,31 @@ void CopyPartResult::AddToNode(XmlNode& parentNode) const if(m_lastModifiedHasBeenSet) { XmlNode lastModifiedNode = parentNode.CreateChildElement("LastModified"); - lastModifiedNode.SetText(m_lastModified.ToGmtString(DateFormat::ISO_8601)); + lastModifiedNode.SetText(m_lastModified.ToGmtString(Aws::Utils::DateFormat::ISO_8601)); + } + + if(m_checksumCRC32HasBeenSet) + { + XmlNode checksumCRC32Node = parentNode.CreateChildElement("ChecksumCRC32"); + checksumCRC32Node.SetText(m_checksumCRC32); + } + + if(m_checksumCRC32CHasBeenSet) + { + XmlNode checksumCRC32CNode = parentNode.CreateChildElement("ChecksumCRC32C"); + checksumCRC32CNode.SetText(m_checksumCRC32C); + } + + if(m_checksumSHA1HasBeenSet) + { + XmlNode checksumSHA1Node = parentNode.CreateChildElement("ChecksumSHA1"); + checksumSHA1Node.SetText(m_checksumSHA1); + } + + if(m_checksumSHA256HasBeenSet) + { + XmlNode checksumSHA256Node = parentNode.CreateChildElement("ChecksumSHA256"); + checksumSHA256Node.SetText(m_checksumSHA256); } } diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/CreateBucketRequest.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/CreateBucketRequest.cpp index 0bc3641a33..5e8ade4bdf 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/CreateBucketRequest.cpp +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/CreateBucketRequest.cpp @@ -28,6 +28,8 @@ CreateBucketRequest::CreateBucketRequest() : m_grantWriteACPHasBeenSet(false), m_objectLockEnabledForBucket(false), m_objectLockEnabledForBucketHasBeenSet(false), + m_objectOwnership(ObjectOwnership::NOT_SET), + m_objectOwnershipHasBeenSet(false), m_customizedAccessLogTagHasBeenSet(false) { } @@ -121,5 +123,22 @@ Aws::Http::HeaderValueCollection CreateBucketRequest::GetRequestSpecificHeaders( ss.str(""); } + if(m_objectOwnershipHasBeenSet) + { + headers.emplace("x-amz-object-ownership", ObjectOwnershipMapper::GetNameForObjectOwnership(m_objectOwnership)); + } + return headers; } + +CreateBucketRequest::EndpointParameters CreateBucketRequest::GetEndpointContextParams() const +{ + EndpointParameters parameters; + // Static context parameters + parameters.emplace_back(Aws::String("DisableAccessPoints"), true, Aws::Endpoint::EndpointParameter::ParameterOrigin::STATIC_CONTEXT); + // Operation context parameters + if (BucketHasBeenSet()) { + parameters.emplace_back(Aws::String("Bucket"), this->GetBucket(), Aws::Endpoint::EndpointParameter::ParameterOrigin::OPERATION_CONTEXT); + } + return parameters; +} diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/CreateMultipartUploadRequest.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/CreateMultipartUploadRequest.cpp index 73a88bf2dc..2db712e113 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/CreateMultipartUploadRequest.cpp +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/CreateMultipartUploadRequest.cpp @@ -53,6 +53,8 @@ CreateMultipartUploadRequest::CreateMultipartUploadRequest() : m_objectLockLegalHoldStatus(ObjectLockLegalHoldStatus::NOT_SET), m_objectLockLegalHoldStatusHasBeenSet(false), m_expectedBucketOwnerHasBeenSet(false), + m_checksumAlgorithm(ChecksumAlgorithm::NOT_SET), + m_checksumAlgorithmHasBeenSet(false), m_customizedAccessLogTagHasBeenSet(false) { } @@ -130,7 +132,7 @@ Aws::Http::HeaderValueCollection CreateMultipartUploadRequest::GetRequestSpecifi if(m_expiresHasBeenSet) { - headers.emplace("expires", m_expires.ToGmtString(DateFormat::RFC822)); + headers.emplace("expires", m_expires.ToGmtString(Aws::Utils::DateFormat::RFC822)); } if(m_grantFullControlHasBeenSet) @@ -249,7 +251,7 @@ Aws::Http::HeaderValueCollection CreateMultipartUploadRequest::GetRequestSpecifi if(m_objectLockRetainUntilDateHasBeenSet) { - headers.emplace("x-amz-object-lock-retain-until-date", m_objectLockRetainUntilDate.ToGmtString(DateFormat::ISO_8601)); + headers.emplace("x-amz-object-lock-retain-until-date", m_objectLockRetainUntilDate.ToGmtString(Aws::Utils::DateFormat::ISO_8601)); } if(m_objectLockLegalHoldStatusHasBeenSet) @@ -264,5 +266,20 @@ Aws::Http::HeaderValueCollection CreateMultipartUploadRequest::GetRequestSpecifi ss.str(""); } + if(m_checksumAlgorithmHasBeenSet) + { + headers.emplace("x-amz-checksum-algorithm", ChecksumAlgorithmMapper::GetNameForChecksumAlgorithm(m_checksumAlgorithm)); + } + return headers; } + +CreateMultipartUploadRequest::EndpointParameters CreateMultipartUploadRequest::GetEndpointContextParams() const +{ + EndpointParameters parameters; + // Operation context parameters + if (BucketHasBeenSet()) { + parameters.emplace_back(Aws::String("Bucket"), this->GetBucket(), Aws::Endpoint::EndpointParameter::ParameterOrigin::OPERATION_CONTEXT); + } + return parameters; +} diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/CreateMultipartUploadResult.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/CreateMultipartUploadResult.cpp index 4a2772c9ef..d77d44d362 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/CreateMultipartUploadResult.cpp +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/CreateMultipartUploadResult.cpp @@ -19,14 +19,16 @@ using namespace Aws; CreateMultipartUploadResult::CreateMultipartUploadResult() : m_serverSideEncryption(ServerSideEncryption::NOT_SET), m_bucketKeyEnabled(false), - m_requestCharged(RequestCharged::NOT_SET) + m_requestCharged(RequestCharged::NOT_SET), + m_checksumAlgorithm(ChecksumAlgorithm::NOT_SET) { } CreateMultipartUploadResult::CreateMultipartUploadResult(const Aws::AmazonWebServiceResult<XmlDocument>& result) : m_serverSideEncryption(ServerSideEncryption::NOT_SET), m_bucketKeyEnabled(false), - m_requestCharged(RequestCharged::NOT_SET) + m_requestCharged(RequestCharged::NOT_SET), + m_checksumAlgorithm(ChecksumAlgorithm::NOT_SET) { *this = result; } @@ -59,7 +61,7 @@ CreateMultipartUploadResult& CreateMultipartUploadResult::operator =(const Aws:: const auto& abortDateIter = headers.find("x-amz-abort-date"); if(abortDateIter != headers.end()) { - m_abortDate = DateTime(abortDateIter->second, DateFormat::RFC822); + m_abortDate = DateTime(abortDateIter->second, Aws::Utils::DateFormat::RFC822); } const auto& abortRuleIdIter = headers.find("x-amz-abort-rule-id"); @@ -110,5 +112,11 @@ CreateMultipartUploadResult& CreateMultipartUploadResult::operator =(const Aws:: m_requestCharged = RequestChargedMapper::GetRequestChargedForName(requestChargedIter->second); } + const auto& checksumAlgorithmIter = headers.find("x-amz-checksum-algorithm"); + if(checksumAlgorithmIter != headers.end()) + { + m_checksumAlgorithm = ChecksumAlgorithmMapper::GetChecksumAlgorithmForName(checksumAlgorithmIter->second); + } + return *this; } diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/DeleteBucketAnalyticsConfigurationRequest.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/DeleteBucketAnalyticsConfigurationRequest.cpp index bcd1e8f320..721721bf25 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/DeleteBucketAnalyticsConfigurationRequest.cpp +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/DeleteBucketAnalyticsConfigurationRequest.cpp @@ -71,3 +71,13 @@ Aws::Http::HeaderValueCollection DeleteBucketAnalyticsConfigurationRequest::GetR return headers; } + +DeleteBucketAnalyticsConfigurationRequest::EndpointParameters DeleteBucketAnalyticsConfigurationRequest::GetEndpointContextParams() const +{ + EndpointParameters parameters; + // Operation context parameters + if (BucketHasBeenSet()) { + parameters.emplace_back(Aws::String("Bucket"), this->GetBucket(), Aws::Endpoint::EndpointParameter::ParameterOrigin::OPERATION_CONTEXT); + } + return parameters; +} diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/DeleteBucketCorsRequest.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/DeleteBucketCorsRequest.cpp index b52d99571a..9eb64d50c1 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/DeleteBucketCorsRequest.cpp +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/DeleteBucketCorsRequest.cpp @@ -63,3 +63,13 @@ Aws::Http::HeaderValueCollection DeleteBucketCorsRequest::GetRequestSpecificHead return headers; } + +DeleteBucketCorsRequest::EndpointParameters DeleteBucketCorsRequest::GetEndpointContextParams() const +{ + EndpointParameters parameters; + // Operation context parameters + if (BucketHasBeenSet()) { + parameters.emplace_back(Aws::String("Bucket"), this->GetBucket(), Aws::Endpoint::EndpointParameter::ParameterOrigin::OPERATION_CONTEXT); + } + return parameters; +} diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/DeleteBucketEncryptionRequest.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/DeleteBucketEncryptionRequest.cpp index 3e01a0b9dc..cbd8f93536 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/DeleteBucketEncryptionRequest.cpp +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/DeleteBucketEncryptionRequest.cpp @@ -63,3 +63,13 @@ Aws::Http::HeaderValueCollection DeleteBucketEncryptionRequest::GetRequestSpecif return headers; } + +DeleteBucketEncryptionRequest::EndpointParameters DeleteBucketEncryptionRequest::GetEndpointContextParams() const +{ + EndpointParameters parameters; + // Operation context parameters + if (BucketHasBeenSet()) { + parameters.emplace_back(Aws::String("Bucket"), this->GetBucket(), Aws::Endpoint::EndpointParameter::ParameterOrigin::OPERATION_CONTEXT); + } + return parameters; +} diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/DeleteBucketIntelligentTieringConfigurationRequest.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/DeleteBucketIntelligentTieringConfigurationRequest.cpp index b48d573ee6..52855aeaa7 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/DeleteBucketIntelligentTieringConfigurationRequest.cpp +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/DeleteBucketIntelligentTieringConfigurationRequest.cpp @@ -57,3 +57,13 @@ void DeleteBucketIntelligentTieringConfigurationRequest::AddQueryStringParameter } } + +DeleteBucketIntelligentTieringConfigurationRequest::EndpointParameters DeleteBucketIntelligentTieringConfigurationRequest::GetEndpointContextParams() const +{ + EndpointParameters parameters; + // Operation context parameters + if (BucketHasBeenSet()) { + parameters.emplace_back(Aws::String("Bucket"), this->GetBucket(), Aws::Endpoint::EndpointParameter::ParameterOrigin::OPERATION_CONTEXT); + } + return parameters; +} diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/DeleteBucketInventoryConfigurationRequest.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/DeleteBucketInventoryConfigurationRequest.cpp index 7bc2d179d6..2f421dac17 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/DeleteBucketInventoryConfigurationRequest.cpp +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/DeleteBucketInventoryConfigurationRequest.cpp @@ -71,3 +71,13 @@ Aws::Http::HeaderValueCollection DeleteBucketInventoryConfigurationRequest::GetR return headers; } + +DeleteBucketInventoryConfigurationRequest::EndpointParameters DeleteBucketInventoryConfigurationRequest::GetEndpointContextParams() const +{ + EndpointParameters parameters; + // Operation context parameters + if (BucketHasBeenSet()) { + parameters.emplace_back(Aws::String("Bucket"), this->GetBucket(), Aws::Endpoint::EndpointParameter::ParameterOrigin::OPERATION_CONTEXT); + } + return parameters; +} diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/DeleteBucketLifecycleRequest.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/DeleteBucketLifecycleRequest.cpp index 54311cff3e..b8afa094ff 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/DeleteBucketLifecycleRequest.cpp +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/DeleteBucketLifecycleRequest.cpp @@ -63,3 +63,13 @@ Aws::Http::HeaderValueCollection DeleteBucketLifecycleRequest::GetRequestSpecifi return headers; } + +DeleteBucketLifecycleRequest::EndpointParameters DeleteBucketLifecycleRequest::GetEndpointContextParams() const +{ + EndpointParameters parameters; + // Operation context parameters + if (BucketHasBeenSet()) { + parameters.emplace_back(Aws::String("Bucket"), this->GetBucket(), Aws::Endpoint::EndpointParameter::ParameterOrigin::OPERATION_CONTEXT); + } + return parameters; +} diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/DeleteBucketMetricsConfigurationRequest.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/DeleteBucketMetricsConfigurationRequest.cpp index 631dee94a7..29f50338ab 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/DeleteBucketMetricsConfigurationRequest.cpp +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/DeleteBucketMetricsConfigurationRequest.cpp @@ -71,3 +71,13 @@ Aws::Http::HeaderValueCollection DeleteBucketMetricsConfigurationRequest::GetReq return headers; } + +DeleteBucketMetricsConfigurationRequest::EndpointParameters DeleteBucketMetricsConfigurationRequest::GetEndpointContextParams() const +{ + EndpointParameters parameters; + // Operation context parameters + if (BucketHasBeenSet()) { + parameters.emplace_back(Aws::String("Bucket"), this->GetBucket(), Aws::Endpoint::EndpointParameter::ParameterOrigin::OPERATION_CONTEXT); + } + return parameters; +} diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/DeleteBucketOwnershipControlsRequest.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/DeleteBucketOwnershipControlsRequest.cpp index 5b18b12424..4ed933cda9 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/DeleteBucketOwnershipControlsRequest.cpp +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/DeleteBucketOwnershipControlsRequest.cpp @@ -63,3 +63,13 @@ Aws::Http::HeaderValueCollection DeleteBucketOwnershipControlsRequest::GetReques return headers; } + +DeleteBucketOwnershipControlsRequest::EndpointParameters DeleteBucketOwnershipControlsRequest::GetEndpointContextParams() const +{ + EndpointParameters parameters; + // Operation context parameters + if (BucketHasBeenSet()) { + parameters.emplace_back(Aws::String("Bucket"), this->GetBucket(), Aws::Endpoint::EndpointParameter::ParameterOrigin::OPERATION_CONTEXT); + } + return parameters; +} diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/DeleteBucketPolicyRequest.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/DeleteBucketPolicyRequest.cpp index 33bb2cef34..b9bda713ca 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/DeleteBucketPolicyRequest.cpp +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/DeleteBucketPolicyRequest.cpp @@ -63,3 +63,13 @@ Aws::Http::HeaderValueCollection DeleteBucketPolicyRequest::GetRequestSpecificHe return headers; } + +DeleteBucketPolicyRequest::EndpointParameters DeleteBucketPolicyRequest::GetEndpointContextParams() const +{ + EndpointParameters parameters; + // Operation context parameters + if (BucketHasBeenSet()) { + parameters.emplace_back(Aws::String("Bucket"), this->GetBucket(), Aws::Endpoint::EndpointParameter::ParameterOrigin::OPERATION_CONTEXT); + } + return parameters; +} diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/DeleteBucketReplicationRequest.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/DeleteBucketReplicationRequest.cpp index af6092ee6c..0bcdf577cf 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/DeleteBucketReplicationRequest.cpp +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/DeleteBucketReplicationRequest.cpp @@ -63,3 +63,13 @@ Aws::Http::HeaderValueCollection DeleteBucketReplicationRequest::GetRequestSpeci return headers; } + +DeleteBucketReplicationRequest::EndpointParameters DeleteBucketReplicationRequest::GetEndpointContextParams() const +{ + EndpointParameters parameters; + // Operation context parameters + if (BucketHasBeenSet()) { + parameters.emplace_back(Aws::String("Bucket"), this->GetBucket(), Aws::Endpoint::EndpointParameter::ParameterOrigin::OPERATION_CONTEXT); + } + return parameters; +} diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/DeleteBucketRequest.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/DeleteBucketRequest.cpp index 3cfa02d882..fe34195378 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/DeleteBucketRequest.cpp +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/DeleteBucketRequest.cpp @@ -63,3 +63,13 @@ Aws::Http::HeaderValueCollection DeleteBucketRequest::GetRequestSpecificHeaders( return headers; } + +DeleteBucketRequest::EndpointParameters DeleteBucketRequest::GetEndpointContextParams() const +{ + EndpointParameters parameters; + // Operation context parameters + if (BucketHasBeenSet()) { + parameters.emplace_back(Aws::String("Bucket"), this->GetBucket(), Aws::Endpoint::EndpointParameter::ParameterOrigin::OPERATION_CONTEXT); + } + return parameters; +} diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/DeleteBucketTaggingRequest.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/DeleteBucketTaggingRequest.cpp index 7d61b959f5..5df949880a 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/DeleteBucketTaggingRequest.cpp +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/DeleteBucketTaggingRequest.cpp @@ -63,3 +63,13 @@ Aws::Http::HeaderValueCollection DeleteBucketTaggingRequest::GetRequestSpecificH return headers; } + +DeleteBucketTaggingRequest::EndpointParameters DeleteBucketTaggingRequest::GetEndpointContextParams() const +{ + EndpointParameters parameters; + // Operation context parameters + if (BucketHasBeenSet()) { + parameters.emplace_back(Aws::String("Bucket"), this->GetBucket(), Aws::Endpoint::EndpointParameter::ParameterOrigin::OPERATION_CONTEXT); + } + return parameters; +} diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/DeleteBucketWebsiteRequest.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/DeleteBucketWebsiteRequest.cpp index 59bc58a8d7..2a7b23cfb6 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/DeleteBucketWebsiteRequest.cpp +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/DeleteBucketWebsiteRequest.cpp @@ -63,3 +63,13 @@ Aws::Http::HeaderValueCollection DeleteBucketWebsiteRequest::GetRequestSpecificH return headers; } + +DeleteBucketWebsiteRequest::EndpointParameters DeleteBucketWebsiteRequest::GetEndpointContextParams() const +{ + EndpointParameters parameters; + // Operation context parameters + if (BucketHasBeenSet()) { + parameters.emplace_back(Aws::String("Bucket"), this->GetBucket(), Aws::Endpoint::EndpointParameter::ParameterOrigin::OPERATION_CONTEXT); + } + return parameters; +} diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/DeleteMarkerEntry.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/DeleteMarkerEntry.cpp index 05766bb960..25ea77fa9b 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/DeleteMarkerEntry.cpp +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/DeleteMarkerEntry.cpp @@ -74,7 +74,7 @@ DeleteMarkerEntry& DeleteMarkerEntry::operator =(const XmlNode& xmlNode) XmlNode lastModifiedNode = resultNode.FirstChild("LastModified"); if(!lastModifiedNode.IsNull()) { - m_lastModified = DateTime(StringUtils::Trim(Aws::Utils::Xml::DecodeEscapedXmlText(lastModifiedNode.GetText()).c_str()).c_str(), DateFormat::ISO_8601); + m_lastModified = DateTime(StringUtils::Trim(Aws::Utils::Xml::DecodeEscapedXmlText(lastModifiedNode.GetText()).c_str()).c_str(), Aws::Utils::DateFormat::ISO_8601); m_lastModifiedHasBeenSet = true; } } @@ -114,7 +114,7 @@ void DeleteMarkerEntry::AddToNode(XmlNode& parentNode) const if(m_lastModifiedHasBeenSet) { XmlNode lastModifiedNode = parentNode.CreateChildElement("LastModified"); - lastModifiedNode.SetText(m_lastModified.ToGmtString(DateFormat::ISO_8601)); + lastModifiedNode.SetText(m_lastModified.ToGmtString(Aws::Utils::DateFormat::ISO_8601)); } } diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/DeleteObjectRequest.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/DeleteObjectRequest.cpp index 6bd83e7cbe..6a27dbf097 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/DeleteObjectRequest.cpp +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/DeleteObjectRequest.cpp @@ -96,3 +96,13 @@ Aws::Http::HeaderValueCollection DeleteObjectRequest::GetRequestSpecificHeaders( return headers; } + +DeleteObjectRequest::EndpointParameters DeleteObjectRequest::GetEndpointContextParams() const +{ + EndpointParameters parameters; + // Operation context parameters + if (BucketHasBeenSet()) { + parameters.emplace_back(Aws::String("Bucket"), this->GetBucket(), Aws::Endpoint::EndpointParameter::ParameterOrigin::OPERATION_CONTEXT); + } + return parameters; +} diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/DeleteObjectTaggingRequest.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/DeleteObjectTaggingRequest.cpp index 580a7fa70b..5d19b31c49 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/DeleteObjectTaggingRequest.cpp +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/DeleteObjectTaggingRequest.cpp @@ -72,3 +72,13 @@ Aws::Http::HeaderValueCollection DeleteObjectTaggingRequest::GetRequestSpecificH return headers; } + +DeleteObjectTaggingRequest::EndpointParameters DeleteObjectTaggingRequest::GetEndpointContextParams() const +{ + EndpointParameters parameters; + // Operation context parameters + if (BucketHasBeenSet()) { + parameters.emplace_back(Aws::String("Bucket"), this->GetBucket(), Aws::Endpoint::EndpointParameter::ParameterOrigin::OPERATION_CONTEXT); + } + return parameters; +} diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/DeleteObjectsRequest.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/DeleteObjectsRequest.cpp index 3f7759ca0a..1b1841fe8b 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/DeleteObjectsRequest.cpp +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/DeleteObjectsRequest.cpp @@ -25,6 +25,8 @@ DeleteObjectsRequest::DeleteObjectsRequest() : m_bypassGovernanceRetention(false), m_bypassGovernanceRetentionHasBeenSet(false), m_expectedBucketOwnerHasBeenSet(false), + m_checksumAlgorithm(ChecksumAlgorithm::NOT_SET), + m_checksumAlgorithmHasBeenSet(false), m_customizedAccessLogTagHasBeenSet(false) { } @@ -97,5 +99,33 @@ Aws::Http::HeaderValueCollection DeleteObjectsRequest::GetRequestSpecificHeaders ss.str(""); } + if(m_checksumAlgorithmHasBeenSet) + { + headers.emplace("x-amz-sdk-checksum-algorithm", ChecksumAlgorithmMapper::GetNameForChecksumAlgorithm(m_checksumAlgorithm)); + } + return headers; } + +DeleteObjectsRequest::EndpointParameters DeleteObjectsRequest::GetEndpointContextParams() const +{ + EndpointParameters parameters; + // Operation context parameters + if (BucketHasBeenSet()) { + parameters.emplace_back(Aws::String("Bucket"), this->GetBucket(), Aws::Endpoint::EndpointParameter::ParameterOrigin::OPERATION_CONTEXT); + } + return parameters; +} + +Aws::String DeleteObjectsRequest::GetChecksumAlgorithmName() const +{ + if (m_checksumAlgorithm == ChecksumAlgorithm::NOT_SET) + { + return "md5"; + } + else + { + return ChecksumAlgorithmMapper::GetNameForChecksumAlgorithm(m_checksumAlgorithm); + } +} + diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/DeletePublicAccessBlockRequest.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/DeletePublicAccessBlockRequest.cpp index 750457f594..0f087377a7 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/DeletePublicAccessBlockRequest.cpp +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/DeletePublicAccessBlockRequest.cpp @@ -63,3 +63,13 @@ Aws::Http::HeaderValueCollection DeletePublicAccessBlockRequest::GetRequestSpeci return headers; } + +DeletePublicAccessBlockRequest::EndpointParameters DeletePublicAccessBlockRequest::GetEndpointContextParams() const +{ + EndpointParameters parameters; + // Operation context parameters + if (BucketHasBeenSet()) { + parameters.emplace_back(Aws::String("Bucket"), this->GetBucket(), Aws::Endpoint::EndpointParameter::ParameterOrigin::OPERATION_CONTEXT); + } + return parameters; +} diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/Event.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/Event.cpp index c6e779ab06..e6aa390f59 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/Event.cpp +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/Event.cpp @@ -37,6 +37,16 @@ namespace Aws static const int s3_Replication_OperationNotTracked_HASH = HashingUtils::HashString("s3:Replication:OperationNotTracked"); static const int s3_Replication_OperationMissedThreshold_HASH = HashingUtils::HashString("s3:Replication:OperationMissedThreshold"); static const int s3_Replication_OperationReplicatedAfterThreshold_HASH = HashingUtils::HashString("s3:Replication:OperationReplicatedAfterThreshold"); + static const int s3_ObjectRestore_Delete_HASH = HashingUtils::HashString("s3:ObjectRestore:Delete"); + static const int s3_LifecycleTransition_HASH = HashingUtils::HashString("s3:LifecycleTransition"); + static const int s3_IntelligentTiering_HASH = HashingUtils::HashString("s3:IntelligentTiering"); + static const int s3_ObjectAcl_Put_HASH = HashingUtils::HashString("s3:ObjectAcl:Put"); + static const int s3_LifecycleExpiration_HASH = HashingUtils::HashString("s3:LifecycleExpiration:*"); + static const int s3_LifecycleExpiration_Delete_HASH = HashingUtils::HashString("s3:LifecycleExpiration:Delete"); + static const int s3_LifecycleExpiration_DeleteMarkerCreated_HASH = HashingUtils::HashString("s3:LifecycleExpiration:DeleteMarkerCreated"); + static const int s3_ObjectTagging_HASH = HashingUtils::HashString("s3:ObjectTagging:*"); + static const int s3_ObjectTagging_Put_HASH = HashingUtils::HashString("s3:ObjectTagging:Put"); + static const int s3_ObjectTagging_Delete_HASH = HashingUtils::HashString("s3:ObjectTagging:Delete"); Event GetEventForName(const Aws::String& name) @@ -110,6 +120,46 @@ namespace Aws { return Event::s3_Replication_OperationReplicatedAfterThreshold; } + else if (hashCode == s3_ObjectRestore_Delete_HASH) + { + return Event::s3_ObjectRestore_Delete; + } + else if (hashCode == s3_LifecycleTransition_HASH) + { + return Event::s3_LifecycleTransition; + } + else if (hashCode == s3_IntelligentTiering_HASH) + { + return Event::s3_IntelligentTiering; + } + else if (hashCode == s3_ObjectAcl_Put_HASH) + { + return Event::s3_ObjectAcl_Put; + } + else if (hashCode == s3_LifecycleExpiration_HASH) + { + return Event::s3_LifecycleExpiration; + } + else if (hashCode == s3_LifecycleExpiration_Delete_HASH) + { + return Event::s3_LifecycleExpiration_Delete; + } + else if (hashCode == s3_LifecycleExpiration_DeleteMarkerCreated_HASH) + { + return Event::s3_LifecycleExpiration_DeleteMarkerCreated; + } + else if (hashCode == s3_ObjectTagging_HASH) + { + return Event::s3_ObjectTagging; + } + else if (hashCode == s3_ObjectTagging_Put_HASH) + { + return Event::s3_ObjectTagging_Put; + } + else if (hashCode == s3_ObjectTagging_Delete_HASH) + { + return Event::s3_ObjectTagging_Delete; + } EnumParseOverflowContainer* overflowContainer = Aws::GetEnumOverflowContainer(); if(overflowContainer) { @@ -158,6 +208,26 @@ namespace Aws return "s3:Replication:OperationMissedThreshold"; case Event::s3_Replication_OperationReplicatedAfterThreshold: return "s3:Replication:OperationReplicatedAfterThreshold"; + case Event::s3_ObjectRestore_Delete: + return "s3:ObjectRestore:Delete"; + case Event::s3_LifecycleTransition: + return "s3:LifecycleTransition"; + case Event::s3_IntelligentTiering: + return "s3:IntelligentTiering"; + case Event::s3_ObjectAcl_Put: + return "s3:ObjectAcl:Put"; + case Event::s3_LifecycleExpiration: + return "s3:LifecycleExpiration:*"; + case Event::s3_LifecycleExpiration_Delete: + return "s3:LifecycleExpiration:Delete"; + case Event::s3_LifecycleExpiration_DeleteMarkerCreated: + return "s3:LifecycleExpiration:DeleteMarkerCreated"; + case Event::s3_ObjectTagging: + return "s3:ObjectTagging:*"; + case Event::s3_ObjectTagging_Put: + return "s3:ObjectTagging:Put"; + case Event::s3_ObjectTagging_Delete: + return "s3:ObjectTagging:Delete"; default: EnumParseOverflowContainer* overflowContainer = Aws::GetEnumOverflowContainer(); if(overflowContainer) diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/EventBridgeConfiguration.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/EventBridgeConfiguration.cpp new file mode 100644 index 0000000000..ebf1ca13d9 --- /dev/null +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/EventBridgeConfiguration.cpp @@ -0,0 +1,51 @@ +/** + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. + * SPDX-License-Identifier: Apache-2.0. + */ + +#include <aws/s3/model/EventBridgeConfiguration.h> +#include <aws/core/utils/xml/XmlSerializer.h> +#include <aws/core/utils/StringUtils.h> +#include <aws/core/utils/memory/stl/AWSStringStream.h> + +#include <utility> + +using namespace Aws::Utils::Xml; +using namespace Aws::Utils; + +namespace Aws +{ +namespace S3 +{ +namespace Model +{ + +EventBridgeConfiguration::EventBridgeConfiguration() +{ +} + +EventBridgeConfiguration::EventBridgeConfiguration(const XmlNode& xmlNode) +{ + *this = xmlNode; +} + +EventBridgeConfiguration& EventBridgeConfiguration::operator =(const XmlNode& xmlNode) +{ + XmlNode resultNode = xmlNode; + + if(!resultNode.IsNull()) + { + } + + return *this; +} + +void EventBridgeConfiguration::AddToNode(XmlNode& parentNode) const +{ + Aws::StringStream ss; + AWS_UNREFERENCED_PARAM(parentNode); +} + +} // namespace Model +} // namespace S3 +} // namespace Aws diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetBucketAccelerateConfigurationRequest.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetBucketAccelerateConfigurationRequest.cpp index 3bc67a43cc..f144bc0c22 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetBucketAccelerateConfigurationRequest.cpp +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetBucketAccelerateConfigurationRequest.cpp @@ -63,3 +63,13 @@ Aws::Http::HeaderValueCollection GetBucketAccelerateConfigurationRequest::GetReq return headers; } + +GetBucketAccelerateConfigurationRequest::EndpointParameters GetBucketAccelerateConfigurationRequest::GetEndpointContextParams() const +{ + EndpointParameters parameters; + // Operation context parameters + if (BucketHasBeenSet()) { + parameters.emplace_back(Aws::String("Bucket"), this->GetBucket(), Aws::Endpoint::EndpointParameter::ParameterOrigin::OPERATION_CONTEXT); + } + return parameters; +} diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetBucketAclRequest.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetBucketAclRequest.cpp index df77a9e7f6..962a4eb555 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetBucketAclRequest.cpp +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetBucketAclRequest.cpp @@ -63,3 +63,13 @@ Aws::Http::HeaderValueCollection GetBucketAclRequest::GetRequestSpecificHeaders( return headers; } + +GetBucketAclRequest::EndpointParameters GetBucketAclRequest::GetEndpointContextParams() const +{ + EndpointParameters parameters; + // Operation context parameters + if (BucketHasBeenSet()) { + parameters.emplace_back(Aws::String("Bucket"), this->GetBucket(), Aws::Endpoint::EndpointParameter::ParameterOrigin::OPERATION_CONTEXT); + } + return parameters; +} diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetBucketAnalyticsConfigurationRequest.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetBucketAnalyticsConfigurationRequest.cpp index 5e3d792e2c..8dde64a2b2 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetBucketAnalyticsConfigurationRequest.cpp +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetBucketAnalyticsConfigurationRequest.cpp @@ -71,3 +71,13 @@ Aws::Http::HeaderValueCollection GetBucketAnalyticsConfigurationRequest::GetRequ return headers; } + +GetBucketAnalyticsConfigurationRequest::EndpointParameters GetBucketAnalyticsConfigurationRequest::GetEndpointContextParams() const +{ + EndpointParameters parameters; + // Operation context parameters + if (BucketHasBeenSet()) { + parameters.emplace_back(Aws::String("Bucket"), this->GetBucket(), Aws::Endpoint::EndpointParameter::ParameterOrigin::OPERATION_CONTEXT); + } + return parameters; +} diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetBucketCorsRequest.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetBucketCorsRequest.cpp index 92cc762080..2f3e70a8eb 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetBucketCorsRequest.cpp +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetBucketCorsRequest.cpp @@ -63,3 +63,13 @@ Aws::Http::HeaderValueCollection GetBucketCorsRequest::GetRequestSpecificHeaders return headers; } + +GetBucketCorsRequest::EndpointParameters GetBucketCorsRequest::GetEndpointContextParams() const +{ + EndpointParameters parameters; + // Operation context parameters + if (BucketHasBeenSet()) { + parameters.emplace_back(Aws::String("Bucket"), this->GetBucket(), Aws::Endpoint::EndpointParameter::ParameterOrigin::OPERATION_CONTEXT); + } + return parameters; +} diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetBucketEncryptionRequest.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetBucketEncryptionRequest.cpp index ad69f94035..1d679807c7 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetBucketEncryptionRequest.cpp +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetBucketEncryptionRequest.cpp @@ -63,3 +63,13 @@ Aws::Http::HeaderValueCollection GetBucketEncryptionRequest::GetRequestSpecificH return headers; } + +GetBucketEncryptionRequest::EndpointParameters GetBucketEncryptionRequest::GetEndpointContextParams() const +{ + EndpointParameters parameters; + // Operation context parameters + if (BucketHasBeenSet()) { + parameters.emplace_back(Aws::String("Bucket"), this->GetBucket(), Aws::Endpoint::EndpointParameter::ParameterOrigin::OPERATION_CONTEXT); + } + return parameters; +} diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetBucketIntelligentTieringConfigurationRequest.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetBucketIntelligentTieringConfigurationRequest.cpp index ac5e664e69..1aeb94e440 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetBucketIntelligentTieringConfigurationRequest.cpp +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetBucketIntelligentTieringConfigurationRequest.cpp @@ -57,3 +57,13 @@ void GetBucketIntelligentTieringConfigurationRequest::AddQueryStringParameters(U } } + +GetBucketIntelligentTieringConfigurationRequest::EndpointParameters GetBucketIntelligentTieringConfigurationRequest::GetEndpointContextParams() const +{ + EndpointParameters parameters; + // Operation context parameters + if (BucketHasBeenSet()) { + parameters.emplace_back(Aws::String("Bucket"), this->GetBucket(), Aws::Endpoint::EndpointParameter::ParameterOrigin::OPERATION_CONTEXT); + } + return parameters; +} diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetBucketInventoryConfigurationRequest.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetBucketInventoryConfigurationRequest.cpp index f3ec3acdc5..cf462b3fa9 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetBucketInventoryConfigurationRequest.cpp +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetBucketInventoryConfigurationRequest.cpp @@ -71,3 +71,13 @@ Aws::Http::HeaderValueCollection GetBucketInventoryConfigurationRequest::GetRequ return headers; } + +GetBucketInventoryConfigurationRequest::EndpointParameters GetBucketInventoryConfigurationRequest::GetEndpointContextParams() const +{ + EndpointParameters parameters; + // Operation context parameters + if (BucketHasBeenSet()) { + parameters.emplace_back(Aws::String("Bucket"), this->GetBucket(), Aws::Endpoint::EndpointParameter::ParameterOrigin::OPERATION_CONTEXT); + } + return parameters; +} diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetBucketLifecycleConfigurationRequest.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetBucketLifecycleConfigurationRequest.cpp index 5abc090ac4..019d5457a9 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetBucketLifecycleConfigurationRequest.cpp +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetBucketLifecycleConfigurationRequest.cpp @@ -63,3 +63,13 @@ Aws::Http::HeaderValueCollection GetBucketLifecycleConfigurationRequest::GetRequ return headers; } + +GetBucketLifecycleConfigurationRequest::EndpointParameters GetBucketLifecycleConfigurationRequest::GetEndpointContextParams() const +{ + EndpointParameters parameters; + // Operation context parameters + if (BucketHasBeenSet()) { + parameters.emplace_back(Aws::String("Bucket"), this->GetBucket(), Aws::Endpoint::EndpointParameter::ParameterOrigin::OPERATION_CONTEXT); + } + return parameters; +} diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetBucketLocationRequest.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetBucketLocationRequest.cpp index 68e7f366f6..6958be9895 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetBucketLocationRequest.cpp +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetBucketLocationRequest.cpp @@ -63,3 +63,13 @@ Aws::Http::HeaderValueCollection GetBucketLocationRequest::GetRequestSpecificHea return headers; } + +GetBucketLocationRequest::EndpointParameters GetBucketLocationRequest::GetEndpointContextParams() const +{ + EndpointParameters parameters; + // Operation context parameters + if (BucketHasBeenSet()) { + parameters.emplace_back(Aws::String("Bucket"), this->GetBucket(), Aws::Endpoint::EndpointParameter::ParameterOrigin::OPERATION_CONTEXT); + } + return parameters; +} diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetBucketLocationResult.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetBucketLocationResult.cpp index 24fc4e62b0..f748617711 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetBucketLocationResult.cpp +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetBucketLocationResult.cpp @@ -36,6 +36,5 @@ GetBucketLocationResult& GetBucketLocationResult::operator =(const AmazonWebServ m_locationConstraint = BucketLocationConstraintMapper::GetBucketLocationConstraintForName(StringUtils::Trim(resultNode.GetText().c_str()).c_str()); } - return *this; + return *this; } - diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetBucketLoggingRequest.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetBucketLoggingRequest.cpp index ee141ec35c..38a1cbd48b 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetBucketLoggingRequest.cpp +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetBucketLoggingRequest.cpp @@ -63,3 +63,13 @@ Aws::Http::HeaderValueCollection GetBucketLoggingRequest::GetRequestSpecificHead return headers; } + +GetBucketLoggingRequest::EndpointParameters GetBucketLoggingRequest::GetEndpointContextParams() const +{ + EndpointParameters parameters; + // Operation context parameters + if (BucketHasBeenSet()) { + parameters.emplace_back(Aws::String("Bucket"), this->GetBucket(), Aws::Endpoint::EndpointParameter::ParameterOrigin::OPERATION_CONTEXT); + } + return parameters; +} diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetBucketMetricsConfigurationRequest.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetBucketMetricsConfigurationRequest.cpp index c384ad6f1e..11f5eacbb6 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetBucketMetricsConfigurationRequest.cpp +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetBucketMetricsConfigurationRequest.cpp @@ -71,3 +71,13 @@ Aws::Http::HeaderValueCollection GetBucketMetricsConfigurationRequest::GetReques return headers; } + +GetBucketMetricsConfigurationRequest::EndpointParameters GetBucketMetricsConfigurationRequest::GetEndpointContextParams() const +{ + EndpointParameters parameters; + // Operation context parameters + if (BucketHasBeenSet()) { + parameters.emplace_back(Aws::String("Bucket"), this->GetBucket(), Aws::Endpoint::EndpointParameter::ParameterOrigin::OPERATION_CONTEXT); + } + return parameters; +} diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetBucketNotificationConfigurationRequest.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetBucketNotificationConfigurationRequest.cpp index 6e892ead3b..dd672659eb 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetBucketNotificationConfigurationRequest.cpp +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetBucketNotificationConfigurationRequest.cpp @@ -63,3 +63,13 @@ Aws::Http::HeaderValueCollection GetBucketNotificationConfigurationRequest::GetR return headers; } + +GetBucketNotificationConfigurationRequest::EndpointParameters GetBucketNotificationConfigurationRequest::GetEndpointContextParams() const +{ + EndpointParameters parameters; + // Operation context parameters + if (BucketHasBeenSet()) { + parameters.emplace_back(Aws::String("Bucket"), this->GetBucket(), Aws::Endpoint::EndpointParameter::ParameterOrigin::OPERATION_CONTEXT); + } + return parameters; +} diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetBucketNotificationConfigurationResult.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetBucketNotificationConfigurationResult.cpp index de68f4316a..9e7ff9481f 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetBucketNotificationConfigurationResult.cpp +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetBucketNotificationConfigurationResult.cpp @@ -64,6 +64,11 @@ GetBucketNotificationConfigurationResult& GetBucketNotificationConfigurationResu } } + XmlNode eventBridgeConfigurationNode = resultNode.FirstChild("EventBridgeConfiguration"); + if(!eventBridgeConfigurationNode.IsNull()) + { + m_eventBridgeConfiguration = eventBridgeConfigurationNode; + } } return *this; diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetBucketOwnershipControlsRequest.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetBucketOwnershipControlsRequest.cpp index efaa529d2e..b3f153a9b5 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetBucketOwnershipControlsRequest.cpp +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetBucketOwnershipControlsRequest.cpp @@ -63,3 +63,13 @@ Aws::Http::HeaderValueCollection GetBucketOwnershipControlsRequest::GetRequestSp return headers; } + +GetBucketOwnershipControlsRequest::EndpointParameters GetBucketOwnershipControlsRequest::GetEndpointContextParams() const +{ + EndpointParameters parameters; + // Operation context parameters + if (BucketHasBeenSet()) { + parameters.emplace_back(Aws::String("Bucket"), this->GetBucket(), Aws::Endpoint::EndpointParameter::ParameterOrigin::OPERATION_CONTEXT); + } + return parameters; +} diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetBucketPolicyRequest.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetBucketPolicyRequest.cpp index e41b1fe0c5..e6571c8a6f 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetBucketPolicyRequest.cpp +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetBucketPolicyRequest.cpp @@ -63,3 +63,13 @@ Aws::Http::HeaderValueCollection GetBucketPolicyRequest::GetRequestSpecificHeade return headers; } + +GetBucketPolicyRequest::EndpointParameters GetBucketPolicyRequest::GetEndpointContextParams() const +{ + EndpointParameters parameters; + // Operation context parameters + if (BucketHasBeenSet()) { + parameters.emplace_back(Aws::String("Bucket"), this->GetBucket(), Aws::Endpoint::EndpointParameter::ParameterOrigin::OPERATION_CONTEXT); + } + return parameters; +} diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetBucketPolicyStatusRequest.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetBucketPolicyStatusRequest.cpp index 3c487f9634..c3af674bbd 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetBucketPolicyStatusRequest.cpp +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetBucketPolicyStatusRequest.cpp @@ -63,3 +63,13 @@ Aws::Http::HeaderValueCollection GetBucketPolicyStatusRequest::GetRequestSpecifi return headers; } + +GetBucketPolicyStatusRequest::EndpointParameters GetBucketPolicyStatusRequest::GetEndpointContextParams() const +{ + EndpointParameters parameters; + // Operation context parameters + if (BucketHasBeenSet()) { + parameters.emplace_back(Aws::String("Bucket"), this->GetBucket(), Aws::Endpoint::EndpointParameter::ParameterOrigin::OPERATION_CONTEXT); + } + return parameters; +} diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetBucketReplicationRequest.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetBucketReplicationRequest.cpp index 3dcadfa2be..7ef6b8a1b2 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetBucketReplicationRequest.cpp +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetBucketReplicationRequest.cpp @@ -63,3 +63,13 @@ Aws::Http::HeaderValueCollection GetBucketReplicationRequest::GetRequestSpecific return headers; } + +GetBucketReplicationRequest::EndpointParameters GetBucketReplicationRequest::GetEndpointContextParams() const +{ + EndpointParameters parameters; + // Operation context parameters + if (BucketHasBeenSet()) { + parameters.emplace_back(Aws::String("Bucket"), this->GetBucket(), Aws::Endpoint::EndpointParameter::ParameterOrigin::OPERATION_CONTEXT); + } + return parameters; +} diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetBucketRequestPaymentRequest.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetBucketRequestPaymentRequest.cpp index 7f3e734b70..e369ccaab7 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetBucketRequestPaymentRequest.cpp +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetBucketRequestPaymentRequest.cpp @@ -63,3 +63,13 @@ Aws::Http::HeaderValueCollection GetBucketRequestPaymentRequest::GetRequestSpeci return headers; } + +GetBucketRequestPaymentRequest::EndpointParameters GetBucketRequestPaymentRequest::GetEndpointContextParams() const +{ + EndpointParameters parameters; + // Operation context parameters + if (BucketHasBeenSet()) { + parameters.emplace_back(Aws::String("Bucket"), this->GetBucket(), Aws::Endpoint::EndpointParameter::ParameterOrigin::OPERATION_CONTEXT); + } + return parameters; +} diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetBucketTaggingRequest.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetBucketTaggingRequest.cpp index 72373deaf1..f3e5ea4b74 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetBucketTaggingRequest.cpp +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetBucketTaggingRequest.cpp @@ -63,3 +63,13 @@ Aws::Http::HeaderValueCollection GetBucketTaggingRequest::GetRequestSpecificHead return headers; } + +GetBucketTaggingRequest::EndpointParameters GetBucketTaggingRequest::GetEndpointContextParams() const +{ + EndpointParameters parameters; + // Operation context parameters + if (BucketHasBeenSet()) { + parameters.emplace_back(Aws::String("Bucket"), this->GetBucket(), Aws::Endpoint::EndpointParameter::ParameterOrigin::OPERATION_CONTEXT); + } + return parameters; +} diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetBucketVersioningRequest.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetBucketVersioningRequest.cpp index 7583f79117..830ab5425d 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetBucketVersioningRequest.cpp +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetBucketVersioningRequest.cpp @@ -63,3 +63,13 @@ Aws::Http::HeaderValueCollection GetBucketVersioningRequest::GetRequestSpecificH return headers; } + +GetBucketVersioningRequest::EndpointParameters GetBucketVersioningRequest::GetEndpointContextParams() const +{ + EndpointParameters parameters; + // Operation context parameters + if (BucketHasBeenSet()) { + parameters.emplace_back(Aws::String("Bucket"), this->GetBucket(), Aws::Endpoint::EndpointParameter::ParameterOrigin::OPERATION_CONTEXT); + } + return parameters; +} diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetBucketWebsiteRequest.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetBucketWebsiteRequest.cpp index 067a281fa9..73510697c2 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetBucketWebsiteRequest.cpp +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetBucketWebsiteRequest.cpp @@ -63,3 +63,13 @@ Aws::Http::HeaderValueCollection GetBucketWebsiteRequest::GetRequestSpecificHead return headers; } + +GetBucketWebsiteRequest::EndpointParameters GetBucketWebsiteRequest::GetEndpointContextParams() const +{ + EndpointParameters parameters; + // Operation context parameters + if (BucketHasBeenSet()) { + parameters.emplace_back(Aws::String("Bucket"), this->GetBucket(), Aws::Endpoint::EndpointParameter::ParameterOrigin::OPERATION_CONTEXT); + } + return parameters; +} diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetObjectAclRequest.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetObjectAclRequest.cpp index 9019eea1c7..f0ee229d60 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetObjectAclRequest.cpp +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetObjectAclRequest.cpp @@ -79,3 +79,13 @@ Aws::Http::HeaderValueCollection GetObjectAclRequest::GetRequestSpecificHeaders( return headers; } + +GetObjectAclRequest::EndpointParameters GetObjectAclRequest::GetEndpointContextParams() const +{ + EndpointParameters parameters; + // Operation context parameters + if (BucketHasBeenSet()) { + parameters.emplace_back(Aws::String("Bucket"), this->GetBucket(), Aws::Endpoint::EndpointParameter::ParameterOrigin::OPERATION_CONTEXT); + } + return parameters; +} diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetObjectAttributesParts.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetObjectAttributesParts.cpp new file mode 100644 index 0000000000..14b9a8ac28 --- /dev/null +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetObjectAttributesParts.cpp @@ -0,0 +1,163 @@ +/** + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. + * SPDX-License-Identifier: Apache-2.0. + */ + +#include <aws/s3/model/GetObjectAttributesParts.h> +#include <aws/core/utils/xml/XmlSerializer.h> +#include <aws/core/utils/StringUtils.h> +#include <aws/core/utils/memory/stl/AWSStringStream.h> + +#include <utility> + +using namespace Aws::Utils::Xml; +using namespace Aws::Utils; + +namespace Aws +{ +namespace S3 +{ +namespace Model +{ + +GetObjectAttributesParts::GetObjectAttributesParts() : + m_totalPartsCount(0), + m_totalPartsCountHasBeenSet(false), + m_partNumberMarker(0), + m_partNumberMarkerHasBeenSet(false), + m_nextPartNumberMarker(0), + m_nextPartNumberMarkerHasBeenSet(false), + m_maxParts(0), + m_maxPartsHasBeenSet(false), + m_isTruncated(false), + m_isTruncatedHasBeenSet(false), + m_partsHasBeenSet(false) +{ +} + +GetObjectAttributesParts::GetObjectAttributesParts(const XmlNode& xmlNode) : + m_totalPartsCount(0), + m_totalPartsCountHasBeenSet(false), + m_partNumberMarker(0), + m_partNumberMarkerHasBeenSet(false), + m_nextPartNumberMarker(0), + m_nextPartNumberMarkerHasBeenSet(false), + m_maxParts(0), + m_maxPartsHasBeenSet(false), + m_isTruncated(false), + m_isTruncatedHasBeenSet(false), + m_partsHasBeenSet(false) +{ + *this = xmlNode; +} + +GetObjectAttributesParts& GetObjectAttributesParts::operator =(const XmlNode& xmlNode) +{ + XmlNode resultNode = xmlNode; + + if(!resultNode.IsNull()) + { + XmlNode totalPartsCountNode = resultNode.FirstChild("PartsCount"); + if(!totalPartsCountNode.IsNull()) + { + m_totalPartsCount = StringUtils::ConvertToInt32(StringUtils::Trim(Aws::Utils::Xml::DecodeEscapedXmlText(totalPartsCountNode.GetText()).c_str()).c_str()); + m_totalPartsCountHasBeenSet = true; + } + XmlNode partNumberMarkerNode = resultNode.FirstChild("PartNumberMarker"); + if(!partNumberMarkerNode.IsNull()) + { + m_partNumberMarker = StringUtils::ConvertToInt32(StringUtils::Trim(Aws::Utils::Xml::DecodeEscapedXmlText(partNumberMarkerNode.GetText()).c_str()).c_str()); + m_partNumberMarkerHasBeenSet = true; + } + XmlNode nextPartNumberMarkerNode = resultNode.FirstChild("NextPartNumberMarker"); + if(!nextPartNumberMarkerNode.IsNull()) + { + m_nextPartNumberMarker = StringUtils::ConvertToInt32(StringUtils::Trim(Aws::Utils::Xml::DecodeEscapedXmlText(nextPartNumberMarkerNode.GetText()).c_str()).c_str()); + m_nextPartNumberMarkerHasBeenSet = true; + } + XmlNode maxPartsNode = resultNode.FirstChild("MaxParts"); + if(!maxPartsNode.IsNull()) + { + m_maxParts = StringUtils::ConvertToInt32(StringUtils::Trim(Aws::Utils::Xml::DecodeEscapedXmlText(maxPartsNode.GetText()).c_str()).c_str()); + m_maxPartsHasBeenSet = true; + } + XmlNode isTruncatedNode = resultNode.FirstChild("IsTruncated"); + if(!isTruncatedNode.IsNull()) + { + m_isTruncated = StringUtils::ConvertToBool(StringUtils::Trim(Aws::Utils::Xml::DecodeEscapedXmlText(isTruncatedNode.GetText()).c_str()).c_str()); + m_isTruncatedHasBeenSet = true; + } + XmlNode partsNode = resultNode.FirstChild("Part"); + if(!partsNode.IsNull()) + { + XmlNode partMember = partsNode; + while(!partMember.IsNull()) + { + m_parts.push_back(partMember); + partMember = partMember.NextNode("Part"); + } + + m_partsHasBeenSet = true; + } + } + + return *this; +} + +void GetObjectAttributesParts::AddToNode(XmlNode& parentNode) const +{ + Aws::StringStream ss; + if(m_totalPartsCountHasBeenSet) + { + XmlNode totalPartsCountNode = parentNode.CreateChildElement("PartsCount"); + ss << m_totalPartsCount; + totalPartsCountNode.SetText(ss.str()); + ss.str(""); + } + + if(m_partNumberMarkerHasBeenSet) + { + XmlNode partNumberMarkerNode = parentNode.CreateChildElement("PartNumberMarker"); + ss << m_partNumberMarker; + partNumberMarkerNode.SetText(ss.str()); + ss.str(""); + } + + if(m_nextPartNumberMarkerHasBeenSet) + { + XmlNode nextPartNumberMarkerNode = parentNode.CreateChildElement("NextPartNumberMarker"); + ss << m_nextPartNumberMarker; + nextPartNumberMarkerNode.SetText(ss.str()); + ss.str(""); + } + + if(m_maxPartsHasBeenSet) + { + XmlNode maxPartsNode = parentNode.CreateChildElement("MaxParts"); + ss << m_maxParts; + maxPartsNode.SetText(ss.str()); + ss.str(""); + } + + if(m_isTruncatedHasBeenSet) + { + XmlNode isTruncatedNode = parentNode.CreateChildElement("IsTruncated"); + ss << std::boolalpha << m_isTruncated; + isTruncatedNode.SetText(ss.str()); + ss.str(""); + } + + if(m_partsHasBeenSet) + { + for(const auto& item : m_parts) + { + XmlNode partsNode = parentNode.CreateChildElement("Part"); + item.AddToNode(partsNode); + } + } + +} + +} // namespace Model +} // namespace S3 +} // namespace Aws diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetObjectAttributesRequest.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetObjectAttributesRequest.cpp new file mode 100644 index 0000000000..87e567b7d5 --- /dev/null +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetObjectAttributesRequest.cpp @@ -0,0 +1,144 @@ +/** + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. + * SPDX-License-Identifier: Apache-2.0. + */ + +#include <aws/s3/model/GetObjectAttributesRequest.h> +#include <aws/core/utils/xml/XmlSerializer.h> +#include <aws/core/utils/memory/stl/AWSStringStream.h> +#include <aws/core/http/URI.h> +#include <aws/core/utils/memory/stl/AWSStringStream.h> + +#include <utility> + +using namespace Aws::S3::Model; +using namespace Aws::Utils::Xml; +using namespace Aws::Utils; +using namespace Aws::Http; + +GetObjectAttributesRequest::GetObjectAttributesRequest() : + m_bucketHasBeenSet(false), + m_keyHasBeenSet(false), + m_versionIdHasBeenSet(false), + m_maxParts(0), + m_maxPartsHasBeenSet(false), + m_partNumberMarker(0), + m_partNumberMarkerHasBeenSet(false), + m_sSECustomerAlgorithmHasBeenSet(false), + m_sSECustomerKeyHasBeenSet(false), + m_sSECustomerKeyMD5HasBeenSet(false), + m_requestPayer(RequestPayer::NOT_SET), + m_requestPayerHasBeenSet(false), + m_expectedBucketOwnerHasBeenSet(false), + m_objectAttributesHasBeenSet(false), + m_customizedAccessLogTagHasBeenSet(false) +{ +} + +Aws::String GetObjectAttributesRequest::SerializePayload() const +{ + return {}; +} + +void GetObjectAttributesRequest::AddQueryStringParameters(URI& uri) const +{ + Aws::StringStream ss; + if(m_versionIdHasBeenSet) + { + ss << m_versionId; + uri.AddQueryStringParameter("versionId", ss.str()); + ss.str(""); + } + + if(!m_customizedAccessLogTag.empty()) + { + // only accept customized LogTag which starts with "x-" + Aws::Map<Aws::String, Aws::String> collectedLogTags; + for(const auto& entry: m_customizedAccessLogTag) + { + if (!entry.first.empty() && !entry.second.empty() && entry.first.substr(0, 2) == "x-") + { + collectedLogTags.emplace(entry.first, entry.second); + } + } + + if (!collectedLogTags.empty()) + { + uri.AddQueryStringParameter(collectedLogTags); + } + } +} + +Aws::Http::HeaderValueCollection GetObjectAttributesRequest::GetRequestSpecificHeaders() const +{ + Aws::Http::HeaderValueCollection headers; + Aws::StringStream ss; + if(m_maxPartsHasBeenSet) + { + ss << m_maxParts; + headers.emplace("x-amz-max-parts", ss.str()); + ss.str(""); + } + + if(m_partNumberMarkerHasBeenSet) + { + ss << m_partNumberMarker; + headers.emplace("x-amz-part-number-marker", ss.str()); + ss.str(""); + } + + if(m_sSECustomerAlgorithmHasBeenSet) + { + ss << m_sSECustomerAlgorithm; + headers.emplace("x-amz-server-side-encryption-customer-algorithm", ss.str()); + ss.str(""); + } + + if(m_sSECustomerKeyHasBeenSet) + { + ss << m_sSECustomerKey; + headers.emplace("x-amz-server-side-encryption-customer-key", ss.str()); + ss.str(""); + } + + if(m_sSECustomerKeyMD5HasBeenSet) + { + ss << m_sSECustomerKeyMD5; + headers.emplace("x-amz-server-side-encryption-customer-key-md5", ss.str()); + ss.str(""); + } + + if(m_requestPayerHasBeenSet) + { + headers.emplace("x-amz-request-payer", RequestPayerMapper::GetNameForRequestPayer(m_requestPayer)); + } + + if(m_expectedBucketOwnerHasBeenSet) + { + ss << m_expectedBucketOwner; + headers.emplace("x-amz-expected-bucket-owner", ss.str()); + ss.str(""); + } + + if(m_objectAttributesHasBeenSet) + { + for(const auto& item : m_objectAttributes) + { + ss << ObjectAttributesMapper::GetNameForObjectAttributes(item); + headers.emplace("x-amz-object-attributes", ss.str()); + ss.str(""); + } + } + + return headers; +} + +GetObjectAttributesRequest::EndpointParameters GetObjectAttributesRequest::GetEndpointContextParams() const +{ + EndpointParameters parameters; + // Operation context parameters + if (BucketHasBeenSet()) { + parameters.emplace_back(Aws::String("Bucket"), this->GetBucket(), Aws::Endpoint::EndpointParameter::ParameterOrigin::OPERATION_CONTEXT); + } + return parameters; +} diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetObjectAttributesResult.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetObjectAttributesResult.cpp new file mode 100644 index 0000000000..2cb06ee5fe --- /dev/null +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetObjectAttributesResult.cpp @@ -0,0 +1,96 @@ +/** + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. + * SPDX-License-Identifier: Apache-2.0. + */ + +#include <aws/s3/model/GetObjectAttributesResult.h> +#include <aws/core/utils/xml/XmlSerializer.h> +#include <aws/core/AmazonWebServiceResult.h> +#include <aws/core/utils/StringUtils.h> +#include <aws/core/utils/memory/stl/AWSStringStream.h> + +#include <utility> + +using namespace Aws::S3::Model; +using namespace Aws::Utils::Xml; +using namespace Aws::Utils; +using namespace Aws; + +GetObjectAttributesResult::GetObjectAttributesResult() : + m_deleteMarker(false), + m_requestCharged(RequestCharged::NOT_SET), + m_storageClass(StorageClass::NOT_SET), + m_objectSize(0) +{ +} + +GetObjectAttributesResult::GetObjectAttributesResult(const Aws::AmazonWebServiceResult<XmlDocument>& result) : + m_deleteMarker(false), + m_requestCharged(RequestCharged::NOT_SET), + m_storageClass(StorageClass::NOT_SET), + m_objectSize(0) +{ + *this = result; +} + +GetObjectAttributesResult& GetObjectAttributesResult::operator =(const Aws::AmazonWebServiceResult<XmlDocument>& result) +{ + const XmlDocument& xmlDocument = result.GetPayload(); + XmlNode resultNode = xmlDocument.GetRootElement(); + + if(!resultNode.IsNull()) + { + XmlNode eTagNode = resultNode.FirstChild("ETag"); + if(!eTagNode.IsNull()) + { + m_eTag = Aws::Utils::Xml::DecodeEscapedXmlText(eTagNode.GetText()); + } + XmlNode checksumNode = resultNode.FirstChild("Checksum"); + if(!checksumNode.IsNull()) + { + m_checksum = checksumNode; + } + XmlNode objectPartsNode = resultNode.FirstChild("ObjectParts"); + if(!objectPartsNode.IsNull()) + { + m_objectParts = objectPartsNode; + } + XmlNode storageClassNode = resultNode.FirstChild("StorageClass"); + if(!storageClassNode.IsNull()) + { + m_storageClass = StorageClassMapper::GetStorageClassForName(StringUtils::Trim(Aws::Utils::Xml::DecodeEscapedXmlText(storageClassNode.GetText()).c_str()).c_str()); + } + XmlNode objectSizeNode = resultNode.FirstChild("ObjectSize"); + if(!objectSizeNode.IsNull()) + { + m_objectSize = StringUtils::ConvertToInt64(StringUtils::Trim(Aws::Utils::Xml::DecodeEscapedXmlText(objectSizeNode.GetText()).c_str()).c_str()); + } + } + + const auto& headers = result.GetHeaderValueCollection(); + const auto& deleteMarkerIter = headers.find("x-amz-delete-marker"); + if(deleteMarkerIter != headers.end()) + { + m_deleteMarker = StringUtils::ConvertToBool(deleteMarkerIter->second.c_str()); + } + + const auto& lastModifiedIter = headers.find("last-modified"); + if(lastModifiedIter != headers.end()) + { + m_lastModified = DateTime(lastModifiedIter->second, Aws::Utils::DateFormat::RFC822); + } + + const auto& versionIdIter = headers.find("x-amz-version-id"); + if(versionIdIter != headers.end()) + { + m_versionId = versionIdIter->second; + } + + const auto& requestChargedIter = headers.find("x-amz-request-charged"); + if(requestChargedIter != headers.end()) + { + m_requestCharged = RequestChargedMapper::GetRequestChargedForName(requestChargedIter->second); + } + + return *this; +} diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetObjectLegalHoldRequest.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetObjectLegalHoldRequest.cpp index 6a3ba662dc..f6b41c0e8f 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetObjectLegalHoldRequest.cpp +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetObjectLegalHoldRequest.cpp @@ -79,3 +79,13 @@ Aws::Http::HeaderValueCollection GetObjectLegalHoldRequest::GetRequestSpecificHe return headers; } + +GetObjectLegalHoldRequest::EndpointParameters GetObjectLegalHoldRequest::GetEndpointContextParams() const +{ + EndpointParameters parameters; + // Operation context parameters + if (BucketHasBeenSet()) { + parameters.emplace_back(Aws::String("Bucket"), this->GetBucket(), Aws::Endpoint::EndpointParameter::ParameterOrigin::OPERATION_CONTEXT); + } + return parameters; +} diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetObjectLockConfigurationRequest.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetObjectLockConfigurationRequest.cpp index d1cf37a030..59ebdb725e 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetObjectLockConfigurationRequest.cpp +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetObjectLockConfigurationRequest.cpp @@ -63,3 +63,13 @@ Aws::Http::HeaderValueCollection GetObjectLockConfigurationRequest::GetRequestSp return headers; } + +GetObjectLockConfigurationRequest::EndpointParameters GetObjectLockConfigurationRequest::GetEndpointContextParams() const +{ + EndpointParameters parameters; + // Operation context parameters + if (BucketHasBeenSet()) { + parameters.emplace_back(Aws::String("Bucket"), this->GetBucket(), Aws::Endpoint::EndpointParameter::ParameterOrigin::OPERATION_CONTEXT); + } + return parameters; +} diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetObjectRequest.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetObjectRequest.cpp index a1939e2471..94dcf96673 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetObjectRequest.cpp +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetObjectRequest.cpp @@ -39,6 +39,8 @@ GetObjectRequest::GetObjectRequest() : m_partNumber(0), m_partNumberHasBeenSet(false), m_expectedBucketOwnerHasBeenSet(false), + m_checksumMode(ChecksumMode::NOT_SET), + m_checksumModeHasBeenSet(false), m_customizedAccessLogTagHasBeenSet(false) { } @@ -88,7 +90,7 @@ void GetObjectRequest::AddQueryStringParameters(URI& uri) const if(m_responseExpiresHasBeenSet) { - ss << m_responseExpires.ToGmtString(DateFormat::RFC822); + ss << m_responseExpires.ToGmtString(Aws::Utils::DateFormat::RFC822); uri.AddQueryStringParameter("response-expires", ss.str()); ss.str(""); } @@ -139,7 +141,7 @@ Aws::Http::HeaderValueCollection GetObjectRequest::GetRequestSpecificHeaders() c if(m_ifModifiedSinceHasBeenSet) { - headers.emplace("if-modified-since", m_ifModifiedSince.ToGmtString(DateFormat::RFC822)); + headers.emplace("if-modified-since", m_ifModifiedSince.ToGmtString(Aws::Utils::DateFormat::RFC822)); } if(m_ifNoneMatchHasBeenSet) @@ -151,7 +153,7 @@ Aws::Http::HeaderValueCollection GetObjectRequest::GetRequestSpecificHeaders() c if(m_ifUnmodifiedSinceHasBeenSet) { - headers.emplace("if-unmodified-since", m_ifUnmodifiedSince.ToGmtString(DateFormat::RFC822)); + headers.emplace("if-unmodified-since", m_ifUnmodifiedSince.ToGmtString(Aws::Utils::DateFormat::RFC822)); } if(m_rangeHasBeenSet) @@ -194,5 +196,35 @@ Aws::Http::HeaderValueCollection GetObjectRequest::GetRequestSpecificHeaders() c ss.str(""); } + if(m_checksumModeHasBeenSet) + { + headers.emplace("x-amz-checksum-mode", ChecksumModeMapper::GetNameForChecksumMode(m_checksumMode)); + } + return headers; } + +GetObjectRequest::EndpointParameters GetObjectRequest::GetEndpointContextParams() const +{ + EndpointParameters parameters; + // Operation context parameters + if (BucketHasBeenSet()) { + parameters.emplace_back(Aws::String("Bucket"), this->GetBucket(), Aws::Endpoint::EndpointParameter::ParameterOrigin::OPERATION_CONTEXT); + } + return parameters; +} +bool GetObjectRequest::ShouldValidateResponseChecksum() const +{ + return m_checksumMode == ChecksumMode::ENABLED; +} + +Aws::Vector<Aws::String> GetObjectRequest::GetResponseChecksumAlgorithmNames() const +{ + Aws::Vector<Aws::String> responseChecksumAlgorithmNames; + responseChecksumAlgorithmNames.push_back("CRC32"); + responseChecksumAlgorithmNames.push_back("CRC32C"); + responseChecksumAlgorithmNames.push_back("SHA256"); + responseChecksumAlgorithmNames.push_back("SHA1"); + return responseChecksumAlgorithmNames; +} + diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetObjectResult.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetObjectResult.cpp index f0959a570a..50be648cd6 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetObjectResult.cpp +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetObjectResult.cpp @@ -41,6 +41,10 @@ GetObjectResult::GetObjectResult(GetObjectResult&& toMove) : m_lastModified(std::move(toMove.m_lastModified)), m_contentLength(toMove.m_contentLength), m_eTag(std::move(toMove.m_eTag)), + m_checksumCRC32(std::move(toMove.m_checksumCRC32)), + m_checksumCRC32C(std::move(toMove.m_checksumCRC32C)), + m_checksumSHA1(std::move(toMove.m_checksumSHA1)), + m_checksumSHA256(std::move(toMove.m_checksumSHA256)), m_missingMeta(toMove.m_missingMeta), m_versionId(std::move(toMove.m_versionId)), m_cacheControl(std::move(toMove.m_cacheControl)), @@ -85,6 +89,10 @@ GetObjectResult& GetObjectResult::operator=(GetObjectResult&& toMove) m_lastModified = std::move(toMove.m_lastModified); m_contentLength = toMove.m_contentLength; m_eTag = std::move(toMove.m_eTag); + m_checksumCRC32 = std::move(toMove.m_checksumCRC32); + m_checksumCRC32C = std::move(toMove.m_checksumCRC32C); + m_checksumSHA1 = std::move(toMove.m_checksumSHA1); + m_checksumSHA256 = std::move(toMove.m_checksumSHA256); m_missingMeta = toMove.m_missingMeta; m_versionId = std::move(toMove.m_versionId); m_cacheControl = std::move(toMove.m_cacheControl); @@ -164,7 +172,7 @@ GetObjectResult& GetObjectResult::operator =(Aws::AmazonWebServiceResult<Respons const auto& lastModifiedIter = headers.find("last-modified"); if(lastModifiedIter != headers.end()) { - m_lastModified = DateTime(lastModifiedIter->second, DateFormat::RFC822); + m_lastModified = DateTime(lastModifiedIter->second, Aws::Utils::DateFormat::RFC822); } const auto& contentLengthIter = headers.find("content-length"); @@ -179,6 +187,30 @@ GetObjectResult& GetObjectResult::operator =(Aws::AmazonWebServiceResult<Respons m_eTag = eTagIter->second; } + const auto& checksumCRC32Iter = headers.find("x-amz-checksum-crc32"); + if(checksumCRC32Iter != headers.end()) + { + m_checksumCRC32 = checksumCRC32Iter->second; + } + + const auto& checksumCRC32CIter = headers.find("x-amz-checksum-crc32c"); + if(checksumCRC32CIter != headers.end()) + { + m_checksumCRC32C = checksumCRC32CIter->second; + } + + const auto& checksumSHA1Iter = headers.find("x-amz-checksum-sha1"); + if(checksumSHA1Iter != headers.end()) + { + m_checksumSHA1 = checksumSHA1Iter->second; + } + + const auto& checksumSHA256Iter = headers.find("x-amz-checksum-sha256"); + if(checksumSHA256Iter != headers.end()) + { + m_checksumSHA256 = checksumSHA256Iter->second; + } + const auto& missingMetaIter = headers.find("x-amz-missing-meta"); if(missingMetaIter != headers.end()) { @@ -230,7 +262,7 @@ GetObjectResult& GetObjectResult::operator =(Aws::AmazonWebServiceResult<Respons const auto& expiresIter = headers.find("expires"); if(expiresIter != headers.end()) { - m_expires = DateTime(expiresIter->second, DateFormat::RFC822); + m_expires = DateTime(expiresIter->second, Aws::Utils::DateFormat::RFC822); } const auto& websiteRedirectLocationIter = headers.find("x-amz-website-redirect-location"); @@ -319,7 +351,7 @@ GetObjectResult& GetObjectResult::operator =(Aws::AmazonWebServiceResult<Respons const auto& objectLockRetainUntilDateIter = headers.find("x-amz-object-lock-retain-until-date"); if(objectLockRetainUntilDateIter != headers.end()) { - m_objectLockRetainUntilDate = DateTime(objectLockRetainUntilDateIter->second, DateFormat::ISO_8601); + m_objectLockRetainUntilDate = DateTime(objectLockRetainUntilDateIter->second, Aws::Utils::DateFormat::ISO_8601); } const auto& objectLockLegalHoldStatusIter = headers.find("x-amz-object-lock-legal-hold"); diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetObjectRetentionRequest.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetObjectRetentionRequest.cpp index d1917da723..a825b3ba4c 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetObjectRetentionRequest.cpp +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetObjectRetentionRequest.cpp @@ -79,3 +79,13 @@ Aws::Http::HeaderValueCollection GetObjectRetentionRequest::GetRequestSpecificHe return headers; } + +GetObjectRetentionRequest::EndpointParameters GetObjectRetentionRequest::GetEndpointContextParams() const +{ + EndpointParameters parameters; + // Operation context parameters + if (BucketHasBeenSet()) { + parameters.emplace_back(Aws::String("Bucket"), this->GetBucket(), Aws::Endpoint::EndpointParameter::ParameterOrigin::OPERATION_CONTEXT); + } + return parameters; +} diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetObjectTaggingRequest.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetObjectTaggingRequest.cpp index fb9a5d55e4..d2f2fa1127 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetObjectTaggingRequest.cpp +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetObjectTaggingRequest.cpp @@ -79,3 +79,13 @@ Aws::Http::HeaderValueCollection GetObjectTaggingRequest::GetRequestSpecificHead return headers; } + +GetObjectTaggingRequest::EndpointParameters GetObjectTaggingRequest::GetEndpointContextParams() const +{ + EndpointParameters parameters; + // Operation context parameters + if (BucketHasBeenSet()) { + parameters.emplace_back(Aws::String("Bucket"), this->GetBucket(), Aws::Endpoint::EndpointParameter::ParameterOrigin::OPERATION_CONTEXT); + } + return parameters; +} diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetObjectTorrentRequest.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetObjectTorrentRequest.cpp index 05aae88aa2..f0975e6b60 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetObjectTorrentRequest.cpp +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetObjectTorrentRequest.cpp @@ -71,3 +71,13 @@ Aws::Http::HeaderValueCollection GetObjectTorrentRequest::GetRequestSpecificHead return headers; } + +GetObjectTorrentRequest::EndpointParameters GetObjectTorrentRequest::GetEndpointContextParams() const +{ + EndpointParameters parameters; + // Operation context parameters + if (BucketHasBeenSet()) { + parameters.emplace_back(Aws::String("Bucket"), this->GetBucket(), Aws::Endpoint::EndpointParameter::ParameterOrigin::OPERATION_CONTEXT); + } + return parameters; +} diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetPublicAccessBlockRequest.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetPublicAccessBlockRequest.cpp index 6616e19c0b..137a2d2a36 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetPublicAccessBlockRequest.cpp +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/GetPublicAccessBlockRequest.cpp @@ -63,3 +63,13 @@ Aws::Http::HeaderValueCollection GetPublicAccessBlockRequest::GetRequestSpecific return headers; } + +GetPublicAccessBlockRequest::EndpointParameters GetPublicAccessBlockRequest::GetEndpointContextParams() const +{ + EndpointParameters parameters; + // Operation context parameters + if (BucketHasBeenSet()) { + parameters.emplace_back(Aws::String("Bucket"), this->GetBucket(), Aws::Endpoint::EndpointParameter::ParameterOrigin::OPERATION_CONTEXT); + } + return parameters; +} diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/HeadBucketRequest.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/HeadBucketRequest.cpp index b503f37b81..9cc24f6e14 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/HeadBucketRequest.cpp +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/HeadBucketRequest.cpp @@ -63,3 +63,13 @@ Aws::Http::HeaderValueCollection HeadBucketRequest::GetRequestSpecificHeaders() return headers; } + +HeadBucketRequest::EndpointParameters HeadBucketRequest::GetEndpointContextParams() const +{ + EndpointParameters parameters; + // Operation context parameters + if (BucketHasBeenSet()) { + parameters.emplace_back(Aws::String("Bucket"), this->GetBucket(), Aws::Endpoint::EndpointParameter::ParameterOrigin::OPERATION_CONTEXT); + } + return parameters; +} diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/HeadObjectRequest.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/HeadObjectRequest.cpp index 7bf7b7239e..e40ec1f7cf 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/HeadObjectRequest.cpp +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/HeadObjectRequest.cpp @@ -33,6 +33,8 @@ HeadObjectRequest::HeadObjectRequest() : m_partNumber(0), m_partNumberHasBeenSet(false), m_expectedBucketOwnerHasBeenSet(false), + m_checksumMode(ChecksumMode::NOT_SET), + m_checksumModeHasBeenSet(false), m_customizedAccessLogTagHasBeenSet(false) { } @@ -91,7 +93,7 @@ Aws::Http::HeaderValueCollection HeadObjectRequest::GetRequestSpecificHeaders() if(m_ifModifiedSinceHasBeenSet) { - headers.emplace("if-modified-since", m_ifModifiedSince.ToGmtString(DateFormat::RFC822)); + headers.emplace("if-modified-since", m_ifModifiedSince.ToGmtString(Aws::Utils::DateFormat::RFC822)); } if(m_ifNoneMatchHasBeenSet) @@ -103,7 +105,7 @@ Aws::Http::HeaderValueCollection HeadObjectRequest::GetRequestSpecificHeaders() if(m_ifUnmodifiedSinceHasBeenSet) { - headers.emplace("if-unmodified-since", m_ifUnmodifiedSince.ToGmtString(DateFormat::RFC822)); + headers.emplace("if-unmodified-since", m_ifUnmodifiedSince.ToGmtString(Aws::Utils::DateFormat::RFC822)); } if(m_rangeHasBeenSet) @@ -146,5 +148,20 @@ Aws::Http::HeaderValueCollection HeadObjectRequest::GetRequestSpecificHeaders() ss.str(""); } + if(m_checksumModeHasBeenSet) + { + headers.emplace("x-amz-checksum-mode", ChecksumModeMapper::GetNameForChecksumMode(m_checksumMode)); + } + return headers; } + +HeadObjectRequest::EndpointParameters HeadObjectRequest::GetEndpointContextParams() const +{ + EndpointParameters parameters; + // Operation context parameters + if (BucketHasBeenSet()) { + parameters.emplace_back(Aws::String("Bucket"), this->GetBucket(), Aws::Endpoint::EndpointParameter::ParameterOrigin::OPERATION_CONTEXT); + } + return parameters; +} diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/HeadObjectResult.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/HeadObjectResult.cpp index f498d56aab..f68958d355 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/HeadObjectResult.cpp +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/HeadObjectResult.cpp @@ -92,7 +92,7 @@ HeadObjectResult& HeadObjectResult::operator =(const Aws::AmazonWebServiceResult const auto& lastModifiedIter = headers.find("last-modified"); if(lastModifiedIter != headers.end()) { - m_lastModified = DateTime(lastModifiedIter->second, DateFormat::RFC822); + m_lastModified = DateTime(lastModifiedIter->second, Aws::Utils::DateFormat::RFC822); } const auto& contentLengthIter = headers.find("content-length"); @@ -101,6 +101,30 @@ HeadObjectResult& HeadObjectResult::operator =(const Aws::AmazonWebServiceResult m_contentLength = StringUtils::ConvertToInt64(contentLengthIter->second.c_str()); } + const auto& checksumCRC32Iter = headers.find("x-amz-checksum-crc32"); + if(checksumCRC32Iter != headers.end()) + { + m_checksumCRC32 = checksumCRC32Iter->second; + } + + const auto& checksumCRC32CIter = headers.find("x-amz-checksum-crc32c"); + if(checksumCRC32CIter != headers.end()) + { + m_checksumCRC32C = checksumCRC32CIter->second; + } + + const auto& checksumSHA1Iter = headers.find("x-amz-checksum-sha1"); + if(checksumSHA1Iter != headers.end()) + { + m_checksumSHA1 = checksumSHA1Iter->second; + } + + const auto& checksumSHA256Iter = headers.find("x-amz-checksum-sha256"); + if(checksumSHA256Iter != headers.end()) + { + m_checksumSHA256 = checksumSHA256Iter->second; + } + const auto& eTagIter = headers.find("etag"); if(eTagIter != headers.end()) { @@ -152,7 +176,7 @@ HeadObjectResult& HeadObjectResult::operator =(const Aws::AmazonWebServiceResult const auto& expiresIter = headers.find("expires"); if(expiresIter != headers.end()) { - m_expires = DateTime(expiresIter->second, DateFormat::RFC822); + m_expires = DateTime(expiresIter->second, Aws::Utils::DateFormat::RFC822); } const auto& websiteRedirectLocationIter = headers.find("x-amz-website-redirect-location"); @@ -235,7 +259,7 @@ HeadObjectResult& HeadObjectResult::operator =(const Aws::AmazonWebServiceResult const auto& objectLockRetainUntilDateIter = headers.find("x-amz-object-lock-retain-until-date"); if(objectLockRetainUntilDateIter != headers.end()) { - m_objectLockRetainUntilDate = DateTime(objectLockRetainUntilDateIter->second, DateFormat::ISO_8601); + m_objectLockRetainUntilDate = DateTime(objectLockRetainUntilDateIter->second, Aws::Utils::DateFormat::ISO_8601); } const auto& objectLockLegalHoldStatusIter = headers.find("x-amz-object-lock-legal-hold"); diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/InventoryOptionalField.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/InventoryOptionalField.cpp index 00ae5fda49..a9b64dd1f1 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/InventoryOptionalField.cpp +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/InventoryOptionalField.cpp @@ -31,6 +31,8 @@ namespace Aws static const int ObjectLockMode_HASH = HashingUtils::HashString("ObjectLockMode"); static const int ObjectLockLegalHoldStatus_HASH = HashingUtils::HashString("ObjectLockLegalHoldStatus"); static const int IntelligentTieringAccessTier_HASH = HashingUtils::HashString("IntelligentTieringAccessTier"); + static const int BucketKeyStatus_HASH = HashingUtils::HashString("BucketKeyStatus"); + static const int ChecksumAlgorithm_HASH = HashingUtils::HashString("ChecksumAlgorithm"); InventoryOptionalField GetInventoryOptionalFieldForName(const Aws::String& name) @@ -80,6 +82,14 @@ namespace Aws { return InventoryOptionalField::IntelligentTieringAccessTier; } + else if (hashCode == BucketKeyStatus_HASH) + { + return InventoryOptionalField::BucketKeyStatus; + } + else if (hashCode == ChecksumAlgorithm_HASH) + { + return InventoryOptionalField::ChecksumAlgorithm; + } EnumParseOverflowContainer* overflowContainer = Aws::GetEnumOverflowContainer(); if(overflowContainer) { @@ -116,6 +126,10 @@ namespace Aws return "ObjectLockLegalHoldStatus"; case InventoryOptionalField::IntelligentTieringAccessTier: return "IntelligentTieringAccessTier"; + case InventoryOptionalField::BucketKeyStatus: + return "BucketKeyStatus"; + case InventoryOptionalField::ChecksumAlgorithm: + return "ChecksumAlgorithm"; default: EnumParseOverflowContainer* overflowContainer = Aws::GetEnumOverflowContainer(); if(overflowContainer) diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/LifecycleExpiration.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/LifecycleExpiration.cpp index be347d18f0..9d579d1c5c 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/LifecycleExpiration.cpp +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/LifecycleExpiration.cpp @@ -48,7 +48,7 @@ LifecycleExpiration& LifecycleExpiration::operator =(const XmlNode& xmlNode) XmlNode dateNode = resultNode.FirstChild("Date"); if(!dateNode.IsNull()) { - m_date = DateTime(StringUtils::Trim(Aws::Utils::Xml::DecodeEscapedXmlText(dateNode.GetText()).c_str()).c_str(), DateFormat::ISO_8601); + m_date = DateTime(StringUtils::Trim(Aws::Utils::Xml::DecodeEscapedXmlText(dateNode.GetText()).c_str()).c_str(), Aws::Utils::DateFormat::ISO_8601); m_dateHasBeenSet = true; } XmlNode daysNode = resultNode.FirstChild("Days"); @@ -74,7 +74,7 @@ void LifecycleExpiration::AddToNode(XmlNode& parentNode) const if(m_dateHasBeenSet) { XmlNode dateNode = parentNode.CreateChildElement("Date"); - dateNode.SetText(m_date.ToGmtString(DateFormat::ISO_8601)); + dateNode.SetText(m_date.ToGmtString(Aws::Utils::DateFormat::ISO_8601)); } if(m_daysHasBeenSet) diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/LifecycleRuleAndOperator.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/LifecycleRuleAndOperator.cpp index 833c1d99ea..b3358b10c3 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/LifecycleRuleAndOperator.cpp +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/LifecycleRuleAndOperator.cpp @@ -22,13 +22,21 @@ namespace Model LifecycleRuleAndOperator::LifecycleRuleAndOperator() : m_prefixHasBeenSet(false), - m_tagsHasBeenSet(false) + m_tagsHasBeenSet(false), + m_objectSizeGreaterThan(0), + m_objectSizeGreaterThanHasBeenSet(false), + m_objectSizeLessThan(0), + m_objectSizeLessThanHasBeenSet(false) { } LifecycleRuleAndOperator::LifecycleRuleAndOperator(const XmlNode& xmlNode) : m_prefixHasBeenSet(false), - m_tagsHasBeenSet(false) + m_tagsHasBeenSet(false), + m_objectSizeGreaterThan(0), + m_objectSizeGreaterThanHasBeenSet(false), + m_objectSizeLessThan(0), + m_objectSizeLessThanHasBeenSet(false) { *this = xmlNode; } @@ -57,6 +65,18 @@ LifecycleRuleAndOperator& LifecycleRuleAndOperator::operator =(const XmlNode& xm m_tagsHasBeenSet = true; } + XmlNode objectSizeGreaterThanNode = resultNode.FirstChild("ObjectSizeGreaterThan"); + if(!objectSizeGreaterThanNode.IsNull()) + { + m_objectSizeGreaterThan = StringUtils::ConvertToInt64(StringUtils::Trim(Aws::Utils::Xml::DecodeEscapedXmlText(objectSizeGreaterThanNode.GetText()).c_str()).c_str()); + m_objectSizeGreaterThanHasBeenSet = true; + } + XmlNode objectSizeLessThanNode = resultNode.FirstChild("ObjectSizeLessThan"); + if(!objectSizeLessThanNode.IsNull()) + { + m_objectSizeLessThan = StringUtils::ConvertToInt64(StringUtils::Trim(Aws::Utils::Xml::DecodeEscapedXmlText(objectSizeLessThanNode.GetText()).c_str()).c_str()); + m_objectSizeLessThanHasBeenSet = true; + } } return *this; @@ -81,6 +101,22 @@ void LifecycleRuleAndOperator::AddToNode(XmlNode& parentNode) const } } + if(m_objectSizeGreaterThanHasBeenSet) + { + XmlNode objectSizeGreaterThanNode = parentNode.CreateChildElement("ObjectSizeGreaterThan"); + ss << m_objectSizeGreaterThan; + objectSizeGreaterThanNode.SetText(ss.str()); + ss.str(""); + } + + if(m_objectSizeLessThanHasBeenSet) + { + XmlNode objectSizeLessThanNode = parentNode.CreateChildElement("ObjectSizeLessThan"); + ss << m_objectSizeLessThan; + objectSizeLessThanNode.SetText(ss.str()); + ss.str(""); + } + } } // namespace Model diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/LifecycleRuleFilter.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/LifecycleRuleFilter.cpp index 0f56fb9044..ee9aedeed5 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/LifecycleRuleFilter.cpp +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/LifecycleRuleFilter.cpp @@ -23,6 +23,10 @@ namespace Model LifecycleRuleFilter::LifecycleRuleFilter() : m_prefixHasBeenSet(false), m_tagHasBeenSet(false), + m_objectSizeGreaterThan(0), + m_objectSizeGreaterThanHasBeenSet(false), + m_objectSizeLessThan(0), + m_objectSizeLessThanHasBeenSet(false), m_andHasBeenSet(false) { } @@ -30,6 +34,10 @@ LifecycleRuleFilter::LifecycleRuleFilter() : LifecycleRuleFilter::LifecycleRuleFilter(const XmlNode& xmlNode) : m_prefixHasBeenSet(false), m_tagHasBeenSet(false), + m_objectSizeGreaterThan(0), + m_objectSizeGreaterThanHasBeenSet(false), + m_objectSizeLessThan(0), + m_objectSizeLessThanHasBeenSet(false), m_andHasBeenSet(false) { *this = xmlNode; @@ -53,6 +61,18 @@ LifecycleRuleFilter& LifecycleRuleFilter::operator =(const XmlNode& xmlNode) m_tag = tagNode; m_tagHasBeenSet = true; } + XmlNode objectSizeGreaterThanNode = resultNode.FirstChild("ObjectSizeGreaterThan"); + if(!objectSizeGreaterThanNode.IsNull()) + { + m_objectSizeGreaterThan = StringUtils::ConvertToInt64(StringUtils::Trim(Aws::Utils::Xml::DecodeEscapedXmlText(objectSizeGreaterThanNode.GetText()).c_str()).c_str()); + m_objectSizeGreaterThanHasBeenSet = true; + } + XmlNode objectSizeLessThanNode = resultNode.FirstChild("ObjectSizeLessThan"); + if(!objectSizeLessThanNode.IsNull()) + { + m_objectSizeLessThan = StringUtils::ConvertToInt64(StringUtils::Trim(Aws::Utils::Xml::DecodeEscapedXmlText(objectSizeLessThanNode.GetText()).c_str()).c_str()); + m_objectSizeLessThanHasBeenSet = true; + } XmlNode andNode = resultNode.FirstChild("And"); if(!andNode.IsNull()) { @@ -79,6 +99,22 @@ void LifecycleRuleFilter::AddToNode(XmlNode& parentNode) const m_tag.AddToNode(tagNode); } + if(m_objectSizeGreaterThanHasBeenSet) + { + XmlNode objectSizeGreaterThanNode = parentNode.CreateChildElement("ObjectSizeGreaterThan"); + ss << m_objectSizeGreaterThan; + objectSizeGreaterThanNode.SetText(ss.str()); + ss.str(""); + } + + if(m_objectSizeLessThanHasBeenSet) + { + XmlNode objectSizeLessThanNode = parentNode.CreateChildElement("ObjectSizeLessThan"); + ss << m_objectSizeLessThan; + objectSizeLessThanNode.SetText(ss.str()); + ss.str(""); + } + if(m_andHasBeenSet) { XmlNode andNode = parentNode.CreateChildElement("And"); diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/ListBucketAnalyticsConfigurationsRequest.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/ListBucketAnalyticsConfigurationsRequest.cpp index 5b114920e1..3c79cd9684 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/ListBucketAnalyticsConfigurationsRequest.cpp +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/ListBucketAnalyticsConfigurationsRequest.cpp @@ -71,3 +71,13 @@ Aws::Http::HeaderValueCollection ListBucketAnalyticsConfigurationsRequest::GetRe return headers; } + +ListBucketAnalyticsConfigurationsRequest::EndpointParameters ListBucketAnalyticsConfigurationsRequest::GetEndpointContextParams() const +{ + EndpointParameters parameters; + // Operation context parameters + if (BucketHasBeenSet()) { + parameters.emplace_back(Aws::String("Bucket"), this->GetBucket(), Aws::Endpoint::EndpointParameter::ParameterOrigin::OPERATION_CONTEXT); + } + return parameters; +} diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/ListBucketIntelligentTieringConfigurationsRequest.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/ListBucketIntelligentTieringConfigurationsRequest.cpp index 8e83bdec35..80991f96d3 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/ListBucketIntelligentTieringConfigurationsRequest.cpp +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/ListBucketIntelligentTieringConfigurationsRequest.cpp @@ -57,3 +57,13 @@ void ListBucketIntelligentTieringConfigurationsRequest::AddQueryStringParameters } } + +ListBucketIntelligentTieringConfigurationsRequest::EndpointParameters ListBucketIntelligentTieringConfigurationsRequest::GetEndpointContextParams() const +{ + EndpointParameters parameters; + // Operation context parameters + if (BucketHasBeenSet()) { + parameters.emplace_back(Aws::String("Bucket"), this->GetBucket(), Aws::Endpoint::EndpointParameter::ParameterOrigin::OPERATION_CONTEXT); + } + return parameters; +} diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/ListBucketInventoryConfigurationsRequest.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/ListBucketInventoryConfigurationsRequest.cpp index fbd8f9ff83..4487984600 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/ListBucketInventoryConfigurationsRequest.cpp +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/ListBucketInventoryConfigurationsRequest.cpp @@ -71,3 +71,13 @@ Aws::Http::HeaderValueCollection ListBucketInventoryConfigurationsRequest::GetRe return headers; } + +ListBucketInventoryConfigurationsRequest::EndpointParameters ListBucketInventoryConfigurationsRequest::GetEndpointContextParams() const +{ + EndpointParameters parameters; + // Operation context parameters + if (BucketHasBeenSet()) { + parameters.emplace_back(Aws::String("Bucket"), this->GetBucket(), Aws::Endpoint::EndpointParameter::ParameterOrigin::OPERATION_CONTEXT); + } + return parameters; +} diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/ListBucketMetricsConfigurationsRequest.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/ListBucketMetricsConfigurationsRequest.cpp index 3978ec46f8..db5bd39a59 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/ListBucketMetricsConfigurationsRequest.cpp +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/ListBucketMetricsConfigurationsRequest.cpp @@ -71,3 +71,13 @@ Aws::Http::HeaderValueCollection ListBucketMetricsConfigurationsRequest::GetRequ return headers; } + +ListBucketMetricsConfigurationsRequest::EndpointParameters ListBucketMetricsConfigurationsRequest::GetEndpointContextParams() const +{ + EndpointParameters parameters; + // Operation context parameters + if (BucketHasBeenSet()) { + parameters.emplace_back(Aws::String("Bucket"), this->GetBucket(), Aws::Endpoint::EndpointParameter::ParameterOrigin::OPERATION_CONTEXT); + } + return parameters; +} diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/ListMultipartUploadsRequest.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/ListMultipartUploadsRequest.cpp index 9723e16a9d..528104a503 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/ListMultipartUploadsRequest.cpp +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/ListMultipartUploadsRequest.cpp @@ -113,3 +113,13 @@ Aws::Http::HeaderValueCollection ListMultipartUploadsRequest::GetRequestSpecific return headers; } + +ListMultipartUploadsRequest::EndpointParameters ListMultipartUploadsRequest::GetEndpointContextParams() const +{ + EndpointParameters parameters; + // Operation context parameters + if (BucketHasBeenSet()) { + parameters.emplace_back(Aws::String("Bucket"), this->GetBucket(), Aws::Endpoint::EndpointParameter::ParameterOrigin::OPERATION_CONTEXT); + } + return parameters; +} diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/ListObjectVersionsRequest.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/ListObjectVersionsRequest.cpp index 2336f09ef8..471cb4a33d 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/ListObjectVersionsRequest.cpp +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/ListObjectVersionsRequest.cpp @@ -113,3 +113,13 @@ Aws::Http::HeaderValueCollection ListObjectVersionsRequest::GetRequestSpecificHe return headers; } + +ListObjectVersionsRequest::EndpointParameters ListObjectVersionsRequest::GetEndpointContextParams() const +{ + EndpointParameters parameters; + // Operation context parameters + if (BucketHasBeenSet()) { + parameters.emplace_back(Aws::String("Bucket"), this->GetBucket(), Aws::Endpoint::EndpointParameter::ParameterOrigin::OPERATION_CONTEXT); + } + return parameters; +} diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/ListObjectsRequest.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/ListObjectsRequest.cpp index 33abec092f..a32047ac5f 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/ListObjectsRequest.cpp +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/ListObjectsRequest.cpp @@ -112,3 +112,13 @@ Aws::Http::HeaderValueCollection ListObjectsRequest::GetRequestSpecificHeaders() return headers; } + +ListObjectsRequest::EndpointParameters ListObjectsRequest::GetEndpointContextParams() const +{ + EndpointParameters parameters; + // Operation context parameters + if (BucketHasBeenSet()) { + parameters.emplace_back(Aws::String("Bucket"), this->GetBucket(), Aws::Endpoint::EndpointParameter::ParameterOrigin::OPERATION_CONTEXT); + } + return parameters; +} diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/ListObjectsV2Request.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/ListObjectsV2Request.cpp index 2feb9b83c1..68a4ddc2df 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/ListObjectsV2Request.cpp +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/ListObjectsV2Request.cpp @@ -129,3 +129,13 @@ Aws::Http::HeaderValueCollection ListObjectsV2Request::GetRequestSpecificHeaders return headers; } + +ListObjectsV2Request::EndpointParameters ListObjectsV2Request::GetEndpointContextParams() const +{ + EndpointParameters parameters; + // Operation context parameters + if (BucketHasBeenSet()) { + parameters.emplace_back(Aws::String("Bucket"), this->GetBucket(), Aws::Endpoint::EndpointParameter::ParameterOrigin::OPERATION_CONTEXT); + } + return parameters; +} diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/ListPartsRequest.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/ListPartsRequest.cpp index 59ff12e4d1..2ddc183789 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/ListPartsRequest.cpp +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/ListPartsRequest.cpp @@ -27,6 +27,9 @@ ListPartsRequest::ListPartsRequest() : m_requestPayer(RequestPayer::NOT_SET), m_requestPayerHasBeenSet(false), m_expectedBucketOwnerHasBeenSet(false), + m_sSECustomerAlgorithmHasBeenSet(false), + m_sSECustomerKeyHasBeenSet(false), + m_sSECustomerKeyMD5HasBeenSet(false), m_customizedAccessLogTagHasBeenSet(false) { } @@ -95,5 +98,36 @@ Aws::Http::HeaderValueCollection ListPartsRequest::GetRequestSpecificHeaders() c ss.str(""); } + if(m_sSECustomerAlgorithmHasBeenSet) + { + ss << m_sSECustomerAlgorithm; + headers.emplace("x-amz-server-side-encryption-customer-algorithm", ss.str()); + ss.str(""); + } + + if(m_sSECustomerKeyHasBeenSet) + { + ss << m_sSECustomerKey; + headers.emplace("x-amz-server-side-encryption-customer-key", ss.str()); + ss.str(""); + } + + if(m_sSECustomerKeyMD5HasBeenSet) + { + ss << m_sSECustomerKeyMD5; + headers.emplace("x-amz-server-side-encryption-customer-key-md5", ss.str()); + ss.str(""); + } + return headers; } + +ListPartsRequest::EndpointParameters ListPartsRequest::GetEndpointContextParams() const +{ + EndpointParameters parameters; + // Operation context parameters + if (BucketHasBeenSet()) { + parameters.emplace_back(Aws::String("Bucket"), this->GetBucket(), Aws::Endpoint::EndpointParameter::ParameterOrigin::OPERATION_CONTEXT); + } + return parameters; +} diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/ListPartsResult.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/ListPartsResult.cpp index f4638f2a06..d61990cf1b 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/ListPartsResult.cpp +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/ListPartsResult.cpp @@ -22,7 +22,8 @@ ListPartsResult::ListPartsResult() : m_maxParts(0), m_isTruncated(false), m_storageClass(StorageClass::NOT_SET), - m_requestCharged(RequestCharged::NOT_SET) + m_requestCharged(RequestCharged::NOT_SET), + m_checksumAlgorithm(ChecksumAlgorithm::NOT_SET) { } @@ -32,7 +33,8 @@ ListPartsResult::ListPartsResult(const Aws::AmazonWebServiceResult<XmlDocument>& m_maxParts(0), m_isTruncated(false), m_storageClass(StorageClass::NOT_SET), - m_requestCharged(RequestCharged::NOT_SET) + m_requestCharged(RequestCharged::NOT_SET), + m_checksumAlgorithm(ChecksumAlgorithm::NOT_SET) { *this = result; } @@ -105,13 +107,18 @@ ListPartsResult& ListPartsResult::operator =(const Aws::AmazonWebServiceResult<X { m_storageClass = StorageClassMapper::GetStorageClassForName(StringUtils::Trim(Aws::Utils::Xml::DecodeEscapedXmlText(storageClassNode.GetText()).c_str()).c_str()); } + XmlNode checksumAlgorithmNode = resultNode.FirstChild("ChecksumAlgorithm"); + if(!checksumAlgorithmNode.IsNull()) + { + m_checksumAlgorithm = ChecksumAlgorithmMapper::GetChecksumAlgorithmForName(StringUtils::Trim(Aws::Utils::Xml::DecodeEscapedXmlText(checksumAlgorithmNode.GetText()).c_str()).c_str()); + } } const auto& headers = result.GetHeaderValueCollection(); const auto& abortDateIter = headers.find("x-amz-abort-date"); if(abortDateIter != headers.end()) { - m_abortDate = DateTime(abortDateIter->second, DateFormat::RFC822); + m_abortDate = DateTime(abortDateIter->second, Aws::Utils::DateFormat::RFC822); } const auto& abortRuleIdIter = headers.find("x-amz-abort-rule-id"); diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/MetricsAndOperator.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/MetricsAndOperator.cpp index 74951cd0eb..711740443b 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/MetricsAndOperator.cpp +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/MetricsAndOperator.cpp @@ -22,13 +22,15 @@ namespace Model MetricsAndOperator::MetricsAndOperator() : m_prefixHasBeenSet(false), - m_tagsHasBeenSet(false) + m_tagsHasBeenSet(false), + m_accessPointArnHasBeenSet(false) { } MetricsAndOperator::MetricsAndOperator(const XmlNode& xmlNode) : m_prefixHasBeenSet(false), - m_tagsHasBeenSet(false) + m_tagsHasBeenSet(false), + m_accessPointArnHasBeenSet(false) { *this = xmlNode; } @@ -57,6 +59,12 @@ MetricsAndOperator& MetricsAndOperator::operator =(const XmlNode& xmlNode) m_tagsHasBeenSet = true; } + XmlNode accessPointArnNode = resultNode.FirstChild("AccessPointArn"); + if(!accessPointArnNode.IsNull()) + { + m_accessPointArn = Aws::Utils::Xml::DecodeEscapedXmlText(accessPointArnNode.GetText()); + m_accessPointArnHasBeenSet = true; + } } return *this; @@ -81,6 +89,12 @@ void MetricsAndOperator::AddToNode(XmlNode& parentNode) const } } + if(m_accessPointArnHasBeenSet) + { + XmlNode accessPointArnNode = parentNode.CreateChildElement("AccessPointArn"); + accessPointArnNode.SetText(m_accessPointArn); + } + } } // namespace Model diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/MetricsFilter.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/MetricsFilter.cpp index fa7ade5849..90cda86e09 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/MetricsFilter.cpp +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/MetricsFilter.cpp @@ -23,6 +23,7 @@ namespace Model MetricsFilter::MetricsFilter() : m_prefixHasBeenSet(false), m_tagHasBeenSet(false), + m_accessPointArnHasBeenSet(false), m_andHasBeenSet(false) { } @@ -30,6 +31,7 @@ MetricsFilter::MetricsFilter() : MetricsFilter::MetricsFilter(const XmlNode& xmlNode) : m_prefixHasBeenSet(false), m_tagHasBeenSet(false), + m_accessPointArnHasBeenSet(false), m_andHasBeenSet(false) { *this = xmlNode; @@ -53,6 +55,12 @@ MetricsFilter& MetricsFilter::operator =(const XmlNode& xmlNode) m_tag = tagNode; m_tagHasBeenSet = true; } + XmlNode accessPointArnNode = resultNode.FirstChild("AccessPointArn"); + if(!accessPointArnNode.IsNull()) + { + m_accessPointArn = Aws::Utils::Xml::DecodeEscapedXmlText(accessPointArnNode.GetText()); + m_accessPointArnHasBeenSet = true; + } XmlNode andNode = resultNode.FirstChild("And"); if(!andNode.IsNull()) { @@ -79,6 +87,12 @@ void MetricsFilter::AddToNode(XmlNode& parentNode) const m_tag.AddToNode(tagNode); } + if(m_accessPointArnHasBeenSet) + { + XmlNode accessPointArnNode = parentNode.CreateChildElement("AccessPointArn"); + accessPointArnNode.SetText(m_accessPointArn); + } + if(m_andHasBeenSet) { XmlNode andNode = parentNode.CreateChildElement("And"); diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/MultipartUpload.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/MultipartUpload.cpp index 6d92ea2cb6..c64926a272 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/MultipartUpload.cpp +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/MultipartUpload.cpp @@ -27,7 +27,9 @@ MultipartUpload::MultipartUpload() : m_storageClass(StorageClass::NOT_SET), m_storageClassHasBeenSet(false), m_ownerHasBeenSet(false), - m_initiatorHasBeenSet(false) + m_initiatorHasBeenSet(false), + m_checksumAlgorithm(ChecksumAlgorithm::NOT_SET), + m_checksumAlgorithmHasBeenSet(false) { } @@ -38,7 +40,9 @@ MultipartUpload::MultipartUpload(const XmlNode& xmlNode) : m_storageClass(StorageClass::NOT_SET), m_storageClassHasBeenSet(false), m_ownerHasBeenSet(false), - m_initiatorHasBeenSet(false) + m_initiatorHasBeenSet(false), + m_checksumAlgorithm(ChecksumAlgorithm::NOT_SET), + m_checksumAlgorithmHasBeenSet(false) { *this = xmlNode; } @@ -64,7 +68,7 @@ MultipartUpload& MultipartUpload::operator =(const XmlNode& xmlNode) XmlNode initiatedNode = resultNode.FirstChild("Initiated"); if(!initiatedNode.IsNull()) { - m_initiated = DateTime(StringUtils::Trim(Aws::Utils::Xml::DecodeEscapedXmlText(initiatedNode.GetText()).c_str()).c_str(), DateFormat::ISO_8601); + m_initiated = DateTime(StringUtils::Trim(Aws::Utils::Xml::DecodeEscapedXmlText(initiatedNode.GetText()).c_str()).c_str(), Aws::Utils::DateFormat::ISO_8601); m_initiatedHasBeenSet = true; } XmlNode storageClassNode = resultNode.FirstChild("StorageClass"); @@ -85,6 +89,12 @@ MultipartUpload& MultipartUpload::operator =(const XmlNode& xmlNode) m_initiator = initiatorNode; m_initiatorHasBeenSet = true; } + XmlNode checksumAlgorithmNode = resultNode.FirstChild("ChecksumAlgorithm"); + if(!checksumAlgorithmNode.IsNull()) + { + m_checksumAlgorithm = ChecksumAlgorithmMapper::GetChecksumAlgorithmForName(StringUtils::Trim(Aws::Utils::Xml::DecodeEscapedXmlText(checksumAlgorithmNode.GetText()).c_str()).c_str()); + m_checksumAlgorithmHasBeenSet = true; + } } return *this; @@ -108,7 +118,7 @@ void MultipartUpload::AddToNode(XmlNode& parentNode) const if(m_initiatedHasBeenSet) { XmlNode initiatedNode = parentNode.CreateChildElement("Initiated"); - initiatedNode.SetText(m_initiated.ToGmtString(DateFormat::ISO_8601)); + initiatedNode.SetText(m_initiated.ToGmtString(Aws::Utils::DateFormat::ISO_8601)); } if(m_storageClassHasBeenSet) @@ -129,6 +139,12 @@ void MultipartUpload::AddToNode(XmlNode& parentNode) const m_initiator.AddToNode(initiatorNode); } + if(m_checksumAlgorithmHasBeenSet) + { + XmlNode checksumAlgorithmNode = parentNode.CreateChildElement("ChecksumAlgorithm"); + checksumAlgorithmNode.SetText(ChecksumAlgorithmMapper::GetNameForChecksumAlgorithm(m_checksumAlgorithm)); + } + } } // namespace Model diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/NoncurrentVersionExpiration.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/NoncurrentVersionExpiration.cpp index ab6db39f61..a3282e5fc9 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/NoncurrentVersionExpiration.cpp +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/NoncurrentVersionExpiration.cpp @@ -22,13 +22,17 @@ namespace Model NoncurrentVersionExpiration::NoncurrentVersionExpiration() : m_noncurrentDays(0), - m_noncurrentDaysHasBeenSet(false) + m_noncurrentDaysHasBeenSet(false), + m_newerNoncurrentVersions(0), + m_newerNoncurrentVersionsHasBeenSet(false) { } NoncurrentVersionExpiration::NoncurrentVersionExpiration(const XmlNode& xmlNode) : m_noncurrentDays(0), - m_noncurrentDaysHasBeenSet(false) + m_noncurrentDaysHasBeenSet(false), + m_newerNoncurrentVersions(0), + m_newerNoncurrentVersionsHasBeenSet(false) { *this = xmlNode; } @@ -45,6 +49,12 @@ NoncurrentVersionExpiration& NoncurrentVersionExpiration::operator =(const XmlNo m_noncurrentDays = StringUtils::ConvertToInt32(StringUtils::Trim(Aws::Utils::Xml::DecodeEscapedXmlText(noncurrentDaysNode.GetText()).c_str()).c_str()); m_noncurrentDaysHasBeenSet = true; } + XmlNode newerNoncurrentVersionsNode = resultNode.FirstChild("NewerNoncurrentVersions"); + if(!newerNoncurrentVersionsNode.IsNull()) + { + m_newerNoncurrentVersions = StringUtils::ConvertToInt32(StringUtils::Trim(Aws::Utils::Xml::DecodeEscapedXmlText(newerNoncurrentVersionsNode.GetText()).c_str()).c_str()); + m_newerNoncurrentVersionsHasBeenSet = true; + } } return *this; @@ -61,6 +71,14 @@ void NoncurrentVersionExpiration::AddToNode(XmlNode& parentNode) const ss.str(""); } + if(m_newerNoncurrentVersionsHasBeenSet) + { + XmlNode newerNoncurrentVersionsNode = parentNode.CreateChildElement("NewerNoncurrentVersions"); + ss << m_newerNoncurrentVersions; + newerNoncurrentVersionsNode.SetText(ss.str()); + ss.str(""); + } + } } // namespace Model diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/NoncurrentVersionTransition.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/NoncurrentVersionTransition.cpp index e7027d679b..71d5880890 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/NoncurrentVersionTransition.cpp +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/NoncurrentVersionTransition.cpp @@ -24,7 +24,9 @@ NoncurrentVersionTransition::NoncurrentVersionTransition() : m_noncurrentDays(0), m_noncurrentDaysHasBeenSet(false), m_storageClass(TransitionStorageClass::NOT_SET), - m_storageClassHasBeenSet(false) + m_storageClassHasBeenSet(false), + m_newerNoncurrentVersions(0), + m_newerNoncurrentVersionsHasBeenSet(false) { } @@ -32,7 +34,9 @@ NoncurrentVersionTransition::NoncurrentVersionTransition(const XmlNode& xmlNode) m_noncurrentDays(0), m_noncurrentDaysHasBeenSet(false), m_storageClass(TransitionStorageClass::NOT_SET), - m_storageClassHasBeenSet(false) + m_storageClassHasBeenSet(false), + m_newerNoncurrentVersions(0), + m_newerNoncurrentVersionsHasBeenSet(false) { *this = xmlNode; } @@ -55,6 +59,12 @@ NoncurrentVersionTransition& NoncurrentVersionTransition::operator =(const XmlNo m_storageClass = TransitionStorageClassMapper::GetTransitionStorageClassForName(StringUtils::Trim(Aws::Utils::Xml::DecodeEscapedXmlText(storageClassNode.GetText()).c_str()).c_str()); m_storageClassHasBeenSet = true; } + XmlNode newerNoncurrentVersionsNode = resultNode.FirstChild("NewerNoncurrentVersions"); + if(!newerNoncurrentVersionsNode.IsNull()) + { + m_newerNoncurrentVersions = StringUtils::ConvertToInt32(StringUtils::Trim(Aws::Utils::Xml::DecodeEscapedXmlText(newerNoncurrentVersionsNode.GetText()).c_str()).c_str()); + m_newerNoncurrentVersionsHasBeenSet = true; + } } return *this; @@ -77,6 +87,14 @@ void NoncurrentVersionTransition::AddToNode(XmlNode& parentNode) const storageClassNode.SetText(TransitionStorageClassMapper::GetNameForTransitionStorageClass(m_storageClass)); } + if(m_newerNoncurrentVersionsHasBeenSet) + { + XmlNode newerNoncurrentVersionsNode = parentNode.CreateChildElement("NewerNoncurrentVersions"); + ss << m_newerNoncurrentVersions; + newerNoncurrentVersionsNode.SetText(ss.str()); + ss.str(""); + } + } } // namespace Model diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/NotificationConfiguration.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/NotificationConfiguration.cpp index bb62ecb84d..b3b79d4a5f 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/NotificationConfiguration.cpp +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/NotificationConfiguration.cpp @@ -23,14 +23,16 @@ namespace Model NotificationConfiguration::NotificationConfiguration() : m_topicConfigurationsHasBeenSet(false), m_queueConfigurationsHasBeenSet(false), - m_lambdaFunctionConfigurationsHasBeenSet(false) + m_lambdaFunctionConfigurationsHasBeenSet(false), + m_eventBridgeConfigurationHasBeenSet(false) { } NotificationConfiguration::NotificationConfiguration(const XmlNode& xmlNode) : m_topicConfigurationsHasBeenSet(false), m_queueConfigurationsHasBeenSet(false), - m_lambdaFunctionConfigurationsHasBeenSet(false) + m_lambdaFunctionConfigurationsHasBeenSet(false), + m_eventBridgeConfigurationHasBeenSet(false) { *this = xmlNode; } @@ -77,6 +79,12 @@ NotificationConfiguration& NotificationConfiguration::operator =(const XmlNode& m_lambdaFunctionConfigurationsHasBeenSet = true; } + XmlNode eventBridgeConfigurationNode = resultNode.FirstChild("EventBridgeConfiguration"); + if(!eventBridgeConfigurationNode.IsNull()) + { + m_eventBridgeConfiguration = eventBridgeConfigurationNode; + m_eventBridgeConfigurationHasBeenSet = true; + } } return *this; @@ -112,6 +120,12 @@ void NotificationConfiguration::AddToNode(XmlNode& parentNode) const } } + if(m_eventBridgeConfigurationHasBeenSet) + { + XmlNode eventBridgeConfigurationNode = parentNode.CreateChildElement("EventBridgeConfiguration"); + m_eventBridgeConfiguration.AddToNode(eventBridgeConfigurationNode); + } + } } // namespace Model diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/Object.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/Object.cpp index d7d963fc21..41f985e168 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/Object.cpp +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/Object.cpp @@ -24,6 +24,7 @@ Object::Object() : m_keyHasBeenSet(false), m_lastModifiedHasBeenSet(false), m_eTagHasBeenSet(false), + m_checksumAlgorithmHasBeenSet(false), m_size(0), m_sizeHasBeenSet(false), m_storageClass(ObjectStorageClass::NOT_SET), @@ -36,6 +37,7 @@ Object::Object(const XmlNode& xmlNode) : m_keyHasBeenSet(false), m_lastModifiedHasBeenSet(false), m_eTagHasBeenSet(false), + m_checksumAlgorithmHasBeenSet(false), m_size(0), m_sizeHasBeenSet(false), m_storageClass(ObjectStorageClass::NOT_SET), @@ -60,7 +62,7 @@ Object& Object::operator =(const XmlNode& xmlNode) XmlNode lastModifiedNode = resultNode.FirstChild("LastModified"); if(!lastModifiedNode.IsNull()) { - m_lastModified = DateTime(StringUtils::Trim(Aws::Utils::Xml::DecodeEscapedXmlText(lastModifiedNode.GetText()).c_str()).c_str(), DateFormat::ISO_8601); + m_lastModified = DateTime(StringUtils::Trim(Aws::Utils::Xml::DecodeEscapedXmlText(lastModifiedNode.GetText()).c_str()).c_str(), Aws::Utils::DateFormat::ISO_8601); m_lastModifiedHasBeenSet = true; } XmlNode eTagNode = resultNode.FirstChild("ETag"); @@ -69,6 +71,18 @@ Object& Object::operator =(const XmlNode& xmlNode) m_eTag = Aws::Utils::Xml::DecodeEscapedXmlText(eTagNode.GetText()); m_eTagHasBeenSet = true; } + XmlNode checksumAlgorithmNode = resultNode.FirstChild("ChecksumAlgorithm"); + if(!checksumAlgorithmNode.IsNull()) + { + XmlNode checksumAlgorithmMember = checksumAlgorithmNode; + while(!checksumAlgorithmMember.IsNull()) + { + m_checksumAlgorithm.push_back(ChecksumAlgorithmMapper::GetChecksumAlgorithmForName(StringUtils::Trim(checksumAlgorithmMember.GetText().c_str()))); + checksumAlgorithmMember = checksumAlgorithmMember.NextNode("ChecksumAlgorithm"); + } + + m_checksumAlgorithmHasBeenSet = true; + } XmlNode sizeNode = resultNode.FirstChild("Size"); if(!sizeNode.IsNull()) { @@ -104,7 +118,7 @@ void Object::AddToNode(XmlNode& parentNode) const if(m_lastModifiedHasBeenSet) { XmlNode lastModifiedNode = parentNode.CreateChildElement("LastModified"); - lastModifiedNode.SetText(m_lastModified.ToGmtString(DateFormat::ISO_8601)); + lastModifiedNode.SetText(m_lastModified.ToGmtString(Aws::Utils::DateFormat::ISO_8601)); } if(m_eTagHasBeenSet) @@ -113,6 +127,16 @@ void Object::AddToNode(XmlNode& parentNode) const eTagNode.SetText(m_eTag); } + if(m_checksumAlgorithmHasBeenSet) + { + XmlNode checksumAlgorithmParentNode = parentNode.CreateChildElement("ChecksumAlgorithm"); + for(const auto& item : m_checksumAlgorithm) + { + XmlNode checksumAlgorithmNode = checksumAlgorithmParentNode.CreateChildElement("ChecksumAlgorithm"); + checksumAlgorithmNode.SetText(ChecksumAlgorithmMapper::GetNameForChecksumAlgorithm(item)); + } + } + if(m_sizeHasBeenSet) { XmlNode sizeNode = parentNode.CreateChildElement("Size"); diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/ObjectAttributes.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/ObjectAttributes.cpp new file mode 100644 index 0000000000..c4159dcde2 --- /dev/null +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/ObjectAttributes.cpp @@ -0,0 +1,91 @@ +/** + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. + * SPDX-License-Identifier: Apache-2.0. + */ + +#include <aws/s3/model/ObjectAttributes.h> +#include <aws/core/utils/HashingUtils.h> +#include <aws/core/Globals.h> +#include <aws/core/utils/EnumParseOverflowContainer.h> + +using namespace Aws::Utils; + + +namespace Aws +{ + namespace S3 + { + namespace Model + { + namespace ObjectAttributesMapper + { + + static const int ETag_HASH = HashingUtils::HashString("ETag"); + static const int Checksum_HASH = HashingUtils::HashString("Checksum"); + static const int ObjectParts_HASH = HashingUtils::HashString("ObjectParts"); + static const int StorageClass_HASH = HashingUtils::HashString("StorageClass"); + static const int ObjectSize_HASH = HashingUtils::HashString("ObjectSize"); + + + ObjectAttributes GetObjectAttributesForName(const Aws::String& name) + { + int hashCode = HashingUtils::HashString(name.c_str()); + if (hashCode == ETag_HASH) + { + return ObjectAttributes::ETag; + } + else if (hashCode == Checksum_HASH) + { + return ObjectAttributes::Checksum; + } + else if (hashCode == ObjectParts_HASH) + { + return ObjectAttributes::ObjectParts; + } + else if (hashCode == StorageClass_HASH) + { + return ObjectAttributes::StorageClass; + } + else if (hashCode == ObjectSize_HASH) + { + return ObjectAttributes::ObjectSize; + } + EnumParseOverflowContainer* overflowContainer = Aws::GetEnumOverflowContainer(); + if(overflowContainer) + { + overflowContainer->StoreOverflow(hashCode, name); + return static_cast<ObjectAttributes>(hashCode); + } + + return ObjectAttributes::NOT_SET; + } + + Aws::String GetNameForObjectAttributes(ObjectAttributes enumValue) + { + switch(enumValue) + { + case ObjectAttributes::ETag: + return "ETag"; + case ObjectAttributes::Checksum: + return "Checksum"; + case ObjectAttributes::ObjectParts: + return "ObjectParts"; + case ObjectAttributes::StorageClass: + return "StorageClass"; + case ObjectAttributes::ObjectSize: + return "ObjectSize"; + default: + EnumParseOverflowContainer* overflowContainer = Aws::GetEnumOverflowContainer(); + if(overflowContainer) + { + return overflowContainer->RetrieveOverflow(static_cast<int>(enumValue)); + } + + return {}; + } + } + + } // namespace ObjectAttributesMapper + } // namespace Model + } // namespace S3 +} // namespace Aws diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/ObjectLockRetention.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/ObjectLockRetention.cpp index 3ba5d5590e..f9b3d70c7f 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/ObjectLockRetention.cpp +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/ObjectLockRetention.cpp @@ -50,7 +50,7 @@ ObjectLockRetention& ObjectLockRetention::operator =(const XmlNode& xmlNode) XmlNode retainUntilDateNode = resultNode.FirstChild("RetainUntilDate"); if(!retainUntilDateNode.IsNull()) { - m_retainUntilDate = DateTime(StringUtils::Trim(Aws::Utils::Xml::DecodeEscapedXmlText(retainUntilDateNode.GetText()).c_str()).c_str(), DateFormat::ISO_8601); + m_retainUntilDate = DateTime(StringUtils::Trim(Aws::Utils::Xml::DecodeEscapedXmlText(retainUntilDateNode.GetText()).c_str()).c_str(), Aws::Utils::DateFormat::ISO_8601); m_retainUntilDateHasBeenSet = true; } } @@ -70,7 +70,7 @@ void ObjectLockRetention::AddToNode(XmlNode& parentNode) const if(m_retainUntilDateHasBeenSet) { XmlNode retainUntilDateNode = parentNode.CreateChildElement("RetainUntilDate"); - retainUntilDateNode.SetText(m_retainUntilDate.ToGmtString(DateFormat::ISO_8601)); + retainUntilDateNode.SetText(m_retainUntilDate.ToGmtString(Aws::Utils::DateFormat::ISO_8601)); } } diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/ObjectOwnership.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/ObjectOwnership.cpp index 4e2a106c8e..7fba54e6c8 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/ObjectOwnership.cpp +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/ObjectOwnership.cpp @@ -22,6 +22,7 @@ namespace Aws static const int BucketOwnerPreferred_HASH = HashingUtils::HashString("BucketOwnerPreferred"); static const int ObjectWriter_HASH = HashingUtils::HashString("ObjectWriter"); + static const int BucketOwnerEnforced_HASH = HashingUtils::HashString("BucketOwnerEnforced"); ObjectOwnership GetObjectOwnershipForName(const Aws::String& name) @@ -35,6 +36,10 @@ namespace Aws { return ObjectOwnership::ObjectWriter; } + else if (hashCode == BucketOwnerEnforced_HASH) + { + return ObjectOwnership::BucketOwnerEnforced; + } EnumParseOverflowContainer* overflowContainer = Aws::GetEnumOverflowContainer(); if(overflowContainer) { @@ -53,6 +58,8 @@ namespace Aws return "BucketOwnerPreferred"; case ObjectOwnership::ObjectWriter: return "ObjectWriter"; + case ObjectOwnership::BucketOwnerEnforced: + return "BucketOwnerEnforced"; default: EnumParseOverflowContainer* overflowContainer = Aws::GetEnumOverflowContainer(); if(overflowContainer) diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/ObjectPart.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/ObjectPart.cpp new file mode 100644 index 0000000000..fdbd9eebc0 --- /dev/null +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/ObjectPart.cpp @@ -0,0 +1,142 @@ +/** + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. + * SPDX-License-Identifier: Apache-2.0. + */ + +#include <aws/s3/model/ObjectPart.h> +#include <aws/core/utils/xml/XmlSerializer.h> +#include <aws/core/utils/StringUtils.h> +#include <aws/core/utils/memory/stl/AWSStringStream.h> + +#include <utility> + +using namespace Aws::Utils::Xml; +using namespace Aws::Utils; + +namespace Aws +{ +namespace S3 +{ +namespace Model +{ + +ObjectPart::ObjectPart() : + m_partNumber(0), + m_partNumberHasBeenSet(false), + m_size(0), + m_sizeHasBeenSet(false), + m_checksumCRC32HasBeenSet(false), + m_checksumCRC32CHasBeenSet(false), + m_checksumSHA1HasBeenSet(false), + m_checksumSHA256HasBeenSet(false) +{ +} + +ObjectPart::ObjectPart(const XmlNode& xmlNode) : + m_partNumber(0), + m_partNumberHasBeenSet(false), + m_size(0), + m_sizeHasBeenSet(false), + m_checksumCRC32HasBeenSet(false), + m_checksumCRC32CHasBeenSet(false), + m_checksumSHA1HasBeenSet(false), + m_checksumSHA256HasBeenSet(false) +{ + *this = xmlNode; +} + +ObjectPart& ObjectPart::operator =(const XmlNode& xmlNode) +{ + XmlNode resultNode = xmlNode; + + if(!resultNode.IsNull()) + { + XmlNode partNumberNode = resultNode.FirstChild("PartNumber"); + if(!partNumberNode.IsNull()) + { + m_partNumber = StringUtils::ConvertToInt32(StringUtils::Trim(Aws::Utils::Xml::DecodeEscapedXmlText(partNumberNode.GetText()).c_str()).c_str()); + m_partNumberHasBeenSet = true; + } + XmlNode sizeNode = resultNode.FirstChild("Size"); + if(!sizeNode.IsNull()) + { + m_size = StringUtils::ConvertToInt64(StringUtils::Trim(Aws::Utils::Xml::DecodeEscapedXmlText(sizeNode.GetText()).c_str()).c_str()); + m_sizeHasBeenSet = true; + } + XmlNode checksumCRC32Node = resultNode.FirstChild("ChecksumCRC32"); + if(!checksumCRC32Node.IsNull()) + { + m_checksumCRC32 = Aws::Utils::Xml::DecodeEscapedXmlText(checksumCRC32Node.GetText()); + m_checksumCRC32HasBeenSet = true; + } + XmlNode checksumCRC32CNode = resultNode.FirstChild("ChecksumCRC32C"); + if(!checksumCRC32CNode.IsNull()) + { + m_checksumCRC32C = Aws::Utils::Xml::DecodeEscapedXmlText(checksumCRC32CNode.GetText()); + m_checksumCRC32CHasBeenSet = true; + } + XmlNode checksumSHA1Node = resultNode.FirstChild("ChecksumSHA1"); + if(!checksumSHA1Node.IsNull()) + { + m_checksumSHA1 = Aws::Utils::Xml::DecodeEscapedXmlText(checksumSHA1Node.GetText()); + m_checksumSHA1HasBeenSet = true; + } + XmlNode checksumSHA256Node = resultNode.FirstChild("ChecksumSHA256"); + if(!checksumSHA256Node.IsNull()) + { + m_checksumSHA256 = Aws::Utils::Xml::DecodeEscapedXmlText(checksumSHA256Node.GetText()); + m_checksumSHA256HasBeenSet = true; + } + } + + return *this; +} + +void ObjectPart::AddToNode(XmlNode& parentNode) const +{ + Aws::StringStream ss; + if(m_partNumberHasBeenSet) + { + XmlNode partNumberNode = parentNode.CreateChildElement("PartNumber"); + ss << m_partNumber; + partNumberNode.SetText(ss.str()); + ss.str(""); + } + + if(m_sizeHasBeenSet) + { + XmlNode sizeNode = parentNode.CreateChildElement("Size"); + ss << m_size; + sizeNode.SetText(ss.str()); + ss.str(""); + } + + if(m_checksumCRC32HasBeenSet) + { + XmlNode checksumCRC32Node = parentNode.CreateChildElement("ChecksumCRC32"); + checksumCRC32Node.SetText(m_checksumCRC32); + } + + if(m_checksumCRC32CHasBeenSet) + { + XmlNode checksumCRC32CNode = parentNode.CreateChildElement("ChecksumCRC32C"); + checksumCRC32CNode.SetText(m_checksumCRC32C); + } + + if(m_checksumSHA1HasBeenSet) + { + XmlNode checksumSHA1Node = parentNode.CreateChildElement("ChecksumSHA1"); + checksumSHA1Node.SetText(m_checksumSHA1); + } + + if(m_checksumSHA256HasBeenSet) + { + XmlNode checksumSHA256Node = parentNode.CreateChildElement("ChecksumSHA256"); + checksumSHA256Node.SetText(m_checksumSHA256); + } + +} + +} // namespace Model +} // namespace S3 +} // namespace Aws diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/ObjectStorageClass.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/ObjectStorageClass.cpp index 572041c798..fd0e06fbc4 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/ObjectStorageClass.cpp +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/ObjectStorageClass.cpp @@ -28,6 +28,7 @@ namespace Aws static const int INTELLIGENT_TIERING_HASH = HashingUtils::HashString("INTELLIGENT_TIERING"); static const int DEEP_ARCHIVE_HASH = HashingUtils::HashString("DEEP_ARCHIVE"); static const int OUTPOSTS_HASH = HashingUtils::HashString("OUTPOSTS"); + static const int GLACIER_IR_HASH = HashingUtils::HashString("GLACIER_IR"); ObjectStorageClass GetObjectStorageClassForName(const Aws::String& name) @@ -65,6 +66,10 @@ namespace Aws { return ObjectStorageClass::OUTPOSTS; } + else if (hashCode == GLACIER_IR_HASH) + { + return ObjectStorageClass::GLACIER_IR; + } EnumParseOverflowContainer* overflowContainer = Aws::GetEnumOverflowContainer(); if(overflowContainer) { @@ -95,6 +100,8 @@ namespace Aws return "DEEP_ARCHIVE"; case ObjectStorageClass::OUTPOSTS: return "OUTPOSTS"; + case ObjectStorageClass::GLACIER_IR: + return "GLACIER_IR"; default: EnumParseOverflowContainer* overflowContainer = Aws::GetEnumOverflowContainer(); if(overflowContainer) diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/ObjectVersion.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/ObjectVersion.cpp index c7b720f252..11a8542a02 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/ObjectVersion.cpp +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/ObjectVersion.cpp @@ -22,6 +22,7 @@ namespace Model ObjectVersion::ObjectVersion() : m_eTagHasBeenSet(false), + m_checksumAlgorithmHasBeenSet(false), m_size(0), m_sizeHasBeenSet(false), m_storageClass(ObjectVersionStorageClass::NOT_SET), @@ -37,6 +38,7 @@ ObjectVersion::ObjectVersion() : ObjectVersion::ObjectVersion(const XmlNode& xmlNode) : m_eTagHasBeenSet(false), + m_checksumAlgorithmHasBeenSet(false), m_size(0), m_sizeHasBeenSet(false), m_storageClass(ObjectVersionStorageClass::NOT_SET), @@ -63,6 +65,18 @@ ObjectVersion& ObjectVersion::operator =(const XmlNode& xmlNode) m_eTag = Aws::Utils::Xml::DecodeEscapedXmlText(eTagNode.GetText()); m_eTagHasBeenSet = true; } + XmlNode checksumAlgorithmNode = resultNode.FirstChild("ChecksumAlgorithm"); + if(!checksumAlgorithmNode.IsNull()) + { + XmlNode checksumAlgorithmMember = checksumAlgorithmNode; + while(!checksumAlgorithmMember.IsNull()) + { + m_checksumAlgorithm.push_back(ChecksumAlgorithmMapper::GetChecksumAlgorithmForName(StringUtils::Trim(checksumAlgorithmMember.GetText().c_str()))); + checksumAlgorithmMember = checksumAlgorithmMember.NextNode("ChecksumAlgorithm"); + } + + m_checksumAlgorithmHasBeenSet = true; + } XmlNode sizeNode = resultNode.FirstChild("Size"); if(!sizeNode.IsNull()) { @@ -96,7 +110,7 @@ ObjectVersion& ObjectVersion::operator =(const XmlNode& xmlNode) XmlNode lastModifiedNode = resultNode.FirstChild("LastModified"); if(!lastModifiedNode.IsNull()) { - m_lastModified = DateTime(StringUtils::Trim(Aws::Utils::Xml::DecodeEscapedXmlText(lastModifiedNode.GetText()).c_str()).c_str(), DateFormat::ISO_8601); + m_lastModified = DateTime(StringUtils::Trim(Aws::Utils::Xml::DecodeEscapedXmlText(lastModifiedNode.GetText()).c_str()).c_str(), Aws::Utils::DateFormat::ISO_8601); m_lastModifiedHasBeenSet = true; } XmlNode ownerNode = resultNode.FirstChild("Owner"); @@ -119,6 +133,16 @@ void ObjectVersion::AddToNode(XmlNode& parentNode) const eTagNode.SetText(m_eTag); } + if(m_checksumAlgorithmHasBeenSet) + { + XmlNode checksumAlgorithmParentNode = parentNode.CreateChildElement("ChecksumAlgorithm"); + for(const auto& item : m_checksumAlgorithm) + { + XmlNode checksumAlgorithmNode = checksumAlgorithmParentNode.CreateChildElement("ChecksumAlgorithm"); + checksumAlgorithmNode.SetText(ChecksumAlgorithmMapper::GetNameForChecksumAlgorithm(item)); + } + } + if(m_sizeHasBeenSet) { XmlNode sizeNode = parentNode.CreateChildElement("Size"); @@ -156,7 +180,7 @@ void ObjectVersion::AddToNode(XmlNode& parentNode) const if(m_lastModifiedHasBeenSet) { XmlNode lastModifiedNode = parentNode.CreateChildElement("LastModified"); - lastModifiedNode.SetText(m_lastModified.ToGmtString(DateFormat::ISO_8601)); + lastModifiedNode.SetText(m_lastModified.ToGmtString(Aws::Utils::DateFormat::ISO_8601)); } if(m_ownerHasBeenSet) diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/Part.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/Part.cpp index a243f72d10..d0cd0f01cf 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/Part.cpp +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/Part.cpp @@ -26,7 +26,11 @@ Part::Part() : m_lastModifiedHasBeenSet(false), m_eTagHasBeenSet(false), m_size(0), - m_sizeHasBeenSet(false) + m_sizeHasBeenSet(false), + m_checksumCRC32HasBeenSet(false), + m_checksumCRC32CHasBeenSet(false), + m_checksumSHA1HasBeenSet(false), + m_checksumSHA256HasBeenSet(false) { } @@ -36,7 +40,11 @@ Part::Part(const XmlNode& xmlNode) : m_lastModifiedHasBeenSet(false), m_eTagHasBeenSet(false), m_size(0), - m_sizeHasBeenSet(false) + m_sizeHasBeenSet(false), + m_checksumCRC32HasBeenSet(false), + m_checksumCRC32CHasBeenSet(false), + m_checksumSHA1HasBeenSet(false), + m_checksumSHA256HasBeenSet(false) { *this = xmlNode; } @@ -56,7 +64,7 @@ Part& Part::operator =(const XmlNode& xmlNode) XmlNode lastModifiedNode = resultNode.FirstChild("LastModified"); if(!lastModifiedNode.IsNull()) { - m_lastModified = DateTime(StringUtils::Trim(Aws::Utils::Xml::DecodeEscapedXmlText(lastModifiedNode.GetText()).c_str()).c_str(), DateFormat::ISO_8601); + m_lastModified = DateTime(StringUtils::Trim(Aws::Utils::Xml::DecodeEscapedXmlText(lastModifiedNode.GetText()).c_str()).c_str(), Aws::Utils::DateFormat::ISO_8601); m_lastModifiedHasBeenSet = true; } XmlNode eTagNode = resultNode.FirstChild("ETag"); @@ -71,6 +79,30 @@ Part& Part::operator =(const XmlNode& xmlNode) m_size = StringUtils::ConvertToInt64(StringUtils::Trim(Aws::Utils::Xml::DecodeEscapedXmlText(sizeNode.GetText()).c_str()).c_str()); m_sizeHasBeenSet = true; } + XmlNode checksumCRC32Node = resultNode.FirstChild("ChecksumCRC32"); + if(!checksumCRC32Node.IsNull()) + { + m_checksumCRC32 = Aws::Utils::Xml::DecodeEscapedXmlText(checksumCRC32Node.GetText()); + m_checksumCRC32HasBeenSet = true; + } + XmlNode checksumCRC32CNode = resultNode.FirstChild("ChecksumCRC32C"); + if(!checksumCRC32CNode.IsNull()) + { + m_checksumCRC32C = Aws::Utils::Xml::DecodeEscapedXmlText(checksumCRC32CNode.GetText()); + m_checksumCRC32CHasBeenSet = true; + } + XmlNode checksumSHA1Node = resultNode.FirstChild("ChecksumSHA1"); + if(!checksumSHA1Node.IsNull()) + { + m_checksumSHA1 = Aws::Utils::Xml::DecodeEscapedXmlText(checksumSHA1Node.GetText()); + m_checksumSHA1HasBeenSet = true; + } + XmlNode checksumSHA256Node = resultNode.FirstChild("ChecksumSHA256"); + if(!checksumSHA256Node.IsNull()) + { + m_checksumSHA256 = Aws::Utils::Xml::DecodeEscapedXmlText(checksumSHA256Node.GetText()); + m_checksumSHA256HasBeenSet = true; + } } return *this; @@ -90,7 +122,7 @@ void Part::AddToNode(XmlNode& parentNode) const if(m_lastModifiedHasBeenSet) { XmlNode lastModifiedNode = parentNode.CreateChildElement("LastModified"); - lastModifiedNode.SetText(m_lastModified.ToGmtString(DateFormat::ISO_8601)); + lastModifiedNode.SetText(m_lastModified.ToGmtString(Aws::Utils::DateFormat::ISO_8601)); } if(m_eTagHasBeenSet) @@ -107,6 +139,30 @@ void Part::AddToNode(XmlNode& parentNode) const ss.str(""); } + if(m_checksumCRC32HasBeenSet) + { + XmlNode checksumCRC32Node = parentNode.CreateChildElement("ChecksumCRC32"); + checksumCRC32Node.SetText(m_checksumCRC32); + } + + if(m_checksumCRC32CHasBeenSet) + { + XmlNode checksumCRC32CNode = parentNode.CreateChildElement("ChecksumCRC32C"); + checksumCRC32CNode.SetText(m_checksumCRC32C); + } + + if(m_checksumSHA1HasBeenSet) + { + XmlNode checksumSHA1Node = parentNode.CreateChildElement("ChecksumSHA1"); + checksumSHA1Node.SetText(m_checksumSHA1); + } + + if(m_checksumSHA256HasBeenSet) + { + XmlNode checksumSHA256Node = parentNode.CreateChildElement("ChecksumSHA256"); + checksumSHA256Node.SetText(m_checksumSHA256); + } + } } // namespace Model diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/PutBucketAccelerateConfigurationRequest.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/PutBucketAccelerateConfigurationRequest.cpp index 15da0c32a1..c58ed72a04 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/PutBucketAccelerateConfigurationRequest.cpp +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/PutBucketAccelerateConfigurationRequest.cpp @@ -20,6 +20,8 @@ PutBucketAccelerateConfigurationRequest::PutBucketAccelerateConfigurationRequest m_bucketHasBeenSet(false), m_accelerateConfigurationHasBeenSet(false), m_expectedBucketOwnerHasBeenSet(false), + m_checksumAlgorithm(ChecksumAlgorithm::NOT_SET), + m_checksumAlgorithmHasBeenSet(false), m_customizedAccessLogTagHasBeenSet(false) { } @@ -73,5 +75,33 @@ Aws::Http::HeaderValueCollection PutBucketAccelerateConfigurationRequest::GetReq ss.str(""); } + if(m_checksumAlgorithmHasBeenSet) + { + headers.emplace("x-amz-sdk-checksum-algorithm", ChecksumAlgorithmMapper::GetNameForChecksumAlgorithm(m_checksumAlgorithm)); + } + return headers; } + +PutBucketAccelerateConfigurationRequest::EndpointParameters PutBucketAccelerateConfigurationRequest::GetEndpointContextParams() const +{ + EndpointParameters parameters; + // Operation context parameters + if (BucketHasBeenSet()) { + parameters.emplace_back(Aws::String("Bucket"), this->GetBucket(), Aws::Endpoint::EndpointParameter::ParameterOrigin::OPERATION_CONTEXT); + } + return parameters; +} + +Aws::String PutBucketAccelerateConfigurationRequest::GetChecksumAlgorithmName() const +{ + if (m_checksumAlgorithm == ChecksumAlgorithm::NOT_SET) + { + return "md5"; + } + else + { + return ChecksumAlgorithmMapper::GetNameForChecksumAlgorithm(m_checksumAlgorithm); + } +} + diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/PutBucketAclRequest.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/PutBucketAclRequest.cpp index 5a3efcac19..a7273a85a4 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/PutBucketAclRequest.cpp +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/PutBucketAclRequest.cpp @@ -22,6 +22,8 @@ PutBucketAclRequest::PutBucketAclRequest() : m_accessControlPolicyHasBeenSet(false), m_bucketHasBeenSet(false), m_contentMD5HasBeenSet(false), + m_checksumAlgorithm(ChecksumAlgorithm::NOT_SET), + m_checksumAlgorithmHasBeenSet(false), m_grantFullControlHasBeenSet(false), m_grantReadHasBeenSet(false), m_grantReadACPHasBeenSet(false), @@ -86,6 +88,11 @@ Aws::Http::HeaderValueCollection PutBucketAclRequest::GetRequestSpecificHeaders( ss.str(""); } + if(m_checksumAlgorithmHasBeenSet) + { + headers.emplace("x-amz-sdk-checksum-algorithm", ChecksumAlgorithmMapper::GetNameForChecksumAlgorithm(m_checksumAlgorithm)); + } + if(m_grantFullControlHasBeenSet) { ss << m_grantFullControl; @@ -130,3 +137,26 @@ Aws::Http::HeaderValueCollection PutBucketAclRequest::GetRequestSpecificHeaders( return headers; } + +PutBucketAclRequest::EndpointParameters PutBucketAclRequest::GetEndpointContextParams() const +{ + EndpointParameters parameters; + // Operation context parameters + if (BucketHasBeenSet()) { + parameters.emplace_back(Aws::String("Bucket"), this->GetBucket(), Aws::Endpoint::EndpointParameter::ParameterOrigin::OPERATION_CONTEXT); + } + return parameters; +} + +Aws::String PutBucketAclRequest::GetChecksumAlgorithmName() const +{ + if (m_checksumAlgorithm == ChecksumAlgorithm::NOT_SET) + { + return "md5"; + } + else + { + return ChecksumAlgorithmMapper::GetNameForChecksumAlgorithm(m_checksumAlgorithm); + } +} + diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/PutBucketAnalyticsConfigurationRequest.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/PutBucketAnalyticsConfigurationRequest.cpp index 73f9111f63..29d6e03e59 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/PutBucketAnalyticsConfigurationRequest.cpp +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/PutBucketAnalyticsConfigurationRequest.cpp @@ -83,3 +83,13 @@ Aws::Http::HeaderValueCollection PutBucketAnalyticsConfigurationRequest::GetRequ return headers; } + +PutBucketAnalyticsConfigurationRequest::EndpointParameters PutBucketAnalyticsConfigurationRequest::GetEndpointContextParams() const +{ + EndpointParameters parameters; + // Operation context parameters + if (BucketHasBeenSet()) { + parameters.emplace_back(Aws::String("Bucket"), this->GetBucket(), Aws::Endpoint::EndpointParameter::ParameterOrigin::OPERATION_CONTEXT); + } + return parameters; +} diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/PutBucketCorsRequest.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/PutBucketCorsRequest.cpp index 6f90824e2c..4e8ee9730f 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/PutBucketCorsRequest.cpp +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/PutBucketCorsRequest.cpp @@ -20,6 +20,8 @@ PutBucketCorsRequest::PutBucketCorsRequest() : m_bucketHasBeenSet(false), m_cORSConfigurationHasBeenSet(false), m_contentMD5HasBeenSet(false), + m_checksumAlgorithm(ChecksumAlgorithm::NOT_SET), + m_checksumAlgorithmHasBeenSet(false), m_expectedBucketOwnerHasBeenSet(false), m_customizedAccessLogTagHasBeenSet(false) { @@ -74,6 +76,11 @@ Aws::Http::HeaderValueCollection PutBucketCorsRequest::GetRequestSpecificHeaders ss.str(""); } + if(m_checksumAlgorithmHasBeenSet) + { + headers.emplace("x-amz-sdk-checksum-algorithm", ChecksumAlgorithmMapper::GetNameForChecksumAlgorithm(m_checksumAlgorithm)); + } + if(m_expectedBucketOwnerHasBeenSet) { ss << m_expectedBucketOwner; @@ -83,3 +90,26 @@ Aws::Http::HeaderValueCollection PutBucketCorsRequest::GetRequestSpecificHeaders return headers; } + +PutBucketCorsRequest::EndpointParameters PutBucketCorsRequest::GetEndpointContextParams() const +{ + EndpointParameters parameters; + // Operation context parameters + if (BucketHasBeenSet()) { + parameters.emplace_back(Aws::String("Bucket"), this->GetBucket(), Aws::Endpoint::EndpointParameter::ParameterOrigin::OPERATION_CONTEXT); + } + return parameters; +} + +Aws::String PutBucketCorsRequest::GetChecksumAlgorithmName() const +{ + if (m_checksumAlgorithm == ChecksumAlgorithm::NOT_SET) + { + return "md5"; + } + else + { + return ChecksumAlgorithmMapper::GetNameForChecksumAlgorithm(m_checksumAlgorithm); + } +} + diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/PutBucketEncryptionRequest.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/PutBucketEncryptionRequest.cpp index 26b60f385e..7a9e14da68 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/PutBucketEncryptionRequest.cpp +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/PutBucketEncryptionRequest.cpp @@ -19,6 +19,8 @@ using namespace Aws::Http; PutBucketEncryptionRequest::PutBucketEncryptionRequest() : m_bucketHasBeenSet(false), m_contentMD5HasBeenSet(false), + m_checksumAlgorithm(ChecksumAlgorithm::NOT_SET), + m_checksumAlgorithmHasBeenSet(false), m_serverSideEncryptionConfigurationHasBeenSet(false), m_expectedBucketOwnerHasBeenSet(false), m_customizedAccessLogTagHasBeenSet(false) @@ -74,6 +76,11 @@ Aws::Http::HeaderValueCollection PutBucketEncryptionRequest::GetRequestSpecificH ss.str(""); } + if(m_checksumAlgorithmHasBeenSet) + { + headers.emplace("x-amz-sdk-checksum-algorithm", ChecksumAlgorithmMapper::GetNameForChecksumAlgorithm(m_checksumAlgorithm)); + } + if(m_expectedBucketOwnerHasBeenSet) { ss << m_expectedBucketOwner; @@ -83,3 +90,26 @@ Aws::Http::HeaderValueCollection PutBucketEncryptionRequest::GetRequestSpecificH return headers; } + +PutBucketEncryptionRequest::EndpointParameters PutBucketEncryptionRequest::GetEndpointContextParams() const +{ + EndpointParameters parameters; + // Operation context parameters + if (BucketHasBeenSet()) { + parameters.emplace_back(Aws::String("Bucket"), this->GetBucket(), Aws::Endpoint::EndpointParameter::ParameterOrigin::OPERATION_CONTEXT); + } + return parameters; +} + +Aws::String PutBucketEncryptionRequest::GetChecksumAlgorithmName() const +{ + if (m_checksumAlgorithm == ChecksumAlgorithm::NOT_SET) + { + return "md5"; + } + else + { + return ChecksumAlgorithmMapper::GetNameForChecksumAlgorithm(m_checksumAlgorithm); + } +} + diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/PutBucketIntelligentTieringConfigurationRequest.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/PutBucketIntelligentTieringConfigurationRequest.cpp index 24bc947b71..17c63d7456 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/PutBucketIntelligentTieringConfigurationRequest.cpp +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/PutBucketIntelligentTieringConfigurationRequest.cpp @@ -69,3 +69,13 @@ void PutBucketIntelligentTieringConfigurationRequest::AddQueryStringParameters(U } } + +PutBucketIntelligentTieringConfigurationRequest::EndpointParameters PutBucketIntelligentTieringConfigurationRequest::GetEndpointContextParams() const +{ + EndpointParameters parameters; + // Operation context parameters + if (BucketHasBeenSet()) { + parameters.emplace_back(Aws::String("Bucket"), this->GetBucket(), Aws::Endpoint::EndpointParameter::ParameterOrigin::OPERATION_CONTEXT); + } + return parameters; +} diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/PutBucketInventoryConfigurationRequest.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/PutBucketInventoryConfigurationRequest.cpp index 31f0365528..5ec6f7d24f 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/PutBucketInventoryConfigurationRequest.cpp +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/PutBucketInventoryConfigurationRequest.cpp @@ -83,3 +83,13 @@ Aws::Http::HeaderValueCollection PutBucketInventoryConfigurationRequest::GetRequ return headers; } + +PutBucketInventoryConfigurationRequest::EndpointParameters PutBucketInventoryConfigurationRequest::GetEndpointContextParams() const +{ + EndpointParameters parameters; + // Operation context parameters + if (BucketHasBeenSet()) { + parameters.emplace_back(Aws::String("Bucket"), this->GetBucket(), Aws::Endpoint::EndpointParameter::ParameterOrigin::OPERATION_CONTEXT); + } + return parameters; +} diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/PutBucketLifecycleConfigurationRequest.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/PutBucketLifecycleConfigurationRequest.cpp index 2d8b5471f2..a197ebe9fb 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/PutBucketLifecycleConfigurationRequest.cpp +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/PutBucketLifecycleConfigurationRequest.cpp @@ -18,6 +18,8 @@ using namespace Aws::Http; PutBucketLifecycleConfigurationRequest::PutBucketLifecycleConfigurationRequest() : m_bucketHasBeenSet(false), + m_checksumAlgorithm(ChecksumAlgorithm::NOT_SET), + m_checksumAlgorithmHasBeenSet(false), m_lifecycleConfigurationHasBeenSet(false), m_expectedBucketOwnerHasBeenSet(false), m_customizedAccessLogTagHasBeenSet(false) @@ -66,6 +68,11 @@ Aws::Http::HeaderValueCollection PutBucketLifecycleConfigurationRequest::GetRequ { Aws::Http::HeaderValueCollection headers; Aws::StringStream ss; + if(m_checksumAlgorithmHasBeenSet) + { + headers.emplace("x-amz-sdk-checksum-algorithm", ChecksumAlgorithmMapper::GetNameForChecksumAlgorithm(m_checksumAlgorithm)); + } + if(m_expectedBucketOwnerHasBeenSet) { ss << m_expectedBucketOwner; @@ -75,3 +82,26 @@ Aws::Http::HeaderValueCollection PutBucketLifecycleConfigurationRequest::GetRequ return headers; } + +PutBucketLifecycleConfigurationRequest::EndpointParameters PutBucketLifecycleConfigurationRequest::GetEndpointContextParams() const +{ + EndpointParameters parameters; + // Operation context parameters + if (BucketHasBeenSet()) { + parameters.emplace_back(Aws::String("Bucket"), this->GetBucket(), Aws::Endpoint::EndpointParameter::ParameterOrigin::OPERATION_CONTEXT); + } + return parameters; +} + +Aws::String PutBucketLifecycleConfigurationRequest::GetChecksumAlgorithmName() const +{ + if (m_checksumAlgorithm == ChecksumAlgorithm::NOT_SET) + { + return "md5"; + } + else + { + return ChecksumAlgorithmMapper::GetNameForChecksumAlgorithm(m_checksumAlgorithm); + } +} + diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/PutBucketLoggingRequest.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/PutBucketLoggingRequest.cpp index 1057a8f122..34ca2d83ca 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/PutBucketLoggingRequest.cpp +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/PutBucketLoggingRequest.cpp @@ -20,6 +20,8 @@ PutBucketLoggingRequest::PutBucketLoggingRequest() : m_bucketHasBeenSet(false), m_bucketLoggingStatusHasBeenSet(false), m_contentMD5HasBeenSet(false), + m_checksumAlgorithm(ChecksumAlgorithm::NOT_SET), + m_checksumAlgorithmHasBeenSet(false), m_expectedBucketOwnerHasBeenSet(false), m_customizedAccessLogTagHasBeenSet(false) { @@ -74,6 +76,11 @@ Aws::Http::HeaderValueCollection PutBucketLoggingRequest::GetRequestSpecificHead ss.str(""); } + if(m_checksumAlgorithmHasBeenSet) + { + headers.emplace("x-amz-sdk-checksum-algorithm", ChecksumAlgorithmMapper::GetNameForChecksumAlgorithm(m_checksumAlgorithm)); + } + if(m_expectedBucketOwnerHasBeenSet) { ss << m_expectedBucketOwner; @@ -83,3 +90,26 @@ Aws::Http::HeaderValueCollection PutBucketLoggingRequest::GetRequestSpecificHead return headers; } + +PutBucketLoggingRequest::EndpointParameters PutBucketLoggingRequest::GetEndpointContextParams() const +{ + EndpointParameters parameters; + // Operation context parameters + if (BucketHasBeenSet()) { + parameters.emplace_back(Aws::String("Bucket"), this->GetBucket(), Aws::Endpoint::EndpointParameter::ParameterOrigin::OPERATION_CONTEXT); + } + return parameters; +} + +Aws::String PutBucketLoggingRequest::GetChecksumAlgorithmName() const +{ + if (m_checksumAlgorithm == ChecksumAlgorithm::NOT_SET) + { + return "md5"; + } + else + { + return ChecksumAlgorithmMapper::GetNameForChecksumAlgorithm(m_checksumAlgorithm); + } +} + diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/PutBucketMetricsConfigurationRequest.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/PutBucketMetricsConfigurationRequest.cpp index 48e5714b3a..0f8ac13170 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/PutBucketMetricsConfigurationRequest.cpp +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/PutBucketMetricsConfigurationRequest.cpp @@ -83,3 +83,13 @@ Aws::Http::HeaderValueCollection PutBucketMetricsConfigurationRequest::GetReques return headers; } + +PutBucketMetricsConfigurationRequest::EndpointParameters PutBucketMetricsConfigurationRequest::GetEndpointContextParams() const +{ + EndpointParameters parameters; + // Operation context parameters + if (BucketHasBeenSet()) { + parameters.emplace_back(Aws::String("Bucket"), this->GetBucket(), Aws::Endpoint::EndpointParameter::ParameterOrigin::OPERATION_CONTEXT); + } + return parameters; +} diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/PutBucketNotificationConfigurationRequest.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/PutBucketNotificationConfigurationRequest.cpp index 52f921af4f..0a2e9ba847 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/PutBucketNotificationConfigurationRequest.cpp +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/PutBucketNotificationConfigurationRequest.cpp @@ -20,6 +20,8 @@ PutBucketNotificationConfigurationRequest::PutBucketNotificationConfigurationReq m_bucketHasBeenSet(false), m_notificationConfigurationHasBeenSet(false), m_expectedBucketOwnerHasBeenSet(false), + m_skipDestinationValidation(false), + m_skipDestinationValidationHasBeenSet(false), m_customizedAccessLogTagHasBeenSet(false) { } @@ -69,5 +71,22 @@ Aws::Http::HeaderValueCollection PutBucketNotificationConfigurationRequest::GetR ss.str(""); } + if(m_skipDestinationValidationHasBeenSet) + { + ss << std::boolalpha << m_skipDestinationValidation; + headers.emplace("x-amz-skip-destination-validation", ss.str()); + ss.str(""); + } + return headers; } + +PutBucketNotificationConfigurationRequest::EndpointParameters PutBucketNotificationConfigurationRequest::GetEndpointContextParams() const +{ + EndpointParameters parameters; + // Operation context parameters + if (BucketHasBeenSet()) { + parameters.emplace_back(Aws::String("Bucket"), this->GetBucket(), Aws::Endpoint::EndpointParameter::ParameterOrigin::OPERATION_CONTEXT); + } + return parameters; +} diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/PutBucketOwnershipControlsRequest.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/PutBucketOwnershipControlsRequest.cpp index 5a6119e233..46dde75d47 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/PutBucketOwnershipControlsRequest.cpp +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/PutBucketOwnershipControlsRequest.cpp @@ -83,3 +83,13 @@ Aws::Http::HeaderValueCollection PutBucketOwnershipControlsRequest::GetRequestSp return headers; } + +PutBucketOwnershipControlsRequest::EndpointParameters PutBucketOwnershipControlsRequest::GetEndpointContextParams() const +{ + EndpointParameters parameters; + // Operation context parameters + if (BucketHasBeenSet()) { + parameters.emplace_back(Aws::String("Bucket"), this->GetBucket(), Aws::Endpoint::EndpointParameter::ParameterOrigin::OPERATION_CONTEXT); + } + return parameters; +} diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/PutBucketPolicyRequest.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/PutBucketPolicyRequest.cpp index d7fc444c2d..92f16a6381 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/PutBucketPolicyRequest.cpp +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/PutBucketPolicyRequest.cpp @@ -19,6 +19,8 @@ using namespace Aws; PutBucketPolicyRequest::PutBucketPolicyRequest() : m_bucketHasBeenSet(false), m_contentMD5HasBeenSet(false), + m_checksumAlgorithm(ChecksumAlgorithm::NOT_SET), + m_checksumAlgorithmHasBeenSet(false), m_confirmRemoveSelfBucketAccess(false), m_confirmRemoveSelfBucketAccessHasBeenSet(false), m_expectedBucketOwnerHasBeenSet(false), @@ -60,6 +62,11 @@ Aws::Http::HeaderValueCollection PutBucketPolicyRequest::GetRequestSpecificHeade ss.str(""); } + if(m_checksumAlgorithmHasBeenSet) + { + headers.emplace("x-amz-sdk-checksum-algorithm", ChecksumAlgorithmMapper::GetNameForChecksumAlgorithm(m_checksumAlgorithm)); + } + if(m_confirmRemoveSelfBucketAccessHasBeenSet) { ss << std::boolalpha << m_confirmRemoveSelfBucketAccess; @@ -77,3 +84,26 @@ Aws::Http::HeaderValueCollection PutBucketPolicyRequest::GetRequestSpecificHeade return headers; } + +PutBucketPolicyRequest::EndpointParameters PutBucketPolicyRequest::GetEndpointContextParams() const +{ + EndpointParameters parameters; + // Operation context parameters + if (BucketHasBeenSet()) { + parameters.emplace_back(Aws::String("Bucket"), this->GetBucket(), Aws::Endpoint::EndpointParameter::ParameterOrigin::OPERATION_CONTEXT); + } + return parameters; +} + +Aws::String PutBucketPolicyRequest::GetChecksumAlgorithmName() const +{ + if (m_checksumAlgorithm == ChecksumAlgorithm::NOT_SET) + { + return "md5"; + } + else + { + return ChecksumAlgorithmMapper::GetNameForChecksumAlgorithm(m_checksumAlgorithm); + } +} + diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/PutBucketReplicationRequest.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/PutBucketReplicationRequest.cpp index 44244a8560..50b1abbebd 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/PutBucketReplicationRequest.cpp +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/PutBucketReplicationRequest.cpp @@ -19,6 +19,8 @@ using namespace Aws::Http; PutBucketReplicationRequest::PutBucketReplicationRequest() : m_bucketHasBeenSet(false), m_contentMD5HasBeenSet(false), + m_checksumAlgorithm(ChecksumAlgorithm::NOT_SET), + m_checksumAlgorithmHasBeenSet(false), m_replicationConfigurationHasBeenSet(false), m_tokenHasBeenSet(false), m_expectedBucketOwnerHasBeenSet(false), @@ -75,6 +77,11 @@ Aws::Http::HeaderValueCollection PutBucketReplicationRequest::GetRequestSpecific ss.str(""); } + if(m_checksumAlgorithmHasBeenSet) + { + headers.emplace("x-amz-sdk-checksum-algorithm", ChecksumAlgorithmMapper::GetNameForChecksumAlgorithm(m_checksumAlgorithm)); + } + if(m_tokenHasBeenSet) { ss << m_token; @@ -91,3 +98,26 @@ Aws::Http::HeaderValueCollection PutBucketReplicationRequest::GetRequestSpecific return headers; } + +PutBucketReplicationRequest::EndpointParameters PutBucketReplicationRequest::GetEndpointContextParams() const +{ + EndpointParameters parameters; + // Operation context parameters + if (BucketHasBeenSet()) { + parameters.emplace_back(Aws::String("Bucket"), this->GetBucket(), Aws::Endpoint::EndpointParameter::ParameterOrigin::OPERATION_CONTEXT); + } + return parameters; +} + +Aws::String PutBucketReplicationRequest::GetChecksumAlgorithmName() const +{ + if (m_checksumAlgorithm == ChecksumAlgorithm::NOT_SET) + { + return "md5"; + } + else + { + return ChecksumAlgorithmMapper::GetNameForChecksumAlgorithm(m_checksumAlgorithm); + } +} + diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/PutBucketRequestPaymentRequest.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/PutBucketRequestPaymentRequest.cpp index f6be9cc855..643f26b8f1 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/PutBucketRequestPaymentRequest.cpp +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/PutBucketRequestPaymentRequest.cpp @@ -19,6 +19,8 @@ using namespace Aws::Http; PutBucketRequestPaymentRequest::PutBucketRequestPaymentRequest() : m_bucketHasBeenSet(false), m_contentMD5HasBeenSet(false), + m_checksumAlgorithm(ChecksumAlgorithm::NOT_SET), + m_checksumAlgorithmHasBeenSet(false), m_requestPaymentConfigurationHasBeenSet(false), m_expectedBucketOwnerHasBeenSet(false), m_customizedAccessLogTagHasBeenSet(false) @@ -74,6 +76,11 @@ Aws::Http::HeaderValueCollection PutBucketRequestPaymentRequest::GetRequestSpeci ss.str(""); } + if(m_checksumAlgorithmHasBeenSet) + { + headers.emplace("x-amz-sdk-checksum-algorithm", ChecksumAlgorithmMapper::GetNameForChecksumAlgorithm(m_checksumAlgorithm)); + } + if(m_expectedBucketOwnerHasBeenSet) { ss << m_expectedBucketOwner; @@ -83,3 +90,26 @@ Aws::Http::HeaderValueCollection PutBucketRequestPaymentRequest::GetRequestSpeci return headers; } + +PutBucketRequestPaymentRequest::EndpointParameters PutBucketRequestPaymentRequest::GetEndpointContextParams() const +{ + EndpointParameters parameters; + // Operation context parameters + if (BucketHasBeenSet()) { + parameters.emplace_back(Aws::String("Bucket"), this->GetBucket(), Aws::Endpoint::EndpointParameter::ParameterOrigin::OPERATION_CONTEXT); + } + return parameters; +} + +Aws::String PutBucketRequestPaymentRequest::GetChecksumAlgorithmName() const +{ + if (m_checksumAlgorithm == ChecksumAlgorithm::NOT_SET) + { + return "md5"; + } + else + { + return ChecksumAlgorithmMapper::GetNameForChecksumAlgorithm(m_checksumAlgorithm); + } +} + diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/PutBucketTaggingRequest.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/PutBucketTaggingRequest.cpp index 748ede6e75..fa0861e2cd 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/PutBucketTaggingRequest.cpp +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/PutBucketTaggingRequest.cpp @@ -19,6 +19,8 @@ using namespace Aws::Http; PutBucketTaggingRequest::PutBucketTaggingRequest() : m_bucketHasBeenSet(false), m_contentMD5HasBeenSet(false), + m_checksumAlgorithm(ChecksumAlgorithm::NOT_SET), + m_checksumAlgorithmHasBeenSet(false), m_taggingHasBeenSet(false), m_expectedBucketOwnerHasBeenSet(false), m_customizedAccessLogTagHasBeenSet(false) @@ -74,6 +76,11 @@ Aws::Http::HeaderValueCollection PutBucketTaggingRequest::GetRequestSpecificHead ss.str(""); } + if(m_checksumAlgorithmHasBeenSet) + { + headers.emplace("x-amz-sdk-checksum-algorithm", ChecksumAlgorithmMapper::GetNameForChecksumAlgorithm(m_checksumAlgorithm)); + } + if(m_expectedBucketOwnerHasBeenSet) { ss << m_expectedBucketOwner; @@ -83,3 +90,26 @@ Aws::Http::HeaderValueCollection PutBucketTaggingRequest::GetRequestSpecificHead return headers; } + +PutBucketTaggingRequest::EndpointParameters PutBucketTaggingRequest::GetEndpointContextParams() const +{ + EndpointParameters parameters; + // Operation context parameters + if (BucketHasBeenSet()) { + parameters.emplace_back(Aws::String("Bucket"), this->GetBucket(), Aws::Endpoint::EndpointParameter::ParameterOrigin::OPERATION_CONTEXT); + } + return parameters; +} + +Aws::String PutBucketTaggingRequest::GetChecksumAlgorithmName() const +{ + if (m_checksumAlgorithm == ChecksumAlgorithm::NOT_SET) + { + return "md5"; + } + else + { + return ChecksumAlgorithmMapper::GetNameForChecksumAlgorithm(m_checksumAlgorithm); + } +} + diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/PutBucketVersioningRequest.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/PutBucketVersioningRequest.cpp index 5e72efb1e1..6dbcd39433 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/PutBucketVersioningRequest.cpp +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/PutBucketVersioningRequest.cpp @@ -19,6 +19,8 @@ using namespace Aws::Http; PutBucketVersioningRequest::PutBucketVersioningRequest() : m_bucketHasBeenSet(false), m_contentMD5HasBeenSet(false), + m_checksumAlgorithm(ChecksumAlgorithm::NOT_SET), + m_checksumAlgorithmHasBeenSet(false), m_mFAHasBeenSet(false), m_versioningConfigurationHasBeenSet(false), m_expectedBucketOwnerHasBeenSet(false), @@ -75,6 +77,11 @@ Aws::Http::HeaderValueCollection PutBucketVersioningRequest::GetRequestSpecificH ss.str(""); } + if(m_checksumAlgorithmHasBeenSet) + { + headers.emplace("x-amz-sdk-checksum-algorithm", ChecksumAlgorithmMapper::GetNameForChecksumAlgorithm(m_checksumAlgorithm)); + } + if(m_mFAHasBeenSet) { ss << m_mFA; @@ -91,3 +98,26 @@ Aws::Http::HeaderValueCollection PutBucketVersioningRequest::GetRequestSpecificH return headers; } + +PutBucketVersioningRequest::EndpointParameters PutBucketVersioningRequest::GetEndpointContextParams() const +{ + EndpointParameters parameters; + // Operation context parameters + if (BucketHasBeenSet()) { + parameters.emplace_back(Aws::String("Bucket"), this->GetBucket(), Aws::Endpoint::EndpointParameter::ParameterOrigin::OPERATION_CONTEXT); + } + return parameters; +} + +Aws::String PutBucketVersioningRequest::GetChecksumAlgorithmName() const +{ + if (m_checksumAlgorithm == ChecksumAlgorithm::NOT_SET) + { + return "md5"; + } + else + { + return ChecksumAlgorithmMapper::GetNameForChecksumAlgorithm(m_checksumAlgorithm); + } +} + diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/PutBucketWebsiteRequest.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/PutBucketWebsiteRequest.cpp index d20032e466..adea6161f5 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/PutBucketWebsiteRequest.cpp +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/PutBucketWebsiteRequest.cpp @@ -19,6 +19,8 @@ using namespace Aws::Http; PutBucketWebsiteRequest::PutBucketWebsiteRequest() : m_bucketHasBeenSet(false), m_contentMD5HasBeenSet(false), + m_checksumAlgorithm(ChecksumAlgorithm::NOT_SET), + m_checksumAlgorithmHasBeenSet(false), m_websiteConfigurationHasBeenSet(false), m_expectedBucketOwnerHasBeenSet(false), m_customizedAccessLogTagHasBeenSet(false) @@ -74,6 +76,11 @@ Aws::Http::HeaderValueCollection PutBucketWebsiteRequest::GetRequestSpecificHead ss.str(""); } + if(m_checksumAlgorithmHasBeenSet) + { + headers.emplace("x-amz-sdk-checksum-algorithm", ChecksumAlgorithmMapper::GetNameForChecksumAlgorithm(m_checksumAlgorithm)); + } + if(m_expectedBucketOwnerHasBeenSet) { ss << m_expectedBucketOwner; @@ -83,3 +90,26 @@ Aws::Http::HeaderValueCollection PutBucketWebsiteRequest::GetRequestSpecificHead return headers; } + +PutBucketWebsiteRequest::EndpointParameters PutBucketWebsiteRequest::GetEndpointContextParams() const +{ + EndpointParameters parameters; + // Operation context parameters + if (BucketHasBeenSet()) { + parameters.emplace_back(Aws::String("Bucket"), this->GetBucket(), Aws::Endpoint::EndpointParameter::ParameterOrigin::OPERATION_CONTEXT); + } + return parameters; +} + +Aws::String PutBucketWebsiteRequest::GetChecksumAlgorithmName() const +{ + if (m_checksumAlgorithm == ChecksumAlgorithm::NOT_SET) + { + return "md5"; + } + else + { + return ChecksumAlgorithmMapper::GetNameForChecksumAlgorithm(m_checksumAlgorithm); + } +} + diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/PutObjectAclRequest.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/PutObjectAclRequest.cpp index 5dbd1a3fa6..fb859d91e4 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/PutObjectAclRequest.cpp +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/PutObjectAclRequest.cpp @@ -22,6 +22,8 @@ PutObjectAclRequest::PutObjectAclRequest() : m_accessControlPolicyHasBeenSet(false), m_bucketHasBeenSet(false), m_contentMD5HasBeenSet(false), + m_checksumAlgorithm(ChecksumAlgorithm::NOT_SET), + m_checksumAlgorithmHasBeenSet(false), m_grantFullControlHasBeenSet(false), m_grantReadHasBeenSet(false), m_grantReadACPHasBeenSet(false), @@ -97,6 +99,11 @@ Aws::Http::HeaderValueCollection PutObjectAclRequest::GetRequestSpecificHeaders( ss.str(""); } + if(m_checksumAlgorithmHasBeenSet) + { + headers.emplace("x-amz-sdk-checksum-algorithm", ChecksumAlgorithmMapper::GetNameForChecksumAlgorithm(m_checksumAlgorithm)); + } + if(m_grantFullControlHasBeenSet) { ss << m_grantFullControl; @@ -146,3 +153,26 @@ Aws::Http::HeaderValueCollection PutObjectAclRequest::GetRequestSpecificHeaders( return headers; } + +PutObjectAclRequest::EndpointParameters PutObjectAclRequest::GetEndpointContextParams() const +{ + EndpointParameters parameters; + // Operation context parameters + if (BucketHasBeenSet()) { + parameters.emplace_back(Aws::String("Bucket"), this->GetBucket(), Aws::Endpoint::EndpointParameter::ParameterOrigin::OPERATION_CONTEXT); + } + return parameters; +} + +Aws::String PutObjectAclRequest::GetChecksumAlgorithmName() const +{ + if (m_checksumAlgorithm == ChecksumAlgorithm::NOT_SET) + { + return "md5"; + } + else + { + return ChecksumAlgorithmMapper::GetNameForChecksumAlgorithm(m_checksumAlgorithm); + } +} + diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/PutObjectLegalHoldRequest.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/PutObjectLegalHoldRequest.cpp index 8c07b952d7..4ecc41790e 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/PutObjectLegalHoldRequest.cpp +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/PutObjectLegalHoldRequest.cpp @@ -24,6 +24,8 @@ PutObjectLegalHoldRequest::PutObjectLegalHoldRequest() : m_requestPayerHasBeenSet(false), m_versionIdHasBeenSet(false), m_contentMD5HasBeenSet(false), + m_checksumAlgorithm(ChecksumAlgorithm::NOT_SET), + m_checksumAlgorithmHasBeenSet(false), m_expectedBucketOwnerHasBeenSet(false), m_customizedAccessLogTagHasBeenSet(false) { @@ -90,6 +92,11 @@ Aws::Http::HeaderValueCollection PutObjectLegalHoldRequest::GetRequestSpecificHe ss.str(""); } + if(m_checksumAlgorithmHasBeenSet) + { + headers.emplace("x-amz-sdk-checksum-algorithm", ChecksumAlgorithmMapper::GetNameForChecksumAlgorithm(m_checksumAlgorithm)); + } + if(m_expectedBucketOwnerHasBeenSet) { ss << m_expectedBucketOwner; @@ -99,3 +106,26 @@ Aws::Http::HeaderValueCollection PutObjectLegalHoldRequest::GetRequestSpecificHe return headers; } + +PutObjectLegalHoldRequest::EndpointParameters PutObjectLegalHoldRequest::GetEndpointContextParams() const +{ + EndpointParameters parameters; + // Operation context parameters + if (BucketHasBeenSet()) { + parameters.emplace_back(Aws::String("Bucket"), this->GetBucket(), Aws::Endpoint::EndpointParameter::ParameterOrigin::OPERATION_CONTEXT); + } + return parameters; +} + +Aws::String PutObjectLegalHoldRequest::GetChecksumAlgorithmName() const +{ + if (m_checksumAlgorithm == ChecksumAlgorithm::NOT_SET) + { + return "md5"; + } + else + { + return ChecksumAlgorithmMapper::GetNameForChecksumAlgorithm(m_checksumAlgorithm); + } +} + diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/PutObjectLockConfigurationRequest.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/PutObjectLockConfigurationRequest.cpp index 347b9e668d..b0e89445dc 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/PutObjectLockConfigurationRequest.cpp +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/PutObjectLockConfigurationRequest.cpp @@ -23,6 +23,8 @@ PutObjectLockConfigurationRequest::PutObjectLockConfigurationRequest() : m_requestPayerHasBeenSet(false), m_tokenHasBeenSet(false), m_contentMD5HasBeenSet(false), + m_checksumAlgorithm(ChecksumAlgorithm::NOT_SET), + m_checksumAlgorithmHasBeenSet(false), m_expectedBucketOwnerHasBeenSet(false), m_customizedAccessLogTagHasBeenSet(false) { @@ -89,6 +91,11 @@ Aws::Http::HeaderValueCollection PutObjectLockConfigurationRequest::GetRequestSp ss.str(""); } + if(m_checksumAlgorithmHasBeenSet) + { + headers.emplace("x-amz-sdk-checksum-algorithm", ChecksumAlgorithmMapper::GetNameForChecksumAlgorithm(m_checksumAlgorithm)); + } + if(m_expectedBucketOwnerHasBeenSet) { ss << m_expectedBucketOwner; @@ -98,3 +105,26 @@ Aws::Http::HeaderValueCollection PutObjectLockConfigurationRequest::GetRequestSp return headers; } + +PutObjectLockConfigurationRequest::EndpointParameters PutObjectLockConfigurationRequest::GetEndpointContextParams() const +{ + EndpointParameters parameters; + // Operation context parameters + if (BucketHasBeenSet()) { + parameters.emplace_back(Aws::String("Bucket"), this->GetBucket(), Aws::Endpoint::EndpointParameter::ParameterOrigin::OPERATION_CONTEXT); + } + return parameters; +} + +Aws::String PutObjectLockConfigurationRequest::GetChecksumAlgorithmName() const +{ + if (m_checksumAlgorithm == ChecksumAlgorithm::NOT_SET) + { + return "md5"; + } + else + { + return ChecksumAlgorithmMapper::GetNameForChecksumAlgorithm(m_checksumAlgorithm); + } +} + diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/PutObjectRequest.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/PutObjectRequest.cpp index 18cdc3866f..1c2aa6e34f 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/PutObjectRequest.cpp +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/PutObjectRequest.cpp @@ -28,6 +28,12 @@ PutObjectRequest::PutObjectRequest() : m_contentLength(0), m_contentLengthHasBeenSet(false), m_contentMD5HasBeenSet(false), + m_checksumAlgorithm(ChecksumAlgorithm::NOT_SET), + m_checksumAlgorithmHasBeenSet(false), + m_checksumCRC32HasBeenSet(false), + m_checksumCRC32CHasBeenSet(false), + m_checksumSHA1HasBeenSet(false), + m_checksumSHA256HasBeenSet(false), m_expiresHasBeenSet(false), m_grantFullControlHasBeenSet(false), m_grantReadHasBeenSet(false), @@ -134,9 +140,42 @@ Aws::Http::HeaderValueCollection PutObjectRequest::GetRequestSpecificHeaders() c ss.str(""); } + if(m_checksumAlgorithmHasBeenSet) + { + headers.emplace("x-amz-sdk-checksum-algorithm", ChecksumAlgorithmMapper::GetNameForChecksumAlgorithm(m_checksumAlgorithm)); + } + + if(m_checksumCRC32HasBeenSet) + { + ss << m_checksumCRC32; + headers.emplace("x-amz-checksum-crc32", ss.str()); + ss.str(""); + } + + if(m_checksumCRC32CHasBeenSet) + { + ss << m_checksumCRC32C; + headers.emplace("x-amz-checksum-crc32c", ss.str()); + ss.str(""); + } + + if(m_checksumSHA1HasBeenSet) + { + ss << m_checksumSHA1; + headers.emplace("x-amz-checksum-sha1", ss.str()); + ss.str(""); + } + + if(m_checksumSHA256HasBeenSet) + { + ss << m_checksumSHA256; + headers.emplace("x-amz-checksum-sha256", ss.str()); + ss.str(""); + } + if(m_expiresHasBeenSet) { - headers.emplace("expires", m_expires.ToGmtString(DateFormat::RFC822)); + headers.emplace("expires", m_expires.ToGmtString(Aws::Utils::DateFormat::RFC822)); } if(m_grantFullControlHasBeenSet) @@ -255,7 +294,7 @@ Aws::Http::HeaderValueCollection PutObjectRequest::GetRequestSpecificHeaders() c if(m_objectLockRetainUntilDateHasBeenSet) { - headers.emplace("x-amz-object-lock-retain-until-date", m_objectLockRetainUntilDate.ToGmtString(DateFormat::ISO_8601)); + headers.emplace("x-amz-object-lock-retain-until-date", m_objectLockRetainUntilDate.ToGmtString(Aws::Utils::DateFormat::ISO_8601)); } if(m_objectLockLegalHoldStatusHasBeenSet) @@ -273,3 +312,26 @@ Aws::Http::HeaderValueCollection PutObjectRequest::GetRequestSpecificHeaders() c return headers; } + +PutObjectRequest::EndpointParameters PutObjectRequest::GetEndpointContextParams() const +{ + EndpointParameters parameters; + // Operation context parameters + if (BucketHasBeenSet()) { + parameters.emplace_back(Aws::String("Bucket"), this->GetBucket(), Aws::Endpoint::EndpointParameter::ParameterOrigin::OPERATION_CONTEXT); + } + return parameters; +} + +Aws::String PutObjectRequest::GetChecksumAlgorithmName() const +{ + if (m_checksumAlgorithm == ChecksumAlgorithm::NOT_SET) + { + return "md5"; + } + else + { + return ChecksumAlgorithmMapper::GetNameForChecksumAlgorithm(m_checksumAlgorithm); + } +} + diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/PutObjectResult.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/PutObjectResult.cpp index 0dfcb17280..21a34122e5 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/PutObjectResult.cpp +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/PutObjectResult.cpp @@ -53,6 +53,30 @@ PutObjectResult& PutObjectResult::operator =(const Aws::AmazonWebServiceResult<X m_eTag = eTagIter->second; } + const auto& checksumCRC32Iter = headers.find("x-amz-checksum-crc32"); + if(checksumCRC32Iter != headers.end()) + { + m_checksumCRC32 = checksumCRC32Iter->second; + } + + const auto& checksumCRC32CIter = headers.find("x-amz-checksum-crc32c"); + if(checksumCRC32CIter != headers.end()) + { + m_checksumCRC32C = checksumCRC32CIter->second; + } + + const auto& checksumSHA1Iter = headers.find("x-amz-checksum-sha1"); + if(checksumSHA1Iter != headers.end()) + { + m_checksumSHA1 = checksumSHA1Iter->second; + } + + const auto& checksumSHA256Iter = headers.find("x-amz-checksum-sha256"); + if(checksumSHA256Iter != headers.end()) + { + m_checksumSHA256 = checksumSHA256Iter->second; + } + const auto& serverSideEncryptionIter = headers.find("x-amz-server-side-encryption"); if(serverSideEncryptionIter != headers.end()) { diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/PutObjectRetentionRequest.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/PutObjectRetentionRequest.cpp index 779ac68bd3..47e0cd7039 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/PutObjectRetentionRequest.cpp +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/PutObjectRetentionRequest.cpp @@ -26,6 +26,8 @@ PutObjectRetentionRequest::PutObjectRetentionRequest() : m_bypassGovernanceRetention(false), m_bypassGovernanceRetentionHasBeenSet(false), m_contentMD5HasBeenSet(false), + m_checksumAlgorithm(ChecksumAlgorithm::NOT_SET), + m_checksumAlgorithmHasBeenSet(false), m_expectedBucketOwnerHasBeenSet(false), m_customizedAccessLogTagHasBeenSet(false) { @@ -99,6 +101,11 @@ Aws::Http::HeaderValueCollection PutObjectRetentionRequest::GetRequestSpecificHe ss.str(""); } + if(m_checksumAlgorithmHasBeenSet) + { + headers.emplace("x-amz-sdk-checksum-algorithm", ChecksumAlgorithmMapper::GetNameForChecksumAlgorithm(m_checksumAlgorithm)); + } + if(m_expectedBucketOwnerHasBeenSet) { ss << m_expectedBucketOwner; @@ -108,3 +115,26 @@ Aws::Http::HeaderValueCollection PutObjectRetentionRequest::GetRequestSpecificHe return headers; } + +PutObjectRetentionRequest::EndpointParameters PutObjectRetentionRequest::GetEndpointContextParams() const +{ + EndpointParameters parameters; + // Operation context parameters + if (BucketHasBeenSet()) { + parameters.emplace_back(Aws::String("Bucket"), this->GetBucket(), Aws::Endpoint::EndpointParameter::ParameterOrigin::OPERATION_CONTEXT); + } + return parameters; +} + +Aws::String PutObjectRetentionRequest::GetChecksumAlgorithmName() const +{ + if (m_checksumAlgorithm == ChecksumAlgorithm::NOT_SET) + { + return "md5"; + } + else + { + return ChecksumAlgorithmMapper::GetNameForChecksumAlgorithm(m_checksumAlgorithm); + } +} + diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/PutObjectTaggingRequest.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/PutObjectTaggingRequest.cpp index 612eb0eb8e..a2da55ab0e 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/PutObjectTaggingRequest.cpp +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/PutObjectTaggingRequest.cpp @@ -21,6 +21,8 @@ PutObjectTaggingRequest::PutObjectTaggingRequest() : m_keyHasBeenSet(false), m_versionIdHasBeenSet(false), m_contentMD5HasBeenSet(false), + m_checksumAlgorithm(ChecksumAlgorithm::NOT_SET), + m_checksumAlgorithmHasBeenSet(false), m_taggingHasBeenSet(false), m_expectedBucketOwnerHasBeenSet(false), m_requestPayer(RequestPayer::NOT_SET), @@ -85,6 +87,11 @@ Aws::Http::HeaderValueCollection PutObjectTaggingRequest::GetRequestSpecificHead ss.str(""); } + if(m_checksumAlgorithmHasBeenSet) + { + headers.emplace("x-amz-sdk-checksum-algorithm", ChecksumAlgorithmMapper::GetNameForChecksumAlgorithm(m_checksumAlgorithm)); + } + if(m_expectedBucketOwnerHasBeenSet) { ss << m_expectedBucketOwner; @@ -99,3 +106,26 @@ Aws::Http::HeaderValueCollection PutObjectTaggingRequest::GetRequestSpecificHead return headers; } + +PutObjectTaggingRequest::EndpointParameters PutObjectTaggingRequest::GetEndpointContextParams() const +{ + EndpointParameters parameters; + // Operation context parameters + if (BucketHasBeenSet()) { + parameters.emplace_back(Aws::String("Bucket"), this->GetBucket(), Aws::Endpoint::EndpointParameter::ParameterOrigin::OPERATION_CONTEXT); + } + return parameters; +} + +Aws::String PutObjectTaggingRequest::GetChecksumAlgorithmName() const +{ + if (m_checksumAlgorithm == ChecksumAlgorithm::NOT_SET) + { + return "md5"; + } + else + { + return ChecksumAlgorithmMapper::GetNameForChecksumAlgorithm(m_checksumAlgorithm); + } +} + diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/PutPublicAccessBlockRequest.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/PutPublicAccessBlockRequest.cpp index f06ab1ed3a..f8479fbe44 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/PutPublicAccessBlockRequest.cpp +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/PutPublicAccessBlockRequest.cpp @@ -19,6 +19,8 @@ using namespace Aws::Http; PutPublicAccessBlockRequest::PutPublicAccessBlockRequest() : m_bucketHasBeenSet(false), m_contentMD5HasBeenSet(false), + m_checksumAlgorithm(ChecksumAlgorithm::NOT_SET), + m_checksumAlgorithmHasBeenSet(false), m_publicAccessBlockConfigurationHasBeenSet(false), m_expectedBucketOwnerHasBeenSet(false), m_customizedAccessLogTagHasBeenSet(false) @@ -74,6 +76,11 @@ Aws::Http::HeaderValueCollection PutPublicAccessBlockRequest::GetRequestSpecific ss.str(""); } + if(m_checksumAlgorithmHasBeenSet) + { + headers.emplace("x-amz-sdk-checksum-algorithm", ChecksumAlgorithmMapper::GetNameForChecksumAlgorithm(m_checksumAlgorithm)); + } + if(m_expectedBucketOwnerHasBeenSet) { ss << m_expectedBucketOwner; @@ -83,3 +90,26 @@ Aws::Http::HeaderValueCollection PutPublicAccessBlockRequest::GetRequestSpecific return headers; } + +PutPublicAccessBlockRequest::EndpointParameters PutPublicAccessBlockRequest::GetEndpointContextParams() const +{ + EndpointParameters parameters; + // Operation context parameters + if (BucketHasBeenSet()) { + parameters.emplace_back(Aws::String("Bucket"), this->GetBucket(), Aws::Endpoint::EndpointParameter::ParameterOrigin::OPERATION_CONTEXT); + } + return parameters; +} + +Aws::String PutPublicAccessBlockRequest::GetChecksumAlgorithmName() const +{ + if (m_checksumAlgorithm == ChecksumAlgorithm::NOT_SET) + { + return "md5"; + } + else + { + return ChecksumAlgorithmMapper::GetNameForChecksumAlgorithm(m_checksumAlgorithm); + } +} + diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/RestoreObjectRequest.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/RestoreObjectRequest.cpp index a755fc7828..85f5f73706 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/RestoreObjectRequest.cpp +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/RestoreObjectRequest.cpp @@ -23,6 +23,8 @@ RestoreObjectRequest::RestoreObjectRequest() : m_restoreRequestHasBeenSet(false), m_requestPayer(RequestPayer::NOT_SET), m_requestPayerHasBeenSet(false), + m_checksumAlgorithm(ChecksumAlgorithm::NOT_SET), + m_checksumAlgorithmHasBeenSet(false), m_expectedBucketOwnerHasBeenSet(false), m_customizedAccessLogTagHasBeenSet(false) { @@ -82,6 +84,11 @@ Aws::Http::HeaderValueCollection RestoreObjectRequest::GetRequestSpecificHeaders headers.emplace("x-amz-request-payer", RequestPayerMapper::GetNameForRequestPayer(m_requestPayer)); } + if(m_checksumAlgorithmHasBeenSet) + { + headers.emplace("x-amz-sdk-checksum-algorithm", ChecksumAlgorithmMapper::GetNameForChecksumAlgorithm(m_checksumAlgorithm)); + } + if(m_expectedBucketOwnerHasBeenSet) { ss << m_expectedBucketOwner; @@ -91,3 +98,26 @@ Aws::Http::HeaderValueCollection RestoreObjectRequest::GetRequestSpecificHeaders return headers; } + +RestoreObjectRequest::EndpointParameters RestoreObjectRequest::GetEndpointContextParams() const +{ + EndpointParameters parameters; + // Operation context parameters + if (BucketHasBeenSet()) { + parameters.emplace_back(Aws::String("Bucket"), this->GetBucket(), Aws::Endpoint::EndpointParameter::ParameterOrigin::OPERATION_CONTEXT); + } + return parameters; +} + +Aws::String RestoreObjectRequest::GetChecksumAlgorithmName() const +{ + if (m_checksumAlgorithm == ChecksumAlgorithm::NOT_SET) + { + return "md5"; + } + else + { + return ChecksumAlgorithmMapper::GetNameForChecksumAlgorithm(m_checksumAlgorithm); + } +} + diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/SelectObjectContentRequest.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/SelectObjectContentRequest.cpp index f3443311dd..20f0007fd9 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/SelectObjectContentRequest.cpp +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/SelectObjectContentRequest.cpp @@ -31,7 +31,7 @@ SelectObjectContentRequest::SelectObjectContentRequest() : m_scanRangeHasBeenSet(false), m_expectedBucketOwnerHasBeenSet(false), m_customizedAccessLogTagHasBeenSet(false), - m_decoder(Aws::Utils::Event::EventStreamDecoder(&m_handler)) + m_handler(), m_decoder(Aws::Utils::Event::EventStreamDecoder(&m_handler)) { } @@ -138,3 +138,13 @@ Aws::Http::HeaderValueCollection SelectObjectContentRequest::GetRequestSpecificH return headers; } + +SelectObjectContentRequest::EndpointParameters SelectObjectContentRequest::GetEndpointContextParams() const +{ + EndpointParameters parameters; + // Operation context parameters + if (BucketHasBeenSet()) { + parameters.emplace_back(Aws::String("Bucket"), this->GetBucket(), Aws::Endpoint::EndpointParameter::ParameterOrigin::OPERATION_CONTEXT); + } + return parameters; +} diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/StorageClass.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/StorageClass.cpp index 0ab7edd5de..886777a137 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/StorageClass.cpp +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/StorageClass.cpp @@ -28,6 +28,7 @@ namespace Aws static const int GLACIER_HASH = HashingUtils::HashString("GLACIER"); static const int DEEP_ARCHIVE_HASH = HashingUtils::HashString("DEEP_ARCHIVE"); static const int OUTPOSTS_HASH = HashingUtils::HashString("OUTPOSTS"); + static const int GLACIER_IR_HASH = HashingUtils::HashString("GLACIER_IR"); StorageClass GetStorageClassForName(const Aws::String& name) @@ -65,6 +66,10 @@ namespace Aws { return StorageClass::OUTPOSTS; } + else if (hashCode == GLACIER_IR_HASH) + { + return StorageClass::GLACIER_IR; + } EnumParseOverflowContainer* overflowContainer = Aws::GetEnumOverflowContainer(); if(overflowContainer) { @@ -95,6 +100,8 @@ namespace Aws return "DEEP_ARCHIVE"; case StorageClass::OUTPOSTS: return "OUTPOSTS"; + case StorageClass::GLACIER_IR: + return "GLACIER_IR"; default: EnumParseOverflowContainer* overflowContainer = Aws::GetEnumOverflowContainer(); if(overflowContainer) diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/Transition.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/Transition.cpp index 8dcefe5df2..e837cd964e 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/Transition.cpp +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/Transition.cpp @@ -48,7 +48,7 @@ Transition& Transition::operator =(const XmlNode& xmlNode) XmlNode dateNode = resultNode.FirstChild("Date"); if(!dateNode.IsNull()) { - m_date = DateTime(StringUtils::Trim(Aws::Utils::Xml::DecodeEscapedXmlText(dateNode.GetText()).c_str()).c_str(), DateFormat::ISO_8601); + m_date = DateTime(StringUtils::Trim(Aws::Utils::Xml::DecodeEscapedXmlText(dateNode.GetText()).c_str()).c_str(), Aws::Utils::DateFormat::ISO_8601); m_dateHasBeenSet = true; } XmlNode daysNode = resultNode.FirstChild("Days"); @@ -74,7 +74,7 @@ void Transition::AddToNode(XmlNode& parentNode) const if(m_dateHasBeenSet) { XmlNode dateNode = parentNode.CreateChildElement("Date"); - dateNode.SetText(m_date.ToGmtString(DateFormat::ISO_8601)); + dateNode.SetText(m_date.ToGmtString(Aws::Utils::DateFormat::ISO_8601)); } if(m_daysHasBeenSet) diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/TransitionStorageClass.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/TransitionStorageClass.cpp index 2149177071..59cc36b0b7 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/TransitionStorageClass.cpp +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/TransitionStorageClass.cpp @@ -25,6 +25,7 @@ namespace Aws static const int ONEZONE_IA_HASH = HashingUtils::HashString("ONEZONE_IA"); static const int INTELLIGENT_TIERING_HASH = HashingUtils::HashString("INTELLIGENT_TIERING"); static const int DEEP_ARCHIVE_HASH = HashingUtils::HashString("DEEP_ARCHIVE"); + static const int GLACIER_IR_HASH = HashingUtils::HashString("GLACIER_IR"); TransitionStorageClass GetTransitionStorageClassForName(const Aws::String& name) @@ -50,6 +51,10 @@ namespace Aws { return TransitionStorageClass::DEEP_ARCHIVE; } + else if (hashCode == GLACIER_IR_HASH) + { + return TransitionStorageClass::GLACIER_IR; + } EnumParseOverflowContainer* overflowContainer = Aws::GetEnumOverflowContainer(); if(overflowContainer) { @@ -74,6 +79,8 @@ namespace Aws return "INTELLIGENT_TIERING"; case TransitionStorageClass::DEEP_ARCHIVE: return "DEEP_ARCHIVE"; + case TransitionStorageClass::GLACIER_IR: + return "GLACIER_IR"; default: EnumParseOverflowContainer* overflowContainer = Aws::GetEnumOverflowContainer(); if(overflowContainer) diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/UploadPartCopyRequest.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/UploadPartCopyRequest.cpp index 364af9b8fc..f45d88ac80 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/UploadPartCopyRequest.cpp +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/UploadPartCopyRequest.cpp @@ -42,6 +42,28 @@ UploadPartCopyRequest::UploadPartCopyRequest() : { } +bool UploadPartCopyRequest::HasEmbeddedError(Aws::IOStream &body, + const Aws::Http::HeaderValueCollection &header) const +{ + // Header is unused + (void) header; + + auto readPointer = body.tellg(); + XmlDocument doc = XmlDocument::CreateFromXmlStream(body); + + if (!doc.WasParseSuccessful()) { + body.seekg(readPointer); + return false; + } + + if (doc.GetRootElement().GetName() == "Error") { + body.seekg(readPointer); + return true; + } + body.seekg(readPointer); + return false; +} + Aws::String UploadPartCopyRequest::SerializePayload() const { return {}; @@ -103,7 +125,7 @@ Aws::Http::HeaderValueCollection UploadPartCopyRequest::GetRequestSpecificHeader if(m_copySourceIfModifiedSinceHasBeenSet) { - headers.emplace("x-amz-copy-source-if-modified-since", m_copySourceIfModifiedSince.ToGmtString(DateFormat::RFC822)); + headers.emplace("x-amz-copy-source-if-modified-since", m_copySourceIfModifiedSince.ToGmtString(Aws::Utils::DateFormat::RFC822)); } if(m_copySourceIfNoneMatchHasBeenSet) @@ -115,7 +137,7 @@ Aws::Http::HeaderValueCollection UploadPartCopyRequest::GetRequestSpecificHeader if(m_copySourceIfUnmodifiedSinceHasBeenSet) { - headers.emplace("x-amz-copy-source-if-unmodified-since", m_copySourceIfUnmodifiedSince.ToGmtString(DateFormat::RFC822)); + headers.emplace("x-amz-copy-source-if-unmodified-since", m_copySourceIfUnmodifiedSince.ToGmtString(Aws::Utils::DateFormat::RFC822)); } if(m_copySourceRangeHasBeenSet) @@ -188,3 +210,13 @@ Aws::Http::HeaderValueCollection UploadPartCopyRequest::GetRequestSpecificHeader return headers; } + +UploadPartCopyRequest::EndpointParameters UploadPartCopyRequest::GetEndpointContextParams() const +{ + EndpointParameters parameters; + // Operation context parameters + if (BucketHasBeenSet()) { + parameters.emplace_back(Aws::String("Bucket"), this->GetBucket(), Aws::Endpoint::EndpointParameter::ParameterOrigin::OPERATION_CONTEXT); + } + return parameters; +} diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/UploadPartRequest.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/UploadPartRequest.cpp index ee4a67ee07..59edcc90e0 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/UploadPartRequest.cpp +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/UploadPartRequest.cpp @@ -22,6 +22,12 @@ UploadPartRequest::UploadPartRequest() : m_contentLength(0), m_contentLengthHasBeenSet(false), m_contentMD5HasBeenSet(false), + m_checksumAlgorithm(ChecksumAlgorithm::NOT_SET), + m_checksumAlgorithmHasBeenSet(false), + m_checksumCRC32HasBeenSet(false), + m_checksumCRC32CHasBeenSet(false), + m_checksumSHA1HasBeenSet(false), + m_checksumSHA256HasBeenSet(false), m_keyHasBeenSet(false), m_partNumber(0), m_partNumberHasBeenSet(false), @@ -91,6 +97,39 @@ Aws::Http::HeaderValueCollection UploadPartRequest::GetRequestSpecificHeaders() ss.str(""); } + if(m_checksumAlgorithmHasBeenSet) + { + headers.emplace("x-amz-sdk-checksum-algorithm", ChecksumAlgorithmMapper::GetNameForChecksumAlgorithm(m_checksumAlgorithm)); + } + + if(m_checksumCRC32HasBeenSet) + { + ss << m_checksumCRC32; + headers.emplace("x-amz-checksum-crc32", ss.str()); + ss.str(""); + } + + if(m_checksumCRC32CHasBeenSet) + { + ss << m_checksumCRC32C; + headers.emplace("x-amz-checksum-crc32c", ss.str()); + ss.str(""); + } + + if(m_checksumSHA1HasBeenSet) + { + ss << m_checksumSHA1; + headers.emplace("x-amz-checksum-sha1", ss.str()); + ss.str(""); + } + + if(m_checksumSHA256HasBeenSet) + { + ss << m_checksumSHA256; + headers.emplace("x-amz-checksum-sha256", ss.str()); + ss.str(""); + } + if(m_sSECustomerAlgorithmHasBeenSet) { ss << m_sSECustomerAlgorithm; @@ -127,3 +166,26 @@ Aws::Http::HeaderValueCollection UploadPartRequest::GetRequestSpecificHeaders() return headers; } + +UploadPartRequest::EndpointParameters UploadPartRequest::GetEndpointContextParams() const +{ + EndpointParameters parameters; + // Operation context parameters + if (BucketHasBeenSet()) { + parameters.emplace_back(Aws::String("Bucket"), this->GetBucket(), Aws::Endpoint::EndpointParameter::ParameterOrigin::OPERATION_CONTEXT); + } + return parameters; +} + +Aws::String UploadPartRequest::GetChecksumAlgorithmName() const +{ + if (m_checksumAlgorithm == ChecksumAlgorithm::NOT_SET) + { + return "md5"; + } + else + { + return ChecksumAlgorithmMapper::GetNameForChecksumAlgorithm(m_checksumAlgorithm); + } +} + diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/UploadPartResult.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/UploadPartResult.cpp index 13ad60a463..fa24c00520 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/UploadPartResult.cpp +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/UploadPartResult.cpp @@ -53,6 +53,30 @@ UploadPartResult& UploadPartResult::operator =(const Aws::AmazonWebServiceResult m_eTag = eTagIter->second; } + const auto& checksumCRC32Iter = headers.find("x-amz-checksum-crc32"); + if(checksumCRC32Iter != headers.end()) + { + m_checksumCRC32 = checksumCRC32Iter->second; + } + + const auto& checksumCRC32CIter = headers.find("x-amz-checksum-crc32c"); + if(checksumCRC32CIter != headers.end()) + { + m_checksumCRC32C = checksumCRC32CIter->second; + } + + const auto& checksumSHA1Iter = headers.find("x-amz-checksum-sha1"); + if(checksumSHA1Iter != headers.end()) + { + m_checksumSHA1 = checksumSHA1Iter->second; + } + + const auto& checksumSHA256Iter = headers.find("x-amz-checksum-sha256"); + if(checksumSHA256Iter != headers.end()) + { + m_checksumSHA256 = checksumSHA256Iter->second; + } + const auto& sSECustomerAlgorithmIter = headers.find("x-amz-server-side-encryption-customer-algorithm"); if(sSECustomerAlgorithmIter != headers.end()) { diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/WriteGetObjectResponseRequest.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/WriteGetObjectResponseRequest.cpp index 49893d5823..fd1a33573c 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/WriteGetObjectResponseRequest.cpp +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/source/model/WriteGetObjectResponseRequest.cpp @@ -32,6 +32,10 @@ WriteGetObjectResponseRequest::WriteGetObjectResponseRequest() : m_contentLength(0), m_contentLengthHasBeenSet(false), m_contentRangeHasBeenSet(false), + m_checksumCRC32HasBeenSet(false), + m_checksumCRC32CHasBeenSet(false), + m_checksumSHA1HasBeenSet(false), + m_checksumSHA256HasBeenSet(false), m_deleteMarker(false), m_deleteMarkerHasBeenSet(false), m_eTagHasBeenSet(false), @@ -180,6 +184,34 @@ Aws::Http::HeaderValueCollection WriteGetObjectResponseRequest::GetRequestSpecif ss.str(""); } + if(m_checksumCRC32HasBeenSet) + { + ss << m_checksumCRC32; + headers.emplace("x-amz-fwd-header-x-amz-checksum-crc32", ss.str()); + ss.str(""); + } + + if(m_checksumCRC32CHasBeenSet) + { + ss << m_checksumCRC32C; + headers.emplace("x-amz-fwd-header-x-amz-checksum-crc32c", ss.str()); + ss.str(""); + } + + if(m_checksumSHA1HasBeenSet) + { + ss << m_checksumSHA1; + headers.emplace("x-amz-fwd-header-x-amz-checksum-sha1", ss.str()); + ss.str(""); + } + + if(m_checksumSHA256HasBeenSet) + { + ss << m_checksumSHA256; + headers.emplace("x-amz-fwd-header-x-amz-checksum-sha256", ss.str()); + ss.str(""); + } + if(m_deleteMarkerHasBeenSet) { ss << std::boolalpha << m_deleteMarker; @@ -196,7 +228,7 @@ Aws::Http::HeaderValueCollection WriteGetObjectResponseRequest::GetRequestSpecif if(m_expiresHasBeenSet) { - headers.emplace("x-amz-fwd-header-expires", m_expires.ToGmtString(DateFormat::RFC822)); + headers.emplace("x-amz-fwd-header-expires", m_expires.ToGmtString(Aws::Utils::DateFormat::RFC822)); } if(m_expirationHasBeenSet) @@ -208,7 +240,7 @@ Aws::Http::HeaderValueCollection WriteGetObjectResponseRequest::GetRequestSpecif if(m_lastModifiedHasBeenSet) { - headers.emplace("x-amz-fwd-header-last-modified", m_lastModified.ToGmtString(DateFormat::RFC822)); + headers.emplace("x-amz-fwd-header-last-modified", m_lastModified.ToGmtString(Aws::Utils::DateFormat::RFC822)); } if(m_missingMetaHasBeenSet) @@ -240,7 +272,7 @@ Aws::Http::HeaderValueCollection WriteGetObjectResponseRequest::GetRequestSpecif if(m_objectLockRetainUntilDateHasBeenSet) { - headers.emplace("x-amz-fwd-header-x-amz-object-lock-retain-until-date", m_objectLockRetainUntilDate.ToGmtString(DateFormat::ISO_8601)); + headers.emplace("x-amz-fwd-header-x-amz-object-lock-retain-until-date", m_objectLockRetainUntilDate.ToGmtString(Aws::Utils::DateFormat::ISO_8601)); } if(m_partsCountHasBeenSet) @@ -322,3 +354,11 @@ Aws::Http::HeaderValueCollection WriteGetObjectResponseRequest::GetRequestSpecif return headers; } + +WriteGetObjectResponseRequest::EndpointParameters WriteGetObjectResponseRequest::GetEndpointContextParams() const +{ + EndpointParameters parameters; + // Static context parameters + parameters.emplace_back(Aws::String("UseObjectLambdaEndpoint"), true, Aws::Endpoint::EndpointParameter::ParameterOrigin::STATIC_CONTEXT); + return parameters; +} |