Merge branch 'main' of github.com:aws/aws-sdk-cpp into schema-serde

Author: pulimsr

VERSION

@@ -1 +1 @@
-1.11.818
+1.11.820

generated/src/aws-cpp-sdk-ec2/include/aws/ec2/EC2Client.h

@@ -1740,10 +1740,14 @@ class AWS_EC2_API EC2Client : public Aws::Client::AWSXMLClient,
    * <p>Cancels the specified Capacity Reservation, releases the reserved capacity,
    * and changes the Capacity Reservation's state to <code>cancelled</code>.</p>
    * <p>You can cancel a Capacity Reservation that is in the following states:</p>
-   * <ul> <li> <p> <code>assessing</code> </p> </li> <li> <p> <code>active</code> and
-   * there is no commitment duration or the commitment duration has elapsed. You
-   * can't cancel a future-dated Capacity Reservation during the commitment
-   * duration.</p> </li> </ul>  <p>You can't modify or cancel a Capacity Block.
+   * <ul> <li> <p> <code>assessing</code> </p> </li> <li> <p> <code>scheduled</code>
+   * </p> </li> <li> <p> <code>active</code> and there is no commitment duration or
+   * the commitment duration has elapsed.</p> </li> <li> <p> <code>active</code>
+   * during the commitment duration, if you provide a cancellation quote ID and
+   * accept the cancellation charges. Use
+   * <code>CreateCapacityReservationCancellationQuote</code> to generate a quote. The
+   * Capacity Reservation transitions to <code>cancelling</code> while charges are
+   * applied.</p> </li> </ul>  <p>You can't modify or cancel a Capacity Block.
    * For more information, see <a
    * href="https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-capacity-blocks.html">Capacity
    * Blocks for ML</a>.</p>  <p>If a future-dated Capacity Reservation enters
@@ -2385,6 +2389,40 @@ class AWS_EC2_API EC2Client : public Aws::Client::AWSXMLClient,
     return SubmitAsync(&EC2Client::CreateCapacityReservationBySplitting, request, handler, context);
   }
 
