Skip to content

Commit f73dc96

Browse files
authored
Merge branch 'main' into feature/profile-name-credentials-chain
2 parents 0b8f8bf + f6077ff commit f73dc96

File tree

72 files changed

+4586
-2200
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+4586
-2200
lines changed

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.11.609
1+
1.11.611

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

Lines changed: 31 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -20655,9 +20655,9 @@ namespace EC2
2065520655
* <code>TargetId</code>, which can represent an individual account, or all the
2065620656
* accounts that fall under the specified organizational unit (OU) or root (the
2065720657
* entire Amazon Web Services Organization).</p> <p>The report is saved to your
20658-
* specified S3 bucket, using the following path structure (with the <i>italicized
20659-
* placeholders</i> representing your specific values):</p> <p>
20660-
* <code>s3://<i>amzn-s3-demo-bucket</i>/<i>your-optional-s3-prefix</i>/ec2_<i>targetId</i>_<i>reportId</i>_<i>yyyyMMdd</i>T<i>hhmm</i>Z.csv</code>
20658+
* specified S3 bucket, using the following path structure (with the capitalized
20659+
* placeholders representing your specific values):</p> <p>
20660+
* <code>s3://AMZN-S3-DEMO-BUCKET/YOUR-OPTIONAL-S3-PREFIX/ec2_TARGETID_REPORTID_YYYYMMDDTHHMMZ.csv</code>
2066120661
* </p> <p class="title"> <b>Prerequisites for generating a report</b> </p> <ul>
2066220662
* <li> <p>The <code>StartDeclarativePoliciesReport</code> API can only be called
2066320663
* by the management account or delegated administrators for the organization.</p>
@@ -20838,8 +20838,11 @@ namespace EC2
2083820838
* API. For more information, see <a
2083920839
* href="https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/Stop_Start.html">Stop
2084020840
* and start Amazon EC2 instances</a> in the <i>Amazon EC2 User Guide</i>.</p>
20841-
* <p>When you stop an instance, we shut it down.</p> <p>You can use the Stop
20842-
* operation together with the Hibernate parameter to hibernate an instance if the
20841+
* <p>When you stop or hibernate an instance, we shut it down. By default, this
20842+
* includes a graceful operating system (OS) shutdown. To bypass the graceful
20843+
* shutdown, use the <code>skipOsShutdown</code> parameter; however, this might
20844+
* risk data integrity.</p> <p>You can use the StopInstances operation together
20845+
* with the <code>Hibernate</code> parameter to hibernate an instance if the
2084320846
* instance is <a
2084420847
* href="https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/enabling-hibernation.html">enabled
2084520848
* for hibernation</a> and meets the <a
@@ -20850,9 +20853,9 @@ namespace EC2
2085020853
* href="https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/Hibernate.html">Hibernate
2085120854
* your Amazon EC2 instance</a> in the <i>Amazon EC2 User Guide</i>.</p> <p>If your
2085220855
* instance appears stuck in the <code>stopping</code> state, there might be an
20853-
* issue with the underlying host computer. You can use the Stop operation together
20854-
* with the Force parameter to force stop your instance. For more information, see
20855-
* <a
20856+
* issue with the underlying host computer. You can use the StopInstances operation
20857+
* together with the Force parameter to force stop your instance. For more
20858+
* information, see <a
2085620859
* href="https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/TroubleshootingInstancesStopping.html">Troubleshoot
2085720860
* Amazon EC2 instance stop issues</a> in the <i>Amazon EC2 User Guide</i>.</p>
2085820861
* <p>Stopping and hibernating an instance differs from rebooting or terminating
@@ -20944,18 +20947,26 @@ namespace EC2
2094420947
* for termination protection.</p> </li> </ul> <p>Terminated instances remain
2094520948
* visible after termination (for approximately one hour).</p> <p>By default,
2094620949
* Amazon EC2 deletes all EBS volumes that were attached when the instance
20947-
* launched. Volumes attached after instance launch continue running.</p> <p>You
20948-
* can stop, start, and terminate EBS-backed instances. You can only terminate
20949-
* instance store-backed instances. What happens to an instance differs if you stop
20950-
* or terminate it. For example, when you stop an instance, the root device and any
20951-
* other devices attached to the instance persist. When you terminate an instance,
20952-
* any attached EBS volumes with the <code>DeleteOnTermination</code> block device
20953-
* mapping parameter set to <code>true</code> are automatically deleted. For more
20954-
* information about the differences between stopping and terminating instances,
20955-
* see <a
20956-
* href="https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-instance-lifecycle.html">Instance
20957-
* lifecycle</a> in the <i>Amazon EC2 User Guide</i>.</p> <p>For more information
20958-
* about troubleshooting, see <a
20950+
* launched. Volumes attached after instance launch continue running.</p> <p>By
20951+
* default, the TerminateInstances operation includes a graceful operating system
20952+
* (OS) shutdown. To bypass the graceful shutdown, use the
20953+
* <code>skipOsShutdown</code> parameter; however, this might risk data
20954+
* integrity.</p> <p>You can stop, start, and terminate EBS-backed instances. You
20955+
* can only terminate instance store-backed instances. What happens to an instance
20956+
* differs if you stop or terminate it. For example, when you stop an instance, the
20957+
* root device and any other devices attached to the instance persist. When you
20958+
* terminate an instance, any attached EBS volumes with the
20959+
* <code>DeleteOnTermination</code> block device mapping parameter set to
20960+
* <code>true</code> are automatically deleted. For more information about the
20961+
* differences between stopping and terminating instances, see <a
20962+
* href="https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-instance-lifecycle.html">Amazon
20963+
* EC2 instance state changes</a> in the <i>Amazon EC2 User Guide</i>.</p> <p>When
20964+
* you terminate an instance, we attempt to terminate it forcibly after a short
20965+
* while. If your instance appears stuck in the shutting-down state after a period
20966+
* of time, there might be an issue with the underlying host computer. For more
20967+
* information about terminating and troubleshooting terminating your instances,
20968+
* see <a href="https://docs.aws.amazon.com/">Terminate Amazon EC2 instances</a>
20969+
* and <a
2095920970
* href="https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/TroubleshootingInstancesShuttingDown.html">Troubleshooting
2096020971
* terminating your instance</a> in the <i>Amazon EC2 User Guide</i>.</p><p><h3>See
2096120972
* Also:</h3> <a

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ namespace Model
6363
/**
6464
* <p>The instance type for which to reserve capacity.</p> <p>You can
6565
* request future-dated Capacity Reservations for instance types in the C, M, R, I,
66-
* and T instance families only.</p> <p>For more information, see <a
66+
* T, and G instance families only.</p> <p>For more information, see <a
6767
* href="https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/instance-types.html">Instance
6868
* types</a> in the <i>Amazon EC2 User Guide</i>.</p>
6969
*/
@@ -130,9 +130,9 @@ namespace Model
130130
/**
131131
* <p>The number of instances for which to reserve capacity.</p> <p>You can
132132
* request future-dated Capacity Reservations for an instance count with a minimum
133-
* of 100 vCPUs. For example, if you request a future-dated Capacity Reservation
134-
* for <code>m5.xlarge</code> instances, you must request at least 25 instances
135-
* (<i>25 * m5.xlarge = 100 vCPUs</i>).</p> <p>Valid range: 1 - 1000</p>
133+
* of 64 vCPUs. For example, if you request a future-dated Capacity Reservation for
134+
* <code>m5.xlarge</code> instances, you must request at least 25 instances (<i>16
135+
* * m5.xlarge = 64 vCPUs</i>).</p> <p>Valid range: 1 - 1000</p>
136136
*/
137137
inline int GetInstanceCount() const { return m_instanceCount; }
138138
inline bool InstanceCountHasBeenSet() const { return m_instanceCountHasBeenSet; }

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ namespace Model
6969
/**
7070
* <p>Determines how placement groups spread instances. </p> <ul> <li> <p>Host –
7171
* You can use <code>host</code> only with Outpost placement groups.</p> </li> <li>
72-
* <p>Rack No usage restrictions.</p> </li> </ul>
72+
* <p>Rack ��� No usage restrictions.</p> </li> </ul>
7373
*/
7474
inline SpreadLevel GetSpreadLevel() const { return m_spreadLevel; }
7575
inline bool SpreadLevelHasBeenSet() const { return m_spreadLevelHasBeenSet; }

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -103,12 +103,12 @@ namespace Model
103103
* <p> <code>ebs-info.nvme-support</code> - Indicates whether non-volatile memory
104104
* express (NVMe) is supported for EBS volumes (<code>required</code> |
105105
* <code>supported</code> | <code>unsupported</code>).</p> </li> <li> <p>
106-
* <code>free-tier-eligible</code> - Indicates whether the instance type is
107-
* eligible to use in the free tier (<code>true</code> | <code>false</code>).</p>
108-
* </li> <li> <p> <code>hibernation-supported</code> - Indicates whether On-Demand
109-
* hibernation is supported (<code>true</code> | <code>false</code>).</p> </li>
110-
* <li> <p> <code>hypervisor</code> - The hypervisor (<code>nitro</code> |
111-
* <code>xen</code>).</p> </li> <li> <p>
106+
* <code>free-tier-eligible</code> - A Boolean that indicates whether this instance
107+
* type can be used under the Amazon Web Services Free Tier (<code>true</code> |
108+
* <code>false</code>).</p> </li> <li> <p> <code>hibernation-supported</code> -
109+
* Indicates whether On-Demand hibernation is supported (<code>true</code> |
110+
* <code>false</code>).</p> </li> <li> <p> <code>hypervisor</code> - The hypervisor
111+
* (<code>nitro</code> | <code>xen</code>).</p> </li> <li> <p>
112112
* <code>instance-storage-info.disk.count</code> - The number of local disks.</p>
113113
* </li> <li> <p> <code>instance-storage-info.disk.size-in-gb</code> - The storage
114114
* size of each instance storage disk, in GB.</p> </li> <li> <p>

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,9 +170,15 @@ namespace Model
170170
* <code>AvailabilityZoneId</code> can be specified, but not both. If neither is
171171
* specified, Amazon EC2 automatically selects an Availability Zone within the
172172
* Region.</p> <p>This parameter is not supported when using <a
173+
* href="https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_CreateFleet.html">CreateFleet</a>,
174+
* <a
173175
* href="https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_CreateImage.html">CreateImage</a>,
174176
* <a
175177
* href="https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_DescribeImages.html">DescribeImages</a>,
178+
* <a
179+
* href="https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_RequestSpotFleet.html">RequestSpotFleet</a>,
180+
* <a
181+
* href="https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_RequestSpotInstances.html">RequestSpotInstances</a>,
176182
* and <a
177183
* href="https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_RunInstances.html">RunInstances</a>.</p>
178184
*/
@@ -259,9 +265,15 @@ namespace Model
259265
* <code>AvailabilityZoneId</code> can be specified, but not both. If neither is
260266
* specified, Amazon EC2 automatically selects an Availability Zone within the
261267
* Region.</p> <p>This parameter is not supported when using <a
268+
* href="https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_CreateFleet.html">CreateFleet</a>,
269+
* <a
262270
* href="https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_CreateImage.html">CreateImage</a>,
263271
* <a
264272
* href="https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_DescribeImages.html">DescribeImages</a>,
273+
* <a
274+
* href="https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_RequestSpotFleet.html">RequestSpotFleet</a>,
275+
* <a
276+
* href="https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_RequestSpotInstances.html">RequestSpotInstances</a>,
265277
* and <a
266278
* href="https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_RunInstances.html">RunInstances</a>.</p>
267279
*/

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

