Skip to content

Commit d189265

Browse files
authored
Merge branch 'main' into github-dryrun
2 parents 4305422 + 209874e commit d189265

File tree

27 files changed

+822
-244
lines changed

27 files changed

+822
-244
lines changed

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.11.652
1+
1.11.653

generated/src/aws-cpp-sdk-batch/include/aws/batch/BatchClient.h

Lines changed: 10 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -139,12 +139,11 @@ namespace Batch
139139
* can use Fargate and Fargate Spot capacity in your managed compute environment.
140140
* You can optionally set a maximum price so that Spot Instances only launch when
141141
* the Spot Instance price is less than a specified percentage of the On-Demand
142-
* price.</p> <p>Multi-node parallel jobs aren't supported on Spot
143-
* Instances.</p> <p>In an unmanaged compute environment, you can manage
144-
* your own EC2 compute resources and have flexibility with how you configure your
145-
* compute resources. For example, you can use custom AMIs. However, you must
146-
* verify that each of your AMIs meet the Amazon ECS container instance AMI
147-
* specification. For more information, see <a
142+
* price.</p> <p>In an unmanaged compute environment, you can manage your own EC2
143+
* compute resources and have flexibility with how you configure your compute
144+
* resources. For example, you can use custom AMIs. However, you must verify that
145+
* each of your AMIs meet the Amazon ECS container instance AMI specification. For
146+
* more information, see <a
148147
* href="https://docs.aws.amazon.com/AmazonECS/latest/developerguide/container_instance_AMIs.html">container
149148
* instance AMIs</a> in the <i>Amazon Elastic Container Service Developer
150149
* Guide</i>. After you created your unmanaged compute environment, you can use the
@@ -153,57 +152,12 @@ namespace Batch
153152
* Amazon ECS cluster. For more information, see <a
154153
* href="https://docs.aws.amazon.com/AmazonECS/latest/developerguide/launch_container_instance.html">Launching
155154
* an Amazon ECS container instance</a> in the <i>Amazon Elastic Container Service
156-
* Developer Guide</i>.</p> <p>To create a compute environment that uses EKS
157-
* resources, the caller must have permissions to call
158-
* <code>eks:DescribeCluster</code>.</p> <p>Batch doesn't
159-
* automatically upgrade the AMIs in a compute environment after it's created. For
160-
* example, it also doesn't update the AMIs in your compute environment when a
161-
* newer version of the Amazon ECS optimized AMI is available. You're responsible
162-
* for the management of the guest operating system. This includes any updates and
163-
* security patches. You're also responsible for any additional application
164-
* software or utilities that you install on the compute resources. There are two
165-
* ways to use a new AMI for your Batch jobs. The original method is to complete
166-
* these steps:</p> <ol> <li> <p>Create a new compute environment with the new
167-
* AMI.</p> </li> <li> <p>Add the compute environment to an existing job queue.</p>
168-
* </li> <li> <p>Remove the earlier compute environment from your job queue.</p>
169-
* </li> <li> <p>Delete the earlier compute environment.</p> </li> </ol> <p>In
170-
* April 2022, Batch added enhanced support for updating compute environments. For
171-
* more information, see <a
155+
* Developer Guide</i>.</p> <p>Batch doesn't automatically upgrade the AMIs
156+
* in a compute environment after it's created. For more information on how to
157+
* update a compute environment's AMI, see <a
172158
* href="https://docs.aws.amazon.com/batch/latest/userguide/updating-compute-environments.html">Updating
173-
* compute environments</a>. To use the enhanced updating of compute environments
174-
* to update AMIs, follow these rules:</p> <ul> <li> <p>Either don't set the
175-
* service role (<code>serviceRole</code>) parameter or set it to the
176-
* <b>AWSBatchServiceRole</b> service-linked role.</p> </li> <li> <p>Set the
177-
* allocation strategy (<code>allocationStrategy</code>) parameter to
178-
* <code>BEST_FIT_PROGRESSIVE</code>, <code>SPOT_CAPACITY_OPTIMIZED</code>, or
179-
* <code>SPOT_PRICE_CAPACITY_OPTIMIZED</code>.</p> </li> <li> <p>Set the update to
180-
* latest image version (<code>updateToLatestImageVersion</code>) parameter to
181-
* <code>true</code>. The <code>updateToLatestImageVersion</code> parameter is used
182-
* when you update a compute environment. This parameter is ignored when you create
183-
* a compute environment.</p> </li> <li> <p>Don't specify an AMI ID in
184-
* <code>imageId</code>, <code>imageIdOverride</code> (in <a
185-
* href="https://docs.aws.amazon.com/batch/latest/APIReference/API_Ec2Configuration.html">
186-
* <code>ec2Configuration</code> </a>), or in the launch template
187-
* (<code>launchTemplate</code>). In that case, Batch selects the latest Amazon ECS
188-
* optimized AMI that's supported by Batch at the time the infrastructure update is
189-
* initiated. Alternatively, you can specify the AMI ID in the <code>imageId</code>
190-
* or <code>imageIdOverride</code> parameters, or the launch template identified by
191-
* the <code>LaunchTemplate</code> properties. Changing any of these properties
192-
* starts an infrastructure update. If the AMI ID is specified in the launch
193-
* template, it can't be replaced by specifying an AMI ID in either the
194-
* <code>imageId</code> or <code>imageIdOverride</code> parameters. It can only be
195-
* replaced by specifying a different launch template, or if the launch template
196-
* version is set to <code>$Default</code> or <code>$Latest</code>, by setting
197-
* either a new default version for the launch template (if <code>$Default</code>)
198-
* or by adding a new version to the launch template (if <code>$Latest</code>).</p>
199-
* </li> </ul> <p>If these rules are followed, any update that starts an
200-
* infrastructure update causes the AMI ID to be re-selected. If the
201-
* <code>version</code> setting in the launch template
202-
* (<code>launchTemplate</code>) is set to <code>$Latest</code> or
203-
* <code>$Default</code>, the latest or default version of the launch template is
204-
* evaluated up at the time of the infrastructure update, even if the
205-
* <code>launchTemplate</code> wasn't updated.</p> <p><h3>See Also:</h3>
206-
* <a
159+
* compute environments</a> in the <i>Batch User Guide</i>.</p> <p><h3>See
160+
* Also:</h3> <a
207161
* href="http://docs.aws.amazon.com/goto/WebAPI/batch-2016-08-10/CreateComputeEnvironment">AWS
208162
* API Reference</a></p>
209163
*/