+  /**
+   * <p>Generates a cancellation quote for a future-dated Capacity Reservation that
+   * is within its commitment duration. The quote includes the cancellation terms and
+   * a quote ID that you can pass to the <code>CancelCapacityReservation</code>
+   * action. Cancellation quotes are valid for 24 hours.</p><p><h3>See Also:</h3>
+   * <a
+   * href="http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/CreateCapacityReservationCancellationQuote">AWS
+   * API Reference</a></p>
+   */
+  virtual Model::CreateCapacityReservationCancellationQuoteOutcome CreateCapacityReservationCancellationQuote(
+      const Model::CreateCapacityReservationCancellationQuoteRequest& request) const;
+
+  /**
+   * A Callable wrapper for CreateCapacityReservationCancellationQuote that returns a future to the operation so that it can be executed in
+   * parallel to other requests.
+   */
+  template <typename CreateCapacityReservationCancellationQuoteRequestT = Model::CreateCapacityReservationCancellationQuoteRequest>
+  Model::CreateCapacityReservationCancellationQuoteOutcomeCallable CreateCapacityReservationCancellationQuoteCallable(
+      const CreateCapacityReservationCancellationQuoteRequestT& request) const {
+    return SubmitCallable(&EC2Client::CreateCapacityReservationCancellationQuote, request);
+  }
+
+  /**
+   * An Async wrapper for CreateCapacityReservationCancellationQuote that queues the request into a thread executor and triggers associated
+   * callback when operation has finished.
+   */
+  template <typename CreateCapacityReservationCancellationQuoteRequestT = Model::CreateCapacityReservationCancellationQuoteRequest>
+  void CreateCapacityReservationCancellationQuoteAsync(
+      const CreateCapacityReservationCancellationQuoteRequestT& request,
+      const CreateCapacityReservationCancellationQuoteResponseReceivedHandler& handler,
+      const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context = nullptr) const {
+    return SubmitAsync(&EC2Client::CreateCapacityReservationCancellationQuote, request, handler, context);
+  }
+
   /**
    * <p>Creates a Capacity Reservation Fleet. For more information, see <a
    * href="https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/work-with-cr-fleets.html#create-crfleet">Create
@@ -9553,6 +9591,39 @@ class AWS_EC2_API EC2Client : public Aws::Client::AWSXMLClient,
     return SubmitAsync(&EC2Client::DescribeCapacityReservationBillingRequests, request, handler, context);
   }
 
+  /**
+   * <p>Describes one or more Capacity Reservation cancellation quotes. The results
+   * describe only the quotes that you have previously generated by using the
+   * <code>CreateCapacityReservationCancellationQuote</code> action.</p><p><h3>See
+   * Also:</h3>   <a
+   * href="http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/DescribeCapacityReservationCancellationQuotes">AWS
+   * API Reference</a></p>
+   */
+  virtual Model::DescribeCapacityReservationCancellationQuotesOutcome DescribeCapacityReservationCancellationQuotes(
+      const Model::DescribeCapacityReservationCancellationQuotesRequest& request = {}) const;
+
+  /**
+   * A Callable wrapper for DescribeCapacityReservationCancellationQuotes that returns a future to the operation so that it can be executed
+   * in parallel to other requests.
+   */
+  template <typename DescribeCapacityReservationCancellationQuotesRequestT = Model::DescribeCapacityReservationCancellationQuotesRequest>
+  Model::DescribeCapacityReservationCancellationQuotesOutcomeCallable DescribeCapacityReservationCancellationQuotesCallable(
+      const DescribeCapacityReservationCancellationQuotesRequestT& request = {}) const {
+    return SubmitCallable(&EC2Client::DescribeCapacityReservationCancellationQuotes, request);
+  }
+
+  /**
+   * An Async wrapper for DescribeCapacityReservationCancellationQuotes that queues the request into a thread executor and triggers
+   * associated callback when operation has finished.
+   */
+  template <typename DescribeCapacityReservationCancellationQuotesRequestT = Model::DescribeCapacityReservationCancellationQuotesRequest>
+  void DescribeCapacityReservationCancellationQuotesAsync(
+      const DescribeCapacityReservationCancellationQuotesResponseReceivedHandler& handler,
+      const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context = nullptr,
+      const DescribeCapacityReservationCancellationQuotesRequestT& request = {}) const {
+    return SubmitAsync(&EC2Client::DescribeCapacityReservationCancellationQuotes, request, handler, context);
+  }
+
   /**
    * <p>Describes one or more Capacity Reservation Fleets.</p><p><h3>See Also:</h3>
    * <a

generated/src/aws-cpp-sdk-ec2/include/aws/ec2/EC2ServiceClientModel.h

@@ -86,6 +86,7 @@
 #include <aws/ec2/model/CopyVolumesResponse.h>
 #include <aws/ec2/model/CreateCapacityManagerDataExportResponse.h>
 #include <aws/ec2/model/CreateCapacityReservationBySplittingResponse.h>
+#include <aws/ec2/model/CreateCapacityReservationCancellationQuoteResponse.h>
 #include <aws/ec2/model/CreateCapacityReservationFleetResponse.h>
 #include <aws/ec2/model/CreateCapacityReservationResponse.h>
 #include <aws/ec2/model/CreateCarrierGatewayResponse.h>
@@ -318,6 +319,8 @@
 #include <aws/ec2/model/DescribeCapacityManagerDataExportsRequest.h>
 #include <aws/ec2/model/DescribeCapacityManagerDataExportsResponse.h>
 #include <aws/ec2/model/DescribeCapacityReservationBillingRequestsResponse.h>
+#include <aws/ec2/model/DescribeCapacityReservationCancellationQuotesRequest.h>
+#include <aws/ec2/model/DescribeCapacityReservationCancellationQuotesResponse.h>
 #include <aws/ec2/model/DescribeCapacityReservationFleetsRequest.h>
 #include <aws/ec2/model/DescribeCapacityReservationFleetsResponse.h>
 #include <aws/ec2/model/DescribeCapacityReservationTopologyRequest.h>
@@ -1063,6 +1066,7 @@ class CopyVolumesRequest;
 class CreateCapacityManagerDataExportRequest;
 class CreateCapacityReservationRequest;
 class CreateCapacityReservationBySplittingRequest;
+class CreateCapacityReservationCancellationQuoteRequest;
 class CreateCapacityReservationFleetRequest;
 class CreateCarrierGatewayRequest;
 class CreateClientVpnEndpointRequest;
@@ -1281,6 +1285,7 @@ class DescribeCapacityBlockStatusRequest;
 class DescribeCapacityBlocksRequest;
 class DescribeCapacityManagerDataExportsRequest;
 class DescribeCapacityReservationBillingRequestsRequest;
+class DescribeCapacityReservationCancellationQuotesRequest;
 class DescribeCapacityReservationFleetsRequest;
 class DescribeCapacityReservationTopologyRequest;
 class DescribeCapacityReservationsRequest;
@@ -1833,6 +1838,7 @@ typedef Aws::Utils::Outcome<CopyVolumesResponse, EC2Error> CopyVolumesOutcome;
 typedef Aws::Utils::Outcome<CreateCapacityManagerDataExportResponse, EC2Error> CreateCapacityManagerDataExportOutcome;
 typedef Aws::Utils::Outcome<CreateCapacityReservationResponse, EC2Error> CreateCapacityReservationOutcome;
 typedef Aws::Utils::Outcome<CreateCapacityReservationBySplittingResponse, EC2Error> CreateCapacityReservationBySplittingOutcome;
+typedef Aws::Utils::Outcome<CreateCapacityReservationCancellationQuoteResponse, EC2Error> CreateCapacityReservationCancellationQuoteOutcome;
 typedef Aws::Utils::Outcome<CreateCapacityReservationFleetResponse, EC2Error> CreateCapacityReservationFleetOutcome;
 typedef Aws::Utils::Outcome<CreateCarrierGatewayResponse, EC2Error> CreateCarrierGatewayOutcome;
 typedef Aws::Utils::Outcome<CreateClientVpnEndpointResponse, EC2Error> CreateClientVpnEndpointOutcome;
@@ -2061,6 +2067,8 @@ typedef Aws::Utils::Outcome<DescribeCapacityBlockStatusResponse, EC2Error> Descr
 typedef Aws::Utils::Outcome<DescribeCapacityBlocksResponse, EC2Error> DescribeCapacityBlocksOutcome;
 typedef Aws::Utils::Outcome<DescribeCapacityManagerDataExportsResponse, EC2Error> DescribeCapacityManagerDataExportsOutcome;
 typedef Aws::Utils::Outcome<DescribeCapacityReservationBillingRequestsResponse, EC2Error> DescribeCapacityReservationBillingRequestsOutcome;
+typedef Aws::Utils::Outcome<DescribeCapacityReservationCancellationQuotesResponse, EC2Error>
+    DescribeCapacityReservationCancellationQuotesOutcome;
 typedef Aws::Utils::Outcome<DescribeCapacityReservationFleetsResponse, EC2Error> DescribeCapacityReservationFleetsOutcome;
 typedef Aws::Utils::Outcome<DescribeCapacityReservationTopologyResponse, EC2Error> DescribeCapacityReservationTopologyOutcome;
 typedef Aws::Utils::Outcome<DescribeCapacityReservationsResponse, EC2Error> DescribeCapacityReservationsOutcome;
@@ -2637,6 +2645,7 @@ typedef std::future<CopyVolumesOutcome> CopyVolumesOutcomeCallable;
 typedef std::future<CreateCapacityManagerDataExportOutcome> CreateCapacityManagerDataExportOutcomeCallable;
 typedef std::future<CreateCapacityReservationOutcome> CreateCapacityReservationOutcomeCallable;
 typedef std::future<CreateCapacityReservationBySplittingOutcome> CreateCapacityReservationBySplittingOutcomeCallable;
+typedef std::future<CreateCapacityReservationCancellationQuoteOutcome> CreateCapacityReservationCancellationQuoteOutcomeCallable;
 typedef std::future<CreateCapacityReservationFleetOutcome> CreateCapacityReservationFleetOutcomeCallable;
 typedef std::future<CreateCarrierGatewayOutcome> CreateCarrierGatewayOutcomeCallable;
 typedef std::future<CreateClientVpnEndpointOutcome> CreateClientVpnEndpointOutcomeCallable;
@@ -2860,6 +2869,7 @@ typedef std::future<DescribeCapacityBlockStatusOutcome> DescribeCapacityBlockSta
 typedef std::future<DescribeCapacityBlocksOutcome> DescribeCapacityBlocksOutcomeCallable;
 typedef std::future<DescribeCapacityManagerDataExportsOutcome> DescribeCapacityManagerDataExportsOutcomeCallable;
 typedef std::future<DescribeCapacityReservationBillingRequestsOutcome> DescribeCapacityReservationBillingRequestsOutcomeCallable;
+typedef std::future<DescribeCapacityReservationCancellationQuotesOutcome> DescribeCapacityReservationCancellationQuotesOutcomeCallable;
 typedef std::future<DescribeCapacityReservationFleetsOutcome> DescribeCapacityReservationFleetsOutcomeCallable;
 typedef std::future<DescribeCapacityReservationTopologyOutcome> DescribeCapacityReservationTopologyOutcomeCallable;
 typedef std::future<DescribeCapacityReservationsOutcome> DescribeCapacityReservationsOutcomeCallable;
@@ -3572,6 +3582,10 @@ typedef std::function<void(const EC2Client*, const Model::CreateCapacityReservat
                            const Model::CreateCapacityReservationBySplittingOutcome&,
                            const std::shared_ptr<const Aws::Client::AsyncCallerContext>&)>
     CreateCapacityReservationBySplittingResponseReceivedHandler;
+typedef std::function<void(const EC2Client*, const Model::CreateCapacityReservationCancellationQuoteRequest&,
+                           const Model::CreateCapacityReservationCancellationQuoteOutcome&,
+                           const std::shared_ptr<const Aws::Client::AsyncCallerContext>&)>
+    CreateCapacityReservationCancellationQuoteResponseReceivedHandler;
 typedef std::function<void(const EC2Client*, const Model::CreateCapacityReservationFleetRequest&,
                            const Model::CreateCapacityReservationFleetOutcome&,
                            const std::shared_ptr<const Aws::Client::AsyncCallerContext>&)>
@@ -4307,6 +4321,10 @@ typedef std::function<void(const EC2Client*, const Model::DescribeCapacityReserv
                            const Model::DescribeCapacityReservationBillingRequestsOutcome&,
                            const std::shared_ptr<const Aws::Client::AsyncCallerContext>&)>
     DescribeCapacityReservationBillingRequestsResponseReceivedHandler;
+typedef std::function<void(const EC2Client*, const Model::DescribeCapacityReservationCancellationQuotesRequest&,
+                           const Model::DescribeCapacityReservationCancellationQuotesOutcome&,
+                           const std::shared_ptr<const Aws::Client::AsyncCallerContext>&)>
+    DescribeCapacityReservationCancellationQuotesResponseReceivedHandler;
 typedef std::function<void(const EC2Client*, const Model::DescribeCapacityReservationFleetsRequest&,
                            const Model::DescribeCapacityReservationFleetsOutcome&,
                            const std::shared_ptr<const Aws::Client::AsyncCallerContext>&)>

generated/src/aws-cpp-sdk-ec2/include/aws/ec2/model/AllocationType.h

@@ -10,7 +10,7 @@
 namespace Aws {
 namespace EC2 {
 namespace Model {
-enum class AllocationType { NOT_SET, used, future };
+enum class AllocationType { NOT_SET, used, future, cancelling };
 
 namespace AllocationTypeMapper {
 AWS_EC2_API AllocationType GetAllocationTypeForName(const Aws::String& name);

generated/src/aws-cpp-sdk-ec2/include/aws/ec2/model/ApplyCancellationCharges.h

@@ -0,0 +1,22 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0.
+ */
+
+#pragma once
+#include <aws/core/utils/memory/stl/AWSString.h>
+#include <aws/ec2/EC2_EXPORTS.h>
+
+namespace Aws {
+namespace EC2 {
+namespace Model {
+enum class ApplyCancellationCharges { NOT_SET, commitment_wind_down };
+
+namespace ApplyCancellationChargesMapper {
+AWS_EC2_API ApplyCancellationCharges GetApplyCancellationChargesForName(const Aws::String& name);
+
+AWS_EC2_API Aws::String GetNameForApplyCancellationCharges(ApplyCancellationCharges value);
+}  // namespace ApplyCancellationChargesMapper
+}  // namespace Model
+}  // namespace EC2
+}  // namespace Aws