Lines changed: 21 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,8 @@ namespace Model
9595
///@{
9696
/**
9797
* <p>The instance type. For more information, see <a
98-
* href="https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/instance-types.html">Amazon
99-
* EC2 instance types</a> in the <i>Amazon EC2 User Guide</i>.</p>
98+
* href="https://docs.aws.amazon.com/ec2/latest/instancetypes/instance-types.html">Amazon
99+
* EC2 Instance Types Guide</a>.</p>
100100
*/
101101
inline InstanceType GetInstanceType() const { return m_instanceType; }
102102
inline bool InstanceTypeHasBeenSet() const { return m_instanceTypeHasBeenSet; }
@@ -154,13 +154,11 @@ namespace Model
154154

155155
///@{
156156
/**
157-
* <p>The name of the key pair. You can create a key pair using <a
158-
* href="https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_CreateKeyPair.html">CreateKeyPair</a>
159-
* or <a
160-
* href="https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_ImportKeyPair.html">ImportKeyPair</a>.</p>
161-
* <p>If you do not specify a key pair, you can't connect to the
162-
* instance unless you choose an AMI that is configured to allow users another way
163-
* to log in.</p>
157+
* <p>The name of the key pair. For more information, see <a
158+
* href="https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/create-key-pairs.html">Create
159+
* a key pair for your EC2 instance</a>.</p> <p>If you do not specify a
160+
* key pair, you can't connect to the instance unless you choose an AMI that is
161+
* configured to allow users another way to log in.</p>
164162
*/
165163
inline const Aws::String& GetKeyName() const { return m_keyName; }
166164
inline bool KeyNameHasBeenSet() const { return m_keyNameHasBeenSet; }
@@ -247,10 +245,9 @@ namespace Model
247245

