From 3ccce366d217ebd73e762d97d770396c87dfbe42 Mon Sep 17 00:00:00 2001 From: luxy Date: Thu, 3 Aug 2023 14:02:38 +0800 Subject: [PATCH 1/4] months --- .../include/aws/s3/model/DefaultRetention.h | 23 +++++++++++++++++++ .../source/model/DefaultRetention.cpp | 22 ++++++++++++++++-- 2 files changed, 43 insertions(+), 2 deletions(-) diff --git a/aws-sdk-cpp-1.8.183/aws-sdk-cpp-1.8.183/aws-cpp-sdk-s3/include/aws/s3/model/DefaultRetention.h b/aws-sdk-cpp-1.8.183/aws-sdk-cpp-1.8.183/aws-cpp-sdk-s3/include/aws/s3/model/DefaultRetention.h index dd16b963a..07a37425a 100644 --- a/aws-sdk-cpp-1.8.183/aws-sdk-cpp-1.8.183/aws-cpp-sdk-s3/include/aws/s3/model/DefaultRetention.h +++ b/aws-sdk-cpp-1.8.183/aws-sdk-cpp-1.8.183/aws-cpp-sdk-s3/include/aws/s3/model/DefaultRetention.h @@ -135,6 +135,26 @@ namespace Model */ inline DefaultRetention& WithYears(int value) { SetYears(value); return *this;} + inline int GetMonths() const{ return m_months; } + + /** + *

The number of years that you want to specify for the default retention + * period. Must be used with Mode.

+ */ + inline bool MonthsHasBeenSet() const { return m_monthsHasBeenSet; } + + /** + *

The number of years that you want to specify for the default retention + * period. Must be used with Mode.

+ */ + inline void SetMonths(int value) { m_monthsHasBeenSet = true; m_months = value; } + + /** + *

The number of years that you want to specify for the default retention + * period. Must be used with Mode.

+ */ + inline DefaultRetention& WithMonths(int value) { SetMonths(value); return *this;} + private: ObjectLockRetentionMode m_mode; @@ -145,6 +165,9 @@ namespace Model int m_years; bool m_yearsHasBeenSet; + + int m_months; + bool m_monthsHasBeenSet; }; } // namespace Model diff --git a/aws-sdk-cpp-1.8.183/aws-sdk-cpp-1.8.183/aws-cpp-sdk-s3/source/model/DefaultRetention.cpp b/aws-sdk-cpp-1.8.183/aws-sdk-cpp-1.8.183/aws-cpp-sdk-s3/source/model/DefaultRetention.cpp index 7416fb753..6eca8968a 100644 --- a/aws-sdk-cpp-1.8.183/aws-sdk-cpp-1.8.183/aws-cpp-sdk-s3/source/model/DefaultRetention.cpp +++ b/aws-sdk-cpp-1.8.183/aws-sdk-cpp-1.8.183/aws-cpp-sdk-s3/source/model/DefaultRetention.cpp @@ -26,7 +26,9 @@ DefaultRetention::DefaultRetention() : m_days(0), m_daysHasBeenSet(false), m_years(0), - m_yearsHasBeenSet(false) + m_yearsHasBeenSet(false), + m_months(0), + m_monthsHasBeenSet(false) { } @@ -36,7 +38,9 @@ DefaultRetention::DefaultRetention(const XmlNode& xmlNode) : m_days(0), m_daysHasBeenSet(false), m_years(0), - m_yearsHasBeenSet(false) + m_yearsHasBeenSet(false), + m_months(0), + m_monthsHasBeenSet(false) { *this = xmlNode; } @@ -64,6 +68,12 @@ DefaultRetention& DefaultRetention::operator =(const XmlNode& xmlNode) { m_years = StringUtils::ConvertToInt32(StringUtils::Trim(Aws::Utils::Xml::DecodeEscapedXmlText(yearsNode.GetText()).c_str()).c_str()); m_yearsHasBeenSet = true; + } + XmlNode monthsNode = resultNode.FirstChild("Months"); + if(!monthsNode.IsNull()) + { + m_months = StringUtils::ConvertToInt32(StringUtils::Trim(Aws::Utils::Xml::DecodeEscapedXmlText(monthsNode.GetText()).c_str()).c_str()); + m_monthsHasBeenSet = true; } } @@ -95,6 +105,14 @@ void DefaultRetention::AddToNode(XmlNode& parentNode) const ss.str(""); } + if(m_monthsHasBeenSet) + { + XmlNode monthsNode = parentNode.CreateChildElement("Months"); + ss << m_months; + monthsNode.SetText(ss.str()); + ss.str(""); + } + } } // namespace Model -- Gitee From 5bb58299aa241ce901c7756b143d1dc50ae0105b Mon Sep 17 00:00:00 2001 From: luxy Date: Mon, 14 Aug 2023 17:31:39 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=B9=E9=87=8F?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=A1=B6=E5=AD=98=E9=87=8F=E8=AF=B7=E6=B1=82?= =?UTF-8?q?=E6=96=B9=E5=BC=8F=E4=B8=BAPOST?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../aws-sdk-cpp-1.8.183/aws-cpp-sdk-s3/source/S3Client.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aws-sdk-cpp-1.8.183/aws-sdk-cpp-1.8.183/aws-cpp-sdk-s3/source/S3Client.cpp b/aws-sdk-cpp-1.8.183/aws-sdk-cpp-1.8.183/aws-cpp-sdk-s3/source/S3Client.cpp index 130fea5d2..fda2f6398 100644 --- a/aws-sdk-cpp-1.8.183/aws-sdk-cpp-1.8.183/aws-cpp-sdk-s3/source/S3Client.cpp +++ b/aws-sdk-cpp-1.8.183/aws-sdk-cpp-1.8.183/aws-cpp-sdk-s3/source/S3Client.cpp @@ -1535,7 +1535,7 @@ GetBucketStorageInfosOutcome S3Client::GetBucketStorageInfos(const GetBucketStor Aws::StringStream ss; ss.str("?storageinfo"); uri.SetQueryString(ss.str()); - return GetBucketStorageInfosOutcome(MakeRequest(uri, request, Aws::Http::HttpMethod::HTTP_GET, Aws::Auth::SIGV4_SIGNER, computeEndpointOutcome.GetResult().signerRegion.c_str() /*signerRegionOverride*/, computeEndpointOutcome.GetResult().signerServiceName.c_str() /*signerServiceNameOverride*/)); + return GetBucketStorageInfosOutcome(MakeRequest(uri, request, Aws::Http::HttpMethod::HTTP_POST, Aws::Auth::SIGV4_SIGNER, computeEndpointOutcome.GetResult().signerRegion.c_str() /*signerRegionOverride*/, computeEndpointOutcome.GetResult().signerServiceName.c_str() /*signerServiceNameOverride*/)); } GetBucketStorageInfosOutcomeCallable S3Client::GetBucketStorageInfosCallable(const GetBucketStorageInfosRequest& request) const -- Gitee From 04d01bfa4a316e5d212499c791cc74434d4f9983 Mon Sep 17 00:00:00 2001 From: luxy Date: Tue, 15 Aug 2023 11:17:11 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E9=80=82=E9=85=8D=E6=89=B9=E9=87=8F?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=A1=B6=E5=AD=98=E9=87=8F=E4=BB=A5=E5=8F=8A?= =?UTF-8?q?if-match?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../source/model/GetBucketStorageInfosRequest.cpp | 2 +- .../aws-cpp-sdk-s3/source/model/GetObjectRequest.cpp | 8 ++++---- .../aws-cpp-sdk-s3/source/model/HeadObjectRequest.cpp | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/aws-sdk-cpp-1.8.183/aws-sdk-cpp-1.8.183/aws-cpp-sdk-s3/source/model/GetBucketStorageInfosRequest.cpp b/aws-sdk-cpp-1.8.183/aws-sdk-cpp-1.8.183/aws-cpp-sdk-s3/source/model/GetBucketStorageInfosRequest.cpp index e280d2b06..0545fabc0 100644 --- a/aws-sdk-cpp-1.8.183/aws-sdk-cpp-1.8.183/aws-cpp-sdk-s3/source/model/GetBucketStorageInfosRequest.cpp +++ b/aws-sdk-cpp-1.8.183/aws-sdk-cpp-1.8.183/aws-cpp-sdk-s3/source/model/GetBucketStorageInfosRequest.cpp @@ -25,7 +25,7 @@ Aws::String GetBucketStorageInfosRequest::SerializePayload() const XmlDocument payloadDoc = XmlDocument::CreateWithRootNode("Get"); XmlNode parentNode = payloadDoc.GetRootElement(); - parentNode.SetAttributeValue("xmlns", "http://s3.amazonaws.com/doc/2006-03-01/"); + //parentNode.SetAttributeValue("xmlns", "http://s3.amazonaws.com/doc/2006-03-01/"); for(Aws::String bkt:m_buckets) { XmlNode bktNode = parentNode.CreateChildElement("Bucket"); diff --git a/aws-sdk-cpp-1.8.183/aws-sdk-cpp-1.8.183/aws-cpp-sdk-s3/source/model/GetObjectRequest.cpp b/aws-sdk-cpp-1.8.183/aws-sdk-cpp-1.8.183/aws-cpp-sdk-s3/source/model/GetObjectRequest.cpp index 287340fe4..2546af15b 100644 --- a/aws-sdk-cpp-1.8.183/aws-sdk-cpp-1.8.183/aws-cpp-sdk-s3/source/model/GetObjectRequest.cpp +++ b/aws-sdk-cpp-1.8.183/aws-sdk-cpp-1.8.183/aws-cpp-sdk-s3/source/model/GetObjectRequest.cpp @@ -134,25 +134,25 @@ Aws::Http::HeaderValueCollection GetObjectRequest::GetRequestSpecificHeaders() c if(m_ifMatchHasBeenSet) { ss << m_ifMatch; - headers.emplace("if-match", ss.str()); + headers.emplace("If-Match", ss.str()); ss.str(""); } if(m_ifModifiedSinceHasBeenSet) { - headers.emplace("if-modified-since", m_ifModifiedSince.ToGmtString(DateFormat::RFC822)); + headers.emplace("If-Modified-Since", m_ifModifiedSince.ToGmtString(DateFormat::RFC822)); } if(m_ifNoneMatchHasBeenSet) { ss << m_ifNoneMatch; - headers.emplace("if-none-match", ss.str()); + headers.emplace("If-None-Match", ss.str()); ss.str(""); } if(m_ifUnmodifiedSinceHasBeenSet) { - headers.emplace("if-unmodified-since", m_ifUnmodifiedSince.ToGmtString(DateFormat::RFC822)); + headers.emplace("If-Unmodified-Since", m_ifUnmodifiedSince.ToGmtString(DateFormat::RFC822)); } if(m_rangeHasBeenSet) diff --git a/aws-sdk-cpp-1.8.183/aws-sdk-cpp-1.8.183/aws-cpp-sdk-s3/source/model/HeadObjectRequest.cpp b/aws-sdk-cpp-1.8.183/aws-sdk-cpp-1.8.183/aws-cpp-sdk-s3/source/model/HeadObjectRequest.cpp index a9c4fd67a..45740c855 100644 --- a/aws-sdk-cpp-1.8.183/aws-sdk-cpp-1.8.183/aws-cpp-sdk-s3/source/model/HeadObjectRequest.cpp +++ b/aws-sdk-cpp-1.8.183/aws-sdk-cpp-1.8.183/aws-cpp-sdk-s3/source/model/HeadObjectRequest.cpp @@ -85,25 +85,25 @@ Aws::Http::HeaderValueCollection HeadObjectRequest::GetRequestSpecificHeaders() if(m_ifMatchHasBeenSet) { ss << m_ifMatch; - headers.emplace("if-match", ss.str()); + headers.emplace("If-Match", ss.str()); ss.str(""); } if(m_ifModifiedSinceHasBeenSet) { - headers.emplace("if-modified-since", m_ifModifiedSince.ToGmtString(DateFormat::RFC822)); + headers.emplace("If-Modified-Since", m_ifModifiedSince.ToGmtString(DateFormat::RFC822)); } if(m_ifNoneMatchHasBeenSet) { ss << m_ifNoneMatch; - headers.emplace("if-none-match", ss.str()); + headers.emplace("If-None-Match", ss.str()); ss.str(""); } if(m_ifUnmodifiedSinceHasBeenSet) { - headers.emplace("if-unmodified-since", m_ifUnmodifiedSince.ToGmtString(DateFormat::RFC822)); + headers.emplace("If-Unmodified-Since", m_ifUnmodifiedSince.ToGmtString(DateFormat::RFC822)); } if(m_rangeHasBeenSet) -- Gitee From f63de4b9f2277bf0fe6234f5e27d27d511693ea1 Mon Sep 17 00:00:00 2001 From: luxy Date: Tue, 15 Aug 2023 11:58:18 +0800 Subject: [PATCH 4/4] a --- .../include/aws/s3/model/Bucket.h | 43 +++++++++++++++++++ .../aws-cpp-sdk-s3/source/model/Bucket.cpp | 12 +++++- 2 files changed, 53 insertions(+), 2 deletions(-) diff --git a/aws-sdk-cpp-1.8.183/aws-sdk-cpp-1.8.183/aws-cpp-sdk-s3/include/aws/s3/model/Bucket.h b/aws-sdk-cpp-1.8.183/aws-sdk-cpp-1.8.183/aws-cpp-sdk-s3/include/aws/s3/model/Bucket.h index 92c751e2e..410bd68d2 100644 --- a/aws-sdk-cpp-1.8.183/aws-sdk-cpp-1.8.183/aws-cpp-sdk-s3/include/aws/s3/model/Bucket.h +++ b/aws-sdk-cpp-1.8.183/aws-sdk-cpp-1.8.183/aws-cpp-sdk-s3/include/aws/s3/model/Bucket.h @@ -117,8 +117,51 @@ namespace Model */ inline Bucket& WithCreationDate(Aws::Utils::DateTime&& value) { SetCreationDate(std::move(value)); return *this;} + + inline const Aws::String& GetId() const{ return m_id; } + + /** + *