generated/src/aws-cpp-sdk-ec2/include/aws/ec2/model/CancelCapacityReservationRequest.h

@@ -7,6 +7,7 @@
 #include <aws/core/utils/memory/stl/AWSString.h>
 #include <aws/ec2/EC2Request.h>
 #include <aws/ec2/EC2_EXPORTS.h>
+#include <aws/ec2/model/ApplyCancellationCharges.h>
 
 #include <utility>
 
@@ -68,12 +69,58 @@ class CancelCapacityReservationRequest : public EC2Request {
     return *this;
   }
   ///@}
+
+  ///@{
+  /**
+   * <p>Specifies the cancellation charge type to apply when cancelling a
+   * future-dated Capacity Reservation during its commitment duration. Possible
+   * values include <code>commitment-wind-down</code>, which continues billing for
+   * the remaining commitment duration without delivering capacity.</p>
+   */
+  inline ApplyCancellationCharges GetApplyCancellationCharges() const { return m_applyCancellationCharges; }
+  inline bool ApplyCancellationChargesHasBeenSet() const { return m_applyCancellationChargesHasBeenSet; }
+  inline void SetApplyCancellationCharges(ApplyCancellationCharges value) {
+    m_applyCancellationChargesHasBeenSet = true;
+    m_applyCancellationCharges = value;
+  }
+  inline CancelCapacityReservationRequest& WithApplyCancellationCharges(ApplyCancellationCharges value) {
+    SetApplyCancellationCharges(value);
+    return *this;
+  }
+  ///@}
+
+  ///@{
+  /**
+   * <p>The ID of the cancellation quote to use for the cancellation. You can
+   * generate a cancellation quote by using the
+   * <code>CreateCapacityReservationCancellationQuote</code> action. The cancellation
+   * quote must be in an <code>active</code> state.</p>
+   */
+  inline const Aws::String& GetQuoteId() const { return m_quoteId; }
+  inline bool QuoteIdHasBeenSet() const { return m_quoteIdHasBeenSet; }
+  template <typename QuoteIdT = Aws::String>
+  void SetQuoteId(QuoteIdT&& value) {
+    m_quoteIdHasBeenSet = true;
+    m_quoteId = std::forward<QuoteIdT>(value);
+  }
+  template <typename QuoteIdT = Aws::String>
+  CancelCapacityReservationRequest& WithQuoteId(QuoteIdT&& value) {
+    SetQuoteId(std::forward<QuoteIdT>(value));
+    return *this;
+  }
+  ///@}
  private:
   Aws::String m_capacityReservationId;
 
   bool m_dryRun{false};
+
+  ApplyCancellationCharges m_applyCancellationCharges{ApplyCancellationCharges::NOT_SET};
+
+  Aws::String m_quoteId;
   bool m_capacityReservationIdHasBeenSet = false;
   bool m_dryRunHasBeenSet = false;
+  bool m_applyCancellationChargesHasBeenSet = false;
+  bool m_quoteIdHasBeenSet = false;
 };
 
 }  // namespace Model