248246
///@{
249247
/**
250-
* <p>The IDs of the security groups. You can create a security group using <a
251-
* href="https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_CreateSecurityGroup.html">CreateSecurityGroup</a>.</p>
252-
* <p>If you specify a network interface, you must specify any security groups as
253-
* part of the network interface instead of using this parameter.</p>
248+
* <p>The IDs of the security groups.</p> <p>If you specify a network interface,
249+
* you must specify any security groups as part of the network interface instead of
250+
* using this parameter.</p>
254251
*/
255252
inline const Aws::Vector<Aws::String>& GetSecurityGroupIds() const { return m_securityGroupIds; }
256253
inline bool SecurityGroupIdsHasBeenSet() const { return m_securityGroupIdsHasBeenSet; }
@@ -298,8 +295,8 @@ namespace Model
298295
* <p>The user data to make available to the instance. User data must be
299296
* base64-encoded. Depending on the tool or SDK that you're using, the
300297
* base64-encoding might be performed for you. For more information, see <a
301-
* href="https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/instancedata-add-user-data.html">Work
302-
* with instance user data</a>.</p>
298+
* href="https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/user-data.html">Run
299+
* commands at launch using instance user data</a>.</p>
303300
*/
304301
inline const Aws::String& GetUserData() const { return m_userData; }
305302
inline bool UserDataHasBeenSet() const { return m_userDataHasBeenSet; }
@@ -474,8 +471,8 @@ namespace Model
474471
///@{
475472
/**
476473
* <p>The metadata options for the instance. For more information, see <a
477-
* href="https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-instance-metadata.html">Instance
478-
* metadata and user data</a>.</p>
474+
* href="https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/configuring-instance-metadata-options.html">Configure
475+
* the Instance Metadata Service options</a>.</p>
479476
*/
480477
inline const InstanceMetadataOptionsRequest& GetMetadataOptions() const { return m_metadataOptions; }
481478
inline bool MetadataOptionsHasBeenSet() const { return m_metadataOptionsHasBeenSet; }
@@ -489,9 +486,8 @@ namespace Model
489486
/**
490487
* <p>Indicates whether the instance is enabled for Amazon Web Services Nitro
491488
* Enclaves. For more information, see <a
492-
* href="https://docs.aws.amazon.com/enclaves/latest/user/nitro-enclave.html">What
493-
* is Amazon Web Services Nitro Enclaves?</a> in the <i>Amazon Web Services Nitro
494-
* Enclaves User Guide</i>.</p> <p>You can't enable Amazon Web Services Nitro
489+
* href="https://docs.aws.amazon.com/enclaves/latest/user/">Amazon Web Services
490+
* Nitro Enclaves User Guide</a>.</p> <p>You can't enable Amazon Web Services Nitro
495491
* Enclaves and hibernation on the same instance.</p>
496492
*/
497493
inline const EnclaveOptionsRequest& GetEnclaveOptions() const { return m_enclaveOptions; }
@@ -532,8 +528,8 @@ namespace Model
532528
/**
533529
* <p>Indicates whether an instance is enabled for stop protection. For more
534530
* information, see <a
535-
* href="https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/Stop_Start.html#Using_StopProtection">Stop
536-
* protection</a>. </p>
531+
* href="https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-stop-protection.html">Enable
532+
* stop protection for your EC2 instances</a>.</p>
537533
*/
538534
inline bool GetDisableApiStop() const { return m_disableApiStop; }
539535
inline bool DisableApiStopHasBeenSet() const { return m_disableApiStopHasBeenSet; }
@@ -649,8 +645,9 @@ namespace Model
649645
* <p>Unique, case-sensitive identifier you provide to ensure the idempotency of
650646
* the request. If you do not specify a client token, a randomly generated token is
651647
* used for the request to ensure idempotency.</p> <p>For more information, see <a
652-
* href="https://docs.aws.amazon.com/AWSEC2/latest/APIReference/Run_Instance_Idempotency.html">Ensuring
653-
* Idempotency</a>.</p> <p>Constraints: Maximum 64 ASCII characters</p>
648+
* href="https://docs.aws.amazon.com/ec2/latest/devguide/ec2-api-idempotency.html">Ensuring
649+
* idempotency in Amazon EC2 API requests</a>.</p> <p>Constraints: Maximum 64 ASCII
650+
* characters</p>
654651
*/
655652
inline const Aws::String& GetClientToken() const { return m_clientToken; }
656653
inline bool ClientTokenHasBeenSet() const { return m_clientTokenHasBeenSet; }

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

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,15 +57,29 @@ namespace Model
5757
* launch. If the instance cannot hibernate successfully, a normal shutdown occurs.
5858
* For more information, see <a
5959
* href="https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/Hibernate.html">Hibernate
60-
* your instance</a> in the <i>Amazon EC2 User Guide</i>.</p> <p> Default:
61-
* <code>false</code> </p>
60+
* your Amazon EC2 instance</a> in the <i>Amazon EC2 User Guide</i>.</p> <p>
61+
* Default: <code>false</code> </p>
6262
*/
6363
inline bool GetHibernate() const { return m_hibernate; }
6464
inline bool HibernateHasBeenSet() const { return m_hibernateHasBeenSet; }
6565
inline void SetHibernate(bool value) { m_hibernateHasBeenSet = true; m_hibernate = value; }
6666
inline StopInstancesRequest& WithHibernate(bool value) { SetHibernate(value); return *this;}
6767
///@}
6868

