Skip to content

Commit 9b3a51a

Browse files
shepazonshepazon
authored
Merge branch 'main' into swift-lambda-update
2 parents 5c50b05 + 5a1377b commit 9b3a51a

File tree

66 files changed

+11422
-128
lines changed

Some content is hidden

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

66 files changed

+11422
-128
lines changed

‎.doc_gen/cross-content/cross_CognitoFlows_Python_block.xml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "file://zonbook/docbookx.dtd" [
3+
<!ENTITY % phrases-shared SYSTEM "file://AWSShared/common/phrases-shared.ent">
4+
%phrases-shared;
5+
]>
6+
<block>
7+
<para>
8+
Shows web-based demo application that demonstrates &COG; identity
9+
pools authentication flows, allowing users to interactively explore both enhanced and
10+
basic authentication flows with various identity providers.
11+
</para>
12+
<para>For complete source code and instructions on how to set up and run, see the full example
13+
on <ulink
14+
url="https://github.com/awsdocs/aws-doc-sdk-examples/tree/main/python/example_code/cognito/scenarios/identity_pools_example_demo">
15+
GitHub</ulink>.</para>
16+
</block>

‎.doc_gen/metadata/cross_metadata.yaml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1005,3 +1005,18 @@ cross_MonitorDynamoDB:
10051005
services:
10061006
dynamodb:
10071007
cloudwatch:
1008+
cross_CognitoFlows:
1009+
title: Use &COG; identity pools and authentication flows
1010+
title_abbrev: Use &COG; identity pools
1011+
synopsis:
1012+
create a web-based demo application that demonstrates identity pools authentication flows.
1013+
category: Scenarios
1014+
languages:
1015+
Python:
1016+
versions:
1017+
- sdk_version: 3
1018+
github: python/example_code/cognito/scenarios/identity_pools_example_demo
1019+
block_content: cross_CognitoFlows_Python_block.xml
1020+
service_main: cognito-identity-provider
1021+
services:
1022+
cognito-identity-provider:

‎.doc_gen/metadata/opensearch_metadata.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ opensearch_DescribeDomain:
131131
excerpts:
132132
- description:
133133
snippet_tags:
134-
- opensearch.java2.update_domain.main
134+
- opensearch.java2.describe_domain.main
135135
services:
136136
opensearch: {DescribeDomain}
137137
opensearch_UpdateDomainConfig:

‎.doc_gen/metadata/s3-control_metadata.yaml‎

Lines changed: 102 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,15 @@ s3-control_Hello:
1313
- description:
1414
snippet_tags:
1515
- s3control.java2.list_jobs.main
16+
Python:
17+
versions:
18+
- sdk_version: 3
19+
github: python/example_code/s3/scenarios/batch
20+
sdkguide:
21+
excerpts:
22+
- description:
23+
snippet_tags:
24+
- python.example_code.s3control.list_jobs
1625
services:
1726
s3-control: {ListJobs}
1827