generated/src/aws-cpp-sdk-batch/include/aws/batch/model/ComputeResource.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,8 @@ namespace Model
5555
* <code>SPOT</code>, you must also specify an Amazon EC2 Spot Fleet role with the
5656
* <code>spotIamFleetRole</code> parameter. For more information, see <a
5757
* href="https://docs.aws.amazon.com/batch/latest/userguide/spot_fleet_IAM_role.html">Amazon
58-
* EC2 spot fleet role</a> in the <i>Batch User Guide</i>.</p>
58+
* EC2 spot fleet role</a> in the <i>Batch User Guide</i>.</p> <p>Multi-node
59+
* parallel jobs aren't supported on Spot Instances.</p>
5960
*/
6061
inline CRType GetType() const { return m_type; }
6162
inline bool TypeHasBeenSet() const { return m_typeHasBeenSet; }

generated/src/aws-cpp-sdk-batch/include/aws/batch/model/CreateComputeEnvironmentRequest.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,9 @@ namespace Model
190190
///@{
191191
/**
192192
* <p>The details for the Amazon EKS cluster that supports the compute
193-
* environment.</p>
193+
* environment.</p> <p>To create a compute environment that uses EKS
194+
* resources, the caller must have permissions to call
195+
* <code>eks:DescribeCluster</code>.</p>
194196
*/
195197
inline const EksConfiguration& GetEksConfiguration() const { return m_eksConfiguration; }
196198
inline bool EksConfigurationHasBeenSet() const { return m_eksConfigurationHasBeenSet; }