69+
///@{
70+
/**
71+
* <p>Specifies whether to bypass the graceful OS shutdown process when the
72+
* instance is stopped.</p> <p>Bypassing the graceful OS shutdown might
73+
* result in data loss or corruption (for example, memory contents not flushed to
74+
* disk or loss of in-flight IOs) or skipped shutdown scripts.</p>
75+
* <p>Default: <code>false</code> </p>
76+
*/
77+
inline bool GetSkipOsShutdown() const { return m_skipOsShutdown; }
78+
inline bool SkipOsShutdownHasBeenSet() const { return m_skipOsShutdownHasBeenSet; }
79+
inline void SetSkipOsShutdown(bool value) { m_skipOsShutdownHasBeenSet = true; m_skipOsShutdown = value; }
80+
inline StopInstancesRequest& WithSkipOsShutdown(bool value) { SetSkipOsShutdown(value); return *this;}
81+
///@}
82+
6983
///@{
7084
/**
7185
* <p>Checks whether you have the required permissions for the operation, without
@@ -105,6 +119,9 @@ namespace Model
105119
bool m_hibernate{false};
106120
bool m_hibernateHasBeenSet = false;
107121

122+
bool m_skipOsShutdown{false};
123+
bool m_skipOsShutdownHasBeenSet = false;
124+
108125
bool m_dryRun{false};
109126
bool m_dryRunHasBeenSet = false;
110127

0 commit comments

Comments
 (0)