@@ -29,15 +38,24 @@ s3-control_CreateJob:
2938
- s3control.java2.create_job.async.main
3039
- description: Create a compliance retention job.
3140
snippet_tags:
32-
- s3control.java2.create_job.compliance.main
41+
- s3control.java2.create_job.compliance.main
3342
- description: Create a legal hold off job.
3443
snippet_tags:
35-
- s3control.java2.create_job.compliance.main
44+
- s3control.java2.create_job.compliance.main
3645
- description: Create a new governance retention job.
3746
snippet_tags:
38-
- s3.java2.create_governance_retemtion.main
47+
- s3.java2.create_governance_retemtion.main
48+
Python:
49+
versions:
50+
- sdk_version: 3
51+
github: python/example_code/s3/scenarios/batch
52+
sdkguide:
53+
excerpts:
54+
- description:
55+
snippet_tags:
56+
- python.example_code.s3control.create_job
3957
services:
40-
s3-control: {CreateJob}
58+
s3-control: {CreateJob}
4159
s3-control_PutJobTagging:
4260
languages:
4361
Java:
@@ -49,8 +67,17 @@ s3-control_PutJobTagging:
4967
- description:
5068
snippet_tags:
5169
- s3control.java2.job.put.tags.main
70+
Python:
71+
versions:
72+
- sdk_version: 3
73+
github: python/example_code/s3/scenarios/batch
74+
sdkguide:
75+
excerpts:
76+
- description:
77+
snippet_tags:
78+
- python.example_code.s3control.put_job_tagging
5279
services:
53-
s3-control: {PutJobTagging}
80+
s3-control: {PutJobTagging}
5481
s3-control_DescribeJob:
5582
languages:
5683
Java:
@@ -62,8 +89,17 @@ s3-control_DescribeJob:
6289
- description:
6390
snippet_tags:
6491
- s3control.java2.describe_job.main
92+
Python:
93+
versions:
94+
- sdk_version: 3
95+
github: python/example_code/s3/scenarios/batch
96+
sdkguide:
97+
excerpts:
98+
- description:
99+
snippet_tags:
100+
- python.example_code.s3control.describe_job
65101
services:
66-
s3-control: {DescribeJob}
102+
s3-control: {DescribeJob}
67103
s3-control_DeleteJobTagging:
68104
languages:
69105
Java:
@@ -75,8 +111,17 @@ s3-control_DeleteJobTagging:
75111
- description:
76112
snippet_tags:
77113
- s3control.java2.del_job_tagging.main
114+
Python:
115+
versions:
116+
- sdk_version: 3
117+
github: python/example_code/s3/scenarios/batch
118+
sdkguide:
119+
excerpts:
120+
- description:
121+
snippet_tags:
122+
- python.example_code.s3control.delete_job_tagging
78123
services:
79-
s3-control: {DeleteJobTagging}
124+
s3-control: {DeleteJobTagging}
80125
s3-control_GetJobTagging:
81126
languages:
82127
Java:
@@ -88,8 +133,17 @@ s3-control_GetJobTagging:
88133
- description:
89134
snippet_tags:
90135
- s3control.java2.get_job_tagging.main
136+
Python:
137+
versions:
138+
- sdk_version: 3
139+
github: python/example_code/s3/scenarios/batch
140+
sdkguide:
141+
excerpts:
142+
- description:
143+
snippet_tags:
144+
- python.example_code.s3control.get_job_tagging
91145
services:
92-
s3-control: {GetJobTagging}
146+
s3-control: {GetJobTagging}
93147
s3-control_UpdateJobStatus:
94148
languages:
95149
Java:
@@ -101,8 +155,17 @@ s3-control_UpdateJobStatus:
101155
- description:
102156
snippet_tags:
103157
- s3control.java2.cancel_job.main
158+
Python:
159+
versions:
160+
- sdk_version: 3
161+
github: python/example_code/s3/scenarios/batch
162+
sdkguide:
163+
excerpts:
164+
- description:
165+
snippet_tags:
166+
- python.example_code.s3control.update_job_status
104167
services:
105-
s3-control: {UpdateJobStatus}
168+
s3-control: {UpdateJobStatus}
106169
s3-control_UpdateJobPriority:
107170
languages:
108171
Java:
@@ -114,8 +177,17 @@ s3-control_UpdateJobPriority:
114177
- description:
115178
snippet_tags:
116179
- s3control.java2.update_job.main
180+
Python:
181+
versions:
182+
- sdk_version: 3
183+
github: python/example_code/s3/scenarios/batch
184+
sdkguide:
185+
excerpts:
186+
- description:
187+
snippet_tags:
188+
- python.example_code.s3control.update_job_priority
117189
services:
118-
s3-control: {UpdateJobPriority}
190+
s3-control: {UpdateJobPriority}
119191
s3-control_Basics:
120192
synopsis: learn core operations for &S3Control;.
121193
category: Basics
@@ -132,5 +204,24 @@ s3-control_Basics:
132204
- description: An action class that wraps operations.
133205
snippet_tags:
134206
- s3control.java2.job.actions.main
207+
Python:
208+
versions:
209+
- sdk_version: 3
210+
github: python/example_code/s3/scenarios/batch
211+
sdkguide:
212+
excerpts:
213+
- description: Learn S3 Batch Basics Scenario.
214+
snippet_tags:
215+
- python.example_code.s3control.helper.S3BatchScenario
135216
services:
136-
s3-control: {CreateJob, DeleteJobTagging, DescribeJob, GetJobTagging, ListJobs, PutJobTagging, UpdateJobPriority, UpdateJobStatus}
217+
s3-control:
218+
{
219+
CreateJob,
220+
DeleteJobTagging,
221+
DescribeJob,
222+
GetJobTagging,
223+
ListJobs,
224+
PutJobTagging,
225+
UpdateJobPriority,
226+
UpdateJobStatus,
227+
}

