Skip to content

Commit 8b2c366

Browse files
dscpinheirodscpinheiro
authored
Merge pull request #3688 from aws/v4-development-merge
2 parents 49f166f + 4b2c54c commit 8b2c366

File tree

4,336 files changed

+169856
-195146
lines changed

Some content is hidden

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

4,336 files changed

+169856
-195146
lines changed

‎README.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -386,8 +386,6 @@ Protocol tests can be found in the `sdk/test/ProtocolTests` directory. Protocol
386386
* AWS Elastic Beanstalk is an easy-to-use service for deploying and scaling web applications and services developed with Java, .NET, PHP, Node.js, Python, Ruby, Go, and Docker on familiar servers such as Apache, Nginx, Passenger, and IIS.
387387
* [AWSSDK.ElasticFileSystem](https://www.nuget.org/packages/AWSSDK.ElasticFileSystem/)
388388
* Amazon Elastic File System (Amazon EFS) is a file storage service for Amazon Elastic Compute Cloud (Amazon EC2) instances.
389-
* [AWSSDK.ElasticInference](https://www.nuget.org/packages/AWSSDK.ElasticInference/)
390-
* Amazon Elastic Inference allows customers to attach Elastic Inference Accelerators to Amazon EC2 and Amazon ECS tasks, thus providing low-cost GPU-powered acceleration and reducing the cost of running deep learning inference. This release allows customers to add or remove tags for their Elastic Inference Accelerators.
391389
* [AWSSDK.ElasticLoadBalancing](https://www.nuget.org/packages/AWSSDK.ElasticLoadBalancing/)
392390
* Elastic Load Balancing automatically distributes incoming application traffic across multiple compute instances in the cloud.
393391
* [AWSSDK.ElasticLoadBalancingV2](https://www.nuget.org/packages/AWSSDK.ElasticLoadBalancingV2/)

‎buildtools/build.proj

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -469,7 +469,7 @@
469469
Command="$(powershell) -ExecutionPolicy Unrestricted -NoProfile -File create-nuget-packages.ps1 -PackageList "$(ServiceList)""/>
470470
</Target>
471471

472-
<Target Name="package-extensions" DependsOnTargets="package-netcore-extensions;package-crt-extensions;package-cloudfront-extensions;package-ec2-extensions;package-meai-extensions" />
472+
<Target Name="package-extensions" DependsOnTargets="package-netcore-extensions;package-crt-extensions;package-cloudfront-extensions;package-ec2-extensions;package-meai-extensions;package-logging-extensions" />
473473

474474
<Target Name="build-extensions" >
475475
<!-- depends: restore-nuget;run-generator -->
@@ -509,6 +509,13 @@
509509
<Exec Command="..\..\..\sdk\.nuget\NuGet.exe pack ./AWSSDK.Extensions.Bedrock.MEAI.nuspec -BasePath . -OutputDirectory ../../../Deployment/nuget" WorkingDirectory="../extensions/src/AWSSDK.Extensions.Bedrock.MEAI" />
510510
</Target>
511511

512+
<Target Name="package-logging-extensions" DependsOnTargets="$(package-extensions-DependsOnTargets)">
513+
<MakeDir Directories="../Deployment/nuget" />
514+
515+
<Exec Command="..\..\..\sdk\.nuget\NuGet.exe pack ./AWSSDK.Extensions.Logging.ILoggerAdaptor.nuspec -BasePath . -OutputDirectory ../../../Deployment/nuget" WorkingDirectory="../extensions/src/AWSSDK.Extensions.Logging.ILoggerAdaptor" />
516+
<Exec Command="..\..\..\sdk\.nuget\NuGet.exe pack ./AWSSDK.Extensions.Logging.Log4NetAdaptor.nuspec -BasePath . -OutputDirectory ../../../Deployment/nuget" WorkingDirectory="../extensions/src/AWSSDK.Extensions.Logging.Log4NetAdaptor" />
517+
</Target>
518+
512519
<Target Name="copy-assemblies" DependsOnTargets="nuget-pack;build-extensions">
513520
<Message Text="Collating assemblies for downstream doc generation" />
514521
<PropertyGroup>

‎changelogs/SDK.CHANGELOG.2025.md

Lines changed: 276 additions & 0 deletions
Large diffs are not rendered by default.

‎changelogs/SDK.CHANGELOG.ALL.md

Lines changed: 276 additions & 0 deletions
Large diffs are not rendered by default.

‎docgenerator/AWSSDKDocSamples/Batch.GeneratedSamples.extra.xml

Lines changed: 114 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,25 @@
5757
</example>
5858
</value>
5959
</doc>
60+
<doc>
61+
<members>
62+
<member name="M:Amazon.Batch.IAmazonBatch.CreateConsumableResource(Amazon.Batch.Model.CreateConsumableResourceRequest)" />
63+
<member name="M:Amazon.Batch.AmazonBatchClient.CreateConsumableResource(Amazon.Batch.Model.CreateConsumableResourceRequest)" />
64+
<member name="T:Amazon.Batch.Model.CreateConsumableResourceRequest" />
65+
<member name="T:Amazon.Batch.Model.CreateConsumableResourceResponse" />
66+
</members>
67+
<value>
68+
<example>
69+
<para>
70+
Creates a Batch consumable resource.
71+
</para>
72+
<code
73+
title="To create a consumable resource"
74+
source=".\AWSSDKDocSamples\Batch\Batch.GeneratedSamples.cs"
75+
region="to-create-a-consumable-resource-1739494856623" />
76+
</example>
77+
</value>
78+
</doc>
6079
<doc>
6180
<members>
6281
<member name="M:Amazon.Batch.IAmazonBatch.CreateJobQueue(Amazon.Batch.Model.CreateJobQueueRequest)" />
@@ -114,6 +133,25 @@
114133
</example>
115134
</value>
116135
</doc>
136+
<doc>
137+
<members>
138+
<member name="M:Amazon.Batch.IAmazonBatch.DeleteConsumableResource(Amazon.Batch.Model.DeleteConsumableResourceRequest)" />
139+
<member name="M:Amazon.Batch.AmazonBatchClient.DeleteConsumableResource(Amazon.Batch.Model.DeleteConsumableResourceRequest)" />
140+
<member name="T:Amazon.Batch.Model.DeleteConsumableResourceRequest" />
141+
<member name="T:Amazon.Batch.Model.DeleteConsumableResourceResponse" />
142+
</members>
143+
<value>
144+
<example>
145+
<para>
146+
Deletes the specified consumable resource.
147+
</para>
148+
<code
149+
title="To delete a consumable resource"
150+
source=".\AWSSDKDocSamples\Batch\Batch.GeneratedSamples.cs"
151+
region="to-delete-a-consumable-resource-1739495667751" />
152+
</example>
153+
</value>
154+
</doc>
117155
<doc>
118156
<members>
119157
<member name="M:Amazon.Batch.IAmazonBatch.DeleteJobQueue(Amazon.Batch.Model.DeleteJobQueueRequest)" />
@@ -171,6 +209,25 @@
171209
</example>
172210
</value>
173211
</doc>
212+
<doc>
213+
<members>
214+
<member name="M:Amazon.Batch.IAmazonBatch.DescribeConsumableResource(Amazon.Batch.Model.DescribeConsumableResourceRequest)" />
215+
<member name="M:Amazon.Batch.AmazonBatchClient.DescribeConsumableResource(Amazon.Batch.Model.DescribeConsumableResourceRequest)" />
216+
<member name="T:Amazon.Batch.Model.DescribeConsumableResourceRequest" />
217+
<member name="T:Amazon.Batch.Model.DescribeConsumableResourceResponse" />
218+
</members>
219+
<value>
220+
<example>
221+
<para>
222+
Returns a description of the specified consumable resource.
223+
</para>
224+
<code
225+
title="To get a description of a consumable resource"
226+
source=".\AWSSDKDocSamples\Batch\Batch.GeneratedSamples.cs"
227+
region="to-get-a-description-of-a-consumable-resource-1739495864808" />
228+
</example>
229+
</value>
230+
</doc>
174231
<doc>
175232
<members>
176233
<member name="M:Amazon.Batch.IAmazonBatch.DescribeJobDefinitions(Amazon.Batch.Model.DescribeJobDefinitionsRequest)" />
@@ -228,6 +285,25 @@
228285
</example>
229286
</value>
230287
</doc>
288+
<doc>
289+
<members>
290+
<member name="M:Amazon.Batch.IAmazonBatch.ListConsumableResources(Amazon.Batch.Model.ListConsumableResourcesRequest)" />
291+
<member name="M:Amazon.Batch.AmazonBatchClient.ListConsumableResources(Amazon.Batch.Model.ListConsumableResourcesRequest)" />
292+
<member name="T:Amazon.Batch.Model.ListConsumableResourcesRequest" />
293+
<member name="T:Amazon.Batch.Model.ListConsumableResourcesResponse" />
294+
</members>
295+
<value>
296+
<example>
297+
<para>
298+
Returns a list of the consumable resources for your account.
299+
</para>
300+
<code
301+
title="To get a list of a consumable resources"
302+
source=".\AWSSDKDocSamples\Batch\Batch.GeneratedSamples.cs"
303+
region="to-get-a-list-of-a-consumable-resources-1739496071960" />
304+
</example>
305+
</value>
306+
</doc>
231307
<doc>
232308
<members>
233309
<member name="M:Amazon.Batch.IAmazonBatch.ListJobs(Amazon.Batch.Model.ListJobsRequest)" />
@@ -266,6 +342,25 @@
266342
</example>
267343
</value>
268344
</doc>
345+
<doc>
346+
<members>
347+
<member name="M:Amazon.Batch.IAmazonBatch.ListJobsByConsumableResource(Amazon.Batch.Model.ListJobsByConsumableResourceRequest)" />
348+
<member name="M:Amazon.Batch.AmazonBatchClient.ListJobsByConsumableResource(Amazon.Batch.Model.ListJobsByConsumableResourceRequest)" />
349+
<member name="T:Amazon.Batch.Model.ListJobsByConsumableResourceRequest" />
350+
<member name="T:Amazon.Batch.Model.ListJobsByConsumableResourceResponse" />
351+
</members>
352+
<value>
353+
<example>
354+
<para>
355+
Returns a list of Batch jobs that require a specific consumable resource.
356+
</para>
357+
<code
358+
title="To get a list of Batch jobs by consumable resource"
359+
source=".\AWSSDKDocSamples\Batch\Batch.GeneratedSamples.cs"
360+
region="to-get-a-list-of-batch-jobs-by-consumable-resource-1739496640347" />
361+
</example>
362+
</value>
363+
</doc>
269364
<doc>
270365
<members>
271366
<member name="M:Amazon.Batch.IAmazonBatch.ListTagsForResource(Amazon.Batch.Model.ListTagsForResourceRequest)" />
@@ -418,6 +513,25 @@
418513
</example>
419514
</value>
420515
</doc>
516+
<doc>
517+
<members>
518+
<member name="M:Amazon.Batch.IAmazonBatch.UpdateConsumableResource(Amazon.Batch.Model.UpdateConsumableResourceRequest)" />
519+
<member name="M:Amazon.Batch.AmazonBatchClient.UpdateConsumableResource(Amazon.Batch.Model.UpdateConsumableResourceRequest)" />
520+
<member name="T:Amazon.Batch.Model.UpdateConsumableResourceRequest" />
521+
<member name="T:Amazon.Batch.Model.UpdateConsumableResourceResponse" />
522+
</members>
523+
<value>
524+
<example>
525+
<para>
526+
Updates a consumable resource.
527+
</para>
528+
<code
529+
title="To update a consumable resource"
530+
source=".\AWSSDKDocSamples\Batch\Batch.GeneratedSamples.cs"
531+
region="to-update-a-consumable-resource-1739497761692" />
532+
</example>
533+
</value>
534+
</doc>
421535
<doc>
422536
<members>
423537
<member name="M:Amazon.Batch.IAmazonBatch.UpdateJobQueue(Amazon.Batch.Model.UpdateJobQueueRequest)" />

‎docgenerator/AWSSDKDocSamples/Batch/Batch.GeneratedSamples.cs

Lines changed: 124 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,28 @@ public void BatchCreateComputeEnvironment()
114114
#endregion
115115
}
116116

117+
public void BatchCreateConsumableResource()
118+
{
119+
#region to-create-a-consumable-resource-1739494856623
120+
121+
var client = new AmazonBatchClient();
122+
var response = client.CreateConsumableResource(new CreateConsumableResourceRequest
123+
{
124+
ConsumableResourceName = "myConsumableResource",
125+
ResourceType = "REPLENISHABLE",
126+
Tags = new Dictionary<string, string> {
127+
{ "Department", "Engineering" },
128+
{ "User", "JaneDoe" }
129+
},
130+
TotalQuantity = 123
131+
});
132+
133+
string consumableResourceArn = response.ConsumableResourceArn;
134+
string consumableResourceName = response.ConsumableResourceName;
135+
136+
#endregion
137+
}
138+
117139
public void BatchCreateJobQueue()
118140
{
119141
#region to-create-a-job-queue-with-a-single-compute-environment-1481152967946
@@ -180,6 +202,20 @@ public void BatchDeleteComputeEnvironment()
180202
#endregion
181203
}
182204

205+
public void BatchDeleteConsumableResource()
206+
{
207+
#region to-delete-a-consumable-resource-1739495667751
208+
209+
var client = new AmazonBatchClient();
210+
var response = client.DeleteConsumableResource(new DeleteConsumableResourceRequest
211+
{
212+
ConsumableResource = "myConsumableResource"
213+
});
214+
215+
216+
#endregion
217+
}
218+
183219
public void BatchDeleteJobQueue()
184220
{
185221
#region to-delete-a-job-queue-1481153508134
@@ -225,6 +261,28 @@ public void BatchDescribeComputeEnvironments()
225261
#endregion
226262
}
227263

264+
public void BatchDescribeConsumableResource()
265+
{
266+
#region to-get-a-description-of-a-consumable-resource-1739495864808
267+
268+
var client = new AmazonBatchClient();
269+
var response = client.DescribeConsumableResource(new DescribeConsumableResourceRequest
270+
{
271+
ConsumableResource = "myConsumableResource"
272+
});
273+
274+
long availableQuantity = response.AvailableQuantity;
275+
string consumableResourceArn = response.ConsumableResourceArn;
276+
string consumableResourceName = response.ConsumableResourceName;
277+
long createdAt = response.CreatedAt;
278+
long inUseQuantity = response.InUseQuantity;
279+
string resourceType = response.ResourceType;
280+
Dictionary<string, string> tags = response.Tags;
281+
long totalQuantity = response.TotalQuantity;
282+
283+
#endregion
284+
}
285+
228286
public void BatchDescribeJobDefinitions()
229287
{
230288
#region to-describe-active-job-definitions-1481153895831
@@ -274,6 +332,29 @@ public void BatchDescribeJobs()
274332
#endregion
275333
}
276334

335+
public void BatchListConsumableResources()
336+
{
337+
#region to-get-a-list-of-a-consumable-resources-1739496071960
338+
339+
var client = new AmazonBatchClient();
340+
var response = client.ListConsumableResources(new ListConsumableResourcesRequest
341+
{
342+
Filters = new List<KeyValuesPair> {
343+
new KeyValuesPair {
344+
Name = "CONSUMABLE_RESOURCE_NAME",
345+
Values = new List<string> {
346+
"my*"
347+
}
348+
}
349+
},
350+
MaxResults = 123
351+
});
352+
353+
List<ConsumableResourceSummary> consumableResources = response.ConsumableResources;
354+
355+
#endregion
356+
}
357+
277358
public void BatchListJobs()
278359
{
279360
#region to-list-running-jobs-1481154202164
@@ -305,6 +386,30 @@ public void BatchListJobs()
305386
#endregion
306387
}
307388

389+
public void BatchListJobsByConsumableResource()
390+
{
391+
#region to-get-a-list-of-batch-jobs-by-consumable-resource-1739496640347
392+
393+
var client = new AmazonBatchClient();
394+
var response = client.ListJobsByConsumableResource(new ListJobsByConsumableResourceRequest
395+
{
396+
ConsumableResource = "myConsumableResource",
397+
Filters = new List<KeyValuesPair> {
398+
new KeyValuesPair {
399+
Name = "CONSUMABLE_RESOURCE_NAME",
400+
Values = new List<string> {
401+
"my*"
402+
}
403+
}
404+
},
405+
MaxResults = 123
406+
});
407+
408+
List<ListJobsByConsumableResourceSummary> jobs = response.Jobs;
409+
410+
#endregion
411+
}
412+
308413
public void BatchListTagsForResource()
309414
{
310415
#region listtagsforresource-example-1591293003710
@@ -478,6 +583,25 @@ public void BatchUpdateComputeEnvironment()
478583
#endregion
479584
}
480585

586+
public void BatchUpdateConsumableResource()
587+
{
588+
#region to-update-a-consumable-resource-1739497761692
589+
590+
var client = new AmazonBatchClient();
591+
var response = client.UpdateConsumableResource(new UpdateConsumableResourceRequest
592+
{
593+
ConsumableResource = "myConsumableResource",
594+
Operation = "ADD",
595+
Quantity = 12
596+
});
597+
598+
string consumableResourceArn = response.ConsumableResourceArn;
599+
string consumableResourceName = response.ConsumableResourceName;
600+
long totalQuantity = response.TotalQuantity;
601+
602+
#endregion
603+
}
604+
481605
public void BatchUpdateJobQueue()
482606
{
483607
#region to-update-a-job-queue-1481154806981

‎docgenerator/AWSSDKDocSamples/SimpleEmailV2.GeneratedSamples.extra.xml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,25 @@
114114
</example>
115115
</value>
116116
</doc>
117+
<doc>
118+
<members>
119+
<member name="M:Amazon.SimpleEmailV2.IAmazonSimpleEmailServiceV2.PutConfigurationSetArchivingOptions(Amazon.SimpleEmailV2.Model.PutConfigurationSetArchivingOptionsRequest)" />
120+
<member name="M:Amazon.SimpleEmailV2.AmazonSimpleEmailServiceV2Client.PutConfigurationSetArchivingOptions(Amazon.SimpleEmailV2.Model.PutConfigurationSetArchivingOptionsRequest)" />
121+
<member name="T:Amazon.SimpleEmailV2.Model.PutConfigurationSetArchivingOptionsRequest" />
122+
<member name="T:Amazon.SimpleEmailV2.Model.PutConfigurationSetArchivingOptionsResponse" />
123+
</members>
124+
<value>
125+
<example>
126+
<para>
127+
This example associates an archive arn with a configuration set.
128+
</para>
129+
<code
130+
title="Used to associate an MailManager archive with a ConfigurationSet."
131+
source=".\AWSSDKDocSamples\SimpleEmailV2\SimpleEmailV2.GeneratedSamples.cs"
132+
region="put-configuration-set-archiving-options-example-1737363685" />
133+
</example>
134+
</value>
135+
</doc>
117136
<doc>
118137
<members>
119138
<member name="M:Amazon.SimpleEmailV2.IAmazonSimpleEmailServiceV2.PutDedicatedIpPoolScalingAttributes(Amazon.SimpleEmailV2.Model.PutDedicatedIpPoolScalingAttributesRequest)" />

0 commit comments

Comments
 (0)