generated/src/aws-cpp-sdk-batch/include/aws/batch/model/Ec2Configuration.h

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,16 @@ namespace Model
5252
* ECS-optimized Amazon Linux 2 AMI</a> (<code>ECS_AL2</code>) is used. If a new
5353
* image type is specified in an update, but neither an <code>imageId</code> nor a
5454
* <code>imageIdOverride</code> parameter is specified, then the latest Amazon ECS
55-
* optimized AMI for that image type that's supported by Batch is used.</p> <dl>
56-
* <dt>ECS_AL2</dt> <dd> <p> <a
55+
* optimized AMI for that image type that's supported by Batch is used.</p>
56+
* <p>Amazon Web Services will end support for Amazon ECS optimized
57+
* AL2-optimized and AL2-accelerated AMIs. Starting in January 2026, Batch will
58+
* change the default AMI for new Amazon ECS compute environments from Amazon Linux
59+
* 2 to Amazon Linux 2023. We recommend migrating Batch Amazon ECS compute
60+
* environments to Amazon Linux 2023 to maintain optimal performance and security.
61+
* For more information on upgrading from AL2 to AL2023, see <a
62+
* href="https://docs.aws.amazon.com/batch/latest/userguide/ecs-migration-2023.html">How
63+
* to migrate from ECS AL2 to ECS AL2023</a> in the <i>Batch User Guide</i>.</p>
64+
* <dl> <dt>ECS_AL2</dt> <dd> <p> <a
5765
* href="https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ecs-optimized_AMI.html#al2ami">Amazon
5866
* Linux 2</a>: Default for all non-GPU instance families.</p> </dd>
5967
* <dt>ECS_AL2_NVIDIA</dt> <dd> <p> <a
@@ -70,11 +78,7 @@ namespace Model
7078
* Linux 2023 (GPU)</a>: For all GPU instance families and can be used for all non
7179
* Amazon Web Services Graviton-based instance types.</p>
7280
* <p>ECS_AL2023_NVIDIA doesn't support <code>p3</code> and <code>g3</code>
73-
* instance types.</p> </dd> <dt>ECS_AL1</dt> <dd> <p> <a
74-
* href="https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ecs-optimized_AMI.html#alami">Amazon
75-
* Linux</a>. Amazon Linux has reached the end-of-life of standard support. For
76-
* more information, see <a href="http://aws.amazon.com/amazon-linux-ami/">Amazon
77-
* Linux AMI</a>.</p> </dd> </dl> </dd> <dt>EKS</dt> <dd> <p>If the
81+
* instance types.</p> </dd> </dl> </dd> <dt>EKS</dt> <dd> <p>If the
7882
* <code>imageIdOverride</code> parameter isn't specified, then a recent <a
7983
* href="https://docs.aws.amazon.com/eks/latest/userguide/eks-optimized-ami.html">Amazon
8084
* EKS-optimized Amazon Linux AMI</a> (<code>EKS_AL2</code>) is used. If a new
@@ -90,9 +94,10 @@ namespace Model
9094
* Amazon EKS compute environments beyond the 11/26/25 end-of-support date, these
9195
* compute environments will no longer receive any new software updates, security
9296
* patches, or bug fixes from Amazon Web Services. For more information on
93-
* upgrading from AL2 to AL2023, see <a href="">How to upgrade from EKS AL2 to EKS
94-
* AL2023</a> in the <i>Batch User Guide</i>.</p> <dl>
95-
* <dt>EKS_AL2</dt> <dd> <p> <a
97+
* upgrading from AL2 to AL2023, see <a
98+
* href="https://docs.aws.amazon.com/batch/latest/userguide/eks-migration-2023.html">How
99+
* to upgrade from EKS AL2 to EKS AL2023</a> in the <i>Batch User Guide</i>.</p>
100+
* <dl> <dt>EKS_AL2</dt> <dd> <p> <a
96101
* href="https://docs.aws.amazon.com/eks/latest/userguide/eks-optimized-ami.html">Amazon
97102
* Linux 2</a>: Default for all non-GPU instance families.</p> </dd>
98103
* <dt>EKS_AL2_NVIDIA</dt> <dd> <p> <a