‎cpp/example_code/medical-imaging/start_dicom_import_job.cpp‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
\param outputBucketName: The name of the S3 bucket for the output.
3030
\param outputDirectory: The directory in the S3 bucket to store the output.
3131
\param roleArn: The ARN of the IAM role with permissions for the import.
32+
\param importConfigJson: The import configuration JSON string (optional).
3233
\param importJobId: A string to receive the import job ID.
3334
\param clientConfig: Aws client configuration.
3435
\return bool: Function succeeded.
@@ -37,6 +38,7 @@ bool AwsDoc::Medical_Imaging::startDICOMImportJob(
3738
const Aws::String &dataStoreID, const Aws::String &inputBucketName,
3839
const Aws::String &inputDirectory, const Aws::String &outputBucketName,
3940
const Aws::String &outputDirectory, const Aws::String &roleArn,
41+
const Aws::String &importConfigJson,
4042
Aws::String &importJobId,
4143
const Aws::Client::ClientConfiguration &clientConfig) {
4244
Aws::MedicalImaging::MedicalImagingClient medicalImagingClient(clientConfig);
@@ -48,8 +50,20 @@ bool AwsDoc::Medical_Imaging::startDICOMImportJob(
4850
startDICOMImportJobRequest.SetInputS3Uri(inputURI);
4951
startDICOMImportJobRequest.SetOutputS3Uri(outputURI);
5052

51-
Aws::MedicalImaging::Model::StartDICOMImportJobOutcome startDICOMImportJobOutcome = medicalImagingClient.StartDICOMImportJob(
52-
startDICOMImportJobRequest);
53+
if (!importConfigJson.empty()) {
54+
Aws::Utils::Json::JsonValue jsonValue(importConfigJson);
55+
if (jsonValue.WasParseSuccessful()) {
56+
startDICOMImportJobRequest.SetImportConfiguration(
57+
Aws::MedicalImaging::Model::ImportConfiguration(jsonValue));
58+
}
59+
else {
60+
std::cerr << "Failed to parse import configuration JSON" << std::endl;
61+
return false;
62+
}
63+
}
64+
65+
Aws::MedicalImaging::Model::StartDICOMImportJobOutcome startDICOMImportJobOutcome =
66+
medicalImagingClient.StartDICOMImportJob(startDICOMImportJobRequest);
5367

5468
if (startDICOMImportJobOutcome.IsSuccess()) {
5569
importJobId = startDICOMImportJobOutcome.GetResult().GetJobId();

‎javascriptv3/example_code/medical-imaging/actions/start-dicom-import-job.js‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,25 @@ import { medicalImagingClient } from "../libs/medicalImagingClient.js";
1313
* @param {string} dataAccessRoleArn - The Amazon Resource Name (ARN) of the role that grants permission.
1414
* @param {string} inputS3Uri - The URI of the S3 bucket containing the input files.
1515
* @param {string} outputS3Uri - The URI of the S3 bucket where the output files are stored.
16+
* @param {Object} importConfiguration - The configuration for digital pathology import.
1617
*/
1718
export const startDicomImportJob = async (
1819
jobName = "test-1",
1920
datastoreId = "12345678901234567890123456789012",
2021
dataAccessRoleArn = "arn:aws:iam::xxxxxxxxxxxx:role/ImportJobDataAccessRole",
2122
inputS3Uri = "s3://medical-imaging-dicom-input/dicom_input/",
2223
outputS3Uri = "s3://medical-imaging-output/job_output/",
24+
importConfiguration = {
25+
digitalPathologyImportConfiguration: {
26+
qualityFactor: 85,
27+
fileMetadataMappings: [
28+
{
29+
imageFilePath: "image.svs",
30+
metadataFilePath: "metadata.json",
31+
},
32+
],
33+
},
34+
},
2335
) => {
2436
const response = await medicalImagingClient.send(
2537
new StartDICOMImportJobCommand({
@@ -28,6 +40,7 @@ export const startDicomImportJob = async (
2840
dataAccessRoleArn: dataAccessRoleArn,
2941
inputS3Uri: inputS3Uri,
3042
outputS3Uri: outputS3Uri,
43+
importConfiguration: importConfiguration,
3144
}),
3245
);
3346
console.log(response);

‎javav2/example_code/dynamodb/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,4 +160,4 @@ in the `javav2` folder.
160160

161161
Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
162162

163-
SPDX-License-Identifier: Apache-2.0
163+
SPDX-License-Identifier: Apache-2.0

‎javav2/example_code/dynamodb/adaptive_retry_docs/README.md‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
# AWS Java SDK AdaptiveRetryStrategy Guide
2+
3+
This guide provides comprehensive documentation and examples for implementing AWS Java SDK's `AdaptiveRetryStrategy` with AWS service clients.
4+
5+
> **⚠️ Important**: AdaptiveRetryStrategy is designed for specialized use cases with high resource constraints and single-resource clients. AWS recommends StandardRetryStrategy for most applications.
6+
7+
## Documentation Structure
8+
9+
| Document | Purpose | When to Use |
10+
|----------|---------|-------------|
11+
| **[Concepts](concepts.md)** | Conceptual foundation and theory | Understanding when/why to use AdaptiveRetryStrategy |
12+
| **[Migration Guide](migration-guide.md)** | Step-by-step migration instructions | Converting from older retry policies |
13+
| **[Configuration Reference](configuration-reference.md)** | Complete parameter reference | Fine-tuning and optimization |
14+
15+
## Getting Started
16+
17+
1. **Quick Start**: Check the `examples/` directory for ready-to-use code
18+
2. **Learn Concepts**: Read [Concepts](concepts.md) to understand when AdaptiveRetryStrategy is appropriate
19+
3. **Migration**: Use [Migration Guide](migration-guide.md) if converting existing code
20+
4. **Fine-tuning**: Consult [Configuration Reference](configuration-reference.md) for parameter optimization
21+
22+
## Documentation Sources
23+
24+
This guide is based on official AWS SDK for Java 2.x documentation and follows AWS best practices as documented in:
25+
26+
- [AWS SDK for Java 2.x Developer Guide - Configure retry behavior](https://docs.aws.amazon.com/sdk-for-java/latest/developer-guide/retry-strategy.html)
27+
- [AWS SDK for Java 2.x API Reference](https://sdk.amazonaws.com/java/api/latest/software/amazon/awssdk/retries/package-summary.html)
28+
29+
All examples and recommendations align with AWS's official guidance on retry strategy implementation.

0 commit comments

Comments
 (0)