The name of the bucket.

+ */ + inline bool IdHasBeenSet() const { return m_idHasBeenSet; } + + /** + *

The name of the bucket.

+ */ + inline void SetId(const Aws::String& value) { m_idHasBeenSet = true; m_id = value; } + + /** + *

The name of the bucket.

+ */ + inline void SetId(Aws::String&& value) { m_idHasBeenSet = true; m_id = std::move(value); } + + /** + *

The name of the bucket.

+ */ + inline void SetId(const char* value) { m_idHasBeenSet = true; m_id.assign(value); } + + /** + *

The name of the bucket.

+ */ + inline Bucket& WithId(const Aws::String& value) { SetId(value); return *this;} + + /** + *

The name of the bucket.

+ */ + inline Bucket& WithId(Aws::String&& value) { SetId(std::move(value)); return *this;} + + /** + *

The name of the bucket.

+ */ + inline Bucket& WithId(const char* value) { SetId(value); return *this;} + + + private: + Aws::String m_id; + bool m_idHasBeenSet; + Aws::String m_name; bool m_nameHasBeenSet; diff --git a/aws-sdk-cpp-1.8.183/aws-sdk-cpp-1.8.183/aws-cpp-sdk-s3/source/model/Bucket.cpp b/aws-sdk-cpp-1.8.183/aws-sdk-cpp-1.8.183/aws-cpp-sdk-s3/source/model/Bucket.cpp index aecfba8ab..8b859f41f 100644 --- a/aws-sdk-cpp-1.8.183/aws-sdk-cpp-1.8.183/aws-cpp-sdk-s3/source/model/Bucket.cpp +++ b/aws-sdk-cpp-1.8.183/aws-sdk-cpp-1.8.183/aws-cpp-sdk-s3/source/model/Bucket.cpp @@ -22,13 +22,15 @@ namespace Model Bucket::Bucket() : m_nameHasBeenSet(false), - m_creationDateHasBeenSet(false) + m_creationDateHasBeenSet(false), + m_idHasBeenSet(false) { } Bucket::Bucket(const XmlNode& xmlNode) : m_nameHasBeenSet(false), - m_creationDateHasBeenSet(false) + m_creationDateHasBeenSet(false), + m_idHasBeenSet(false) { *this = xmlNode; } @@ -44,6 +46,12 @@ Bucket& Bucket::operator =(const XmlNode& xmlNode) { m_name = Aws::Utils::Xml::DecodeEscapedXmlText(nameNode.GetText()); m_nameHasBeenSet = true; + } + XmlNode idNode = resultNode.FirstChild("ID"); + if(!idNode.IsNull()) + { + m_id = Aws::Utils::Xml::DecodeEscapedXmlText(idNode.GetText()); + m_idHasBeenSet = true; } XmlNode creationDateNode = resultNode.FirstChild("CreationDate"); if(!creationDateNode.IsNull()) -- Gitee