generated/src/aws-cpp-sdk-batch/include/aws/batch/model/EcsTaskDetails.h

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,10 @@ namespace Model
125125

126126
///@{
127127
/**
128-
* <p>The IPC resource namespace to use for the containers in the task.</p>
128+
* <p>The IPC resource namespace to use for the containers in the task. The valid
129+
* values are <code>host</code>, <code>task</code>, or <code>none</code>. For more
130+
* information see <code>ipcMode</code> in <a
131+
* href="https://docs.aws.amazon.com/batch/latest/APIReference/API_EcsTaskProperties.html">EcsTaskProperties</a>.</p>
129132
*/
130133
inline const Aws::String& GetIpcMode() const { return m_ipcMode; }
131134
inline bool IpcModeHasBeenSet() const { return m_ipcModeHasBeenSet; }
@@ -155,7 +158,10 @@ namespace Model
155158

156159
///@{
157160
/**
158-
* <p>The process namespace to use for the containers in the task.</p>
161+
* <p>The process namespace to use for the containers in the task. The valid values
162+
* are <code>host</code>, or <code>task</code>. For more information see
163+
* <code>pidMode</code> in <a
164+
* href="https://docs.aws.amazon.com/batch/latest/APIReference/API_EcsTaskProperties.html">EcsTaskProperties</a>.</p>
159165
*/
160166
inline const Aws::String& GetPidMode() const { return m_pidMode; }
161167
inline bool PidModeHasBeenSet() const { return m_pidModeHasBeenSet; }

generated/src/aws-cpp-sdk-batch/include/aws/batch/model/LogConfiguration.h

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -47,13 +47,13 @@ namespace Model
4747
* <p>The log driver to use for the container. The valid values that are listed for
4848
* this parameter are log drivers that the Amazon ECS container agent can
4949
* communicate with by default.</p> <p>The supported log drivers are
50-
* <code>awslogs</code>, <code>fluentd</code>, <code>gelf</code>,
51-
* <code>json-file</code>, <code>journald</code>, <code>logentries</code>,
52-
* <code>syslog</code>, and <code>splunk</code>.</p> <p>Jobs that are
53-
* running on Fargate resources are restricted to the <code>awslogs</code> and
54-
* <code>splunk</code> log drivers.</p> <dl> <dt>awsfirelens</dt> <dd>
55-
* <p>Specifies the firelens logging driver. For more information on configuring
56-
* Firelens, see <a
50+
* <code>awsfirelens</code>, <code>awslogs</code>, <code>fluentd</code>,
51+
* <code>gelf</code>, <code>json-file</code>, <code>journald</code>,
52+
* <code>logentries</code>, <code>syslog</code>, and <code>splunk</code>.</p>
53+
* <p>Jobs that are running on Fargate resources are restricted to the
54+
* <code>awslogs</code> and <code>splunk</code> log drivers.</p> <dl>
55+
* <dt>awsfirelens</dt> <dd> <p>Specifies the firelens logging driver. For more
56+
* information on configuring Firelens, see <a
5757
* href="https://docs.aws.amazon.com/AmazonECS/latest/developerguide/using_firelens.html">Send
5858
* Amazon ECS logs to an Amazon Web Services service or Amazon Web Services
5959
* Partner</a> in the <i>Amazon Elastic Container Service Developer Guide</i>.</p>

generated/src/aws-cpp-sdk-batch/include/aws/batch/model/SubmitServiceJobRequest.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ namespace Model
116116
///@{
117117
/**
118118
* <p>The share identifier for the service job. Don't specify this parameter if the
119-
* job queue doesn't have a fair- share scheduling policy. If the job queue has a
119+
* job queue doesn't have a fair-share scheduling policy. If the job queue has a
120120
* fair-share scheduling policy, then this parameter must be specified.</p>
121121
*/
122122
inline const Aws::String& GetShareIdentifier() const { return m_shareIdentifier; }

0 commit comments

Comments
 (0)