Skip to content

Commit 37ae362

Browse files
rlhagermrlhagerm
authored
Merge branch 'main' into control-tower-v2
2 parents 0e0f770 + 87720b2 commit 37ae362

File tree

45 files changed

+3035
-59
lines changed

Some content is hidden

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

45 files changed

+3035
-59
lines changed

‎.doc_gen/metadata/cognito-identity-provider_metadata.yaml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -429,6 +429,14 @@ cognito-identity-provider_ListUsers:
429429
- description:
430430
snippet_tags:
431431
- javascript.v3.cognito-idp.actions.ListUsers
432+
Swift:
433+
versions:
434+
- sdk_version: 1
435+
github: swift/example_code/cognito-identity-provider
436+
excerpts:
437+
- description:
438+
snippet_tags:
439+
- swift.cognito-identity-provider.ListUsers
432440
services:
433441
cognito-identity-provider: {ListUsers}
434442
cognito-identity-provider_AdminInitiateAuth:

‎.doc_gen/metadata/neptune_metadata.yaml‎

Lines changed: 136 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,14 @@ neptune_Hello:
55
synopsis: get started using &neptune;.
66
category: Hello
77
languages:
8+
Python:
9+
versions:
10+
- sdk_version: 3
11+
github: python/example_code/neptune
12+
excerpts:
13+
- description:
14+
snippet_tags:
15+
- neptune.python.hello.main
816
Java:
917
versions:
1018
- sdk_version: 2
@@ -18,6 +26,14 @@ neptune_Hello:
1826
neptune: {DescribeDBClustersPaginator}
1927
neptune_ExecuteQuery:
2028
languages:
29+
Python:
30+
versions:
31+
- sdk_version: 3
32+
github: python/example_code/neptune
33+
excerpts:
34+
- description:
35+
snippet_tags:
36+
- neptune.python.graph.execute.main
2137
Java:
2238
versions:
2339
- sdk_version: 2
@@ -31,6 +47,14 @@ neptune_ExecuteQuery:
3147
neptune: {ExecuteQuery}
3248
neptune_CreateGraph:
3349
languages:
50+
Python:
51+
versions:
52+
- sdk_version: 3
53+
github: python/example_code/neptune
54+
excerpts:
55+
- description:
56+
snippet_tags:
57+
- neptune.python.graph.create.main
3458
Java:
3559
versions:
3660
- sdk_version: 2
@@ -44,6 +68,14 @@ neptune_CreateGraph:
4468
neptune: {CreateGraph}
4569
neptune_ExecuteOpenCypherExplainQuery:
4670
languages:
71+
Python:
72+
versions:
73+
- sdk_version: 3
74+
github: python/example_code/neptune
75+
excerpts:
76+
- description:
77+
snippet_tags:
78+
- neptune.python.data.query.opencypher.main
4779
Java:
4880
versions:
4981
- sdk_version: 2
@@ -57,6 +89,14 @@ neptune_ExecuteOpenCypherExplainQuery:
5789
neptune: {ExecuteOpenCypherExplainQuery}
5890
neptune_ExecuteGremlinProfileQuery:
5991
languages:
92+
Python:
93+
versions:
94+
- sdk_version: 3
95+
github: python/example_code/neptune
96+
excerpts:
97+
- description:
98+
snippet_tags:
99+
- neptune.python.data.query.gremlin.main
60100
Java:
61101
versions:
62102
- sdk_version: 2
@@ -70,6 +110,14 @@ neptune_ExecuteGremlinProfileQuery:
70110
neptune: {ExecuteGremlinProfileQuery}
71111
neptune_ExecuteGremlinQuery:
72112
languages:
113+
Python:
114+
versions:
115+
- sdk_version: 3
116+
github: python/example_code/neptune
117+
excerpts:
118+
- description:
119+
snippet_tags:
120+
- neptune.python.data.query.gremlin.profile.main
73121
Java:
74122
versions:
75123
- sdk_version: 2
@@ -83,6 +131,14 @@ neptune_ExecuteGremlinQuery:
83131
neptune: {ExecuteGremlinQuery}
84132
neptune_DeleteDBSubnetGroup:
85133
languages:
134+
Python:
135+
versions:
136+
- sdk_version: 3
137+
github: python/example_code/neptune
138+
excerpts:
139+
- description:
140+
snippet_tags:
141+
- neptune.python.delete.subnet.group.main
86142
Java:
87143
versions:
88144
- sdk_version: 2
@@ -96,6 +152,14 @@ neptune_DeleteDBSubnetGroup:
96152
neptune: {DeleteDBSubnetGroup}
97153
neptune_DeleteDBCluster:
98154
languages:
155+
Python:
156+
versions:
157+
- sdk_version: 3
158+
github: python/example_code/neptune
159+
excerpts:
160+
- description:
161+
snippet_tags:
162+
- neptune.python.delete.cluster.main
99163
Java:
100164
versions:
101165
- sdk_version: 2
@@ -109,6 +173,14 @@ neptune_DeleteDBCluster:
109173
neptune: {DeleteDBCluster}
110174
neptune_DeleteDBInstance:
111175
languages:
176+
Python:
177+
versions:
178+
- sdk_version: 3
179+
github: python/example_code/neptune
180+
excerpts:
181+
- description:
182+
snippet_tags:
183+
- neptune.python.delete.instance.main
112184
Java:
113185
versions:
114186
- sdk_version: 2
@@ -122,6 +194,14 @@ neptune_DeleteDBInstance:
122194
neptune: {DeleteDBInstance}
123195
neptune_StartDBCluster:
124196
languages:
197+
Python:
198+
versions:
199+
- sdk_version: 3
200+
github: python/example_code/neptune
201+
excerpts:
202+
- description:
203+
snippet_tags:
204+
- neptune.python.start.cluster.main
125205
Java:
126206
versions:
127207
- sdk_version: 2
@@ -135,6 +215,14 @@ neptune_StartDBCluster:
135215
neptune: {StartDBCluster}
136216
neptune_StopDBCluster:
137217
languages:
218+
Python:
219+
versions:
220+
- sdk_version: 3
221+
github: python/example_code/neptune
222+
excerpts:
223+
- description:
224+
snippet_tags:
225+
- neptune.python.stop.cluster.main
138226
Java:
139227
versions:
140228
- sdk_version: 2
@@ -148,6 +236,14 @@ neptune_StopDBCluster:
148236
neptune: {StopDBCluster}
149237
neptune_DescribeDBClusters:
150238
languages:
239+
Python:
240+
versions:
241+
- sdk_version: 3
242+
github: python/example_code/neptune
243+
excerpts:
244+
- description:
245+
snippet_tags:
246+
- neptune.python.describe.cluster.main
151247
Java:
152248
versions:
153249
- sdk_version: 2
@@ -161,6 +257,14 @@ neptune_DescribeDBClusters:
161257
neptune: {DescribeDBClusters}
162258
neptune_DescribeDBInstances:
163259
languages:
260+
Python:
261+
versions:
262+
- sdk_version: 3
263+
github: python/example_code/neptune
264+
excerpts:
265+
- description:
266+
snippet_tags:
267+
- neptune.python.describe.dbinstance.main
164268
Java:
165269
versions:
166270
- sdk_version: 2
@@ -174,6 +278,14 @@ neptune_DescribeDBInstances:
174278
neptune: {DescribeDBInstances}
175279
neptune_CreateDBInstance:
176280
languages:
281+
Python:
282+
versions:
283+
- sdk_version: 3
284+
github: python/example_code/neptune
285+
excerpts:
286+
- description:
287+
snippet_tags:
288+
- neptune.python.create.dbinstance.main
177289
Java:
178290
versions:
179291
- sdk_version: 2
@@ -187,6 +299,14 @@ neptune_CreateDBInstance:
187299
neptune: {CreateDBInstance}
188300
neptune_CreateDBCluster:
189301
languages:
302+
Python:
303+
versions:
304+
- sdk_version: 3
305+
github: python/example_code/neptune
306+
excerpts:
307+
- description:
308+
snippet_tags:
309+
- neptune.python.create.cluster.main
190310
Java:
191311
versions:
192312
- sdk_version: 2
@@ -200,6 +320,14 @@ neptune_CreateDBCluster:
200320
neptune: {CreateDBCluster}
201321
neptune_CreateDBSubnetGroup:
202322
languages:
323+
Python:
324+
versions:
325+
- sdk_version: 3
326+
github: python/example_code/neptune
327+
excerpts:
328+
- description:
329+
snippet_tags:
330+
- neptune.python.create.subnet.main
203331
Java:
204332
versions:
205333
- sdk_version: 2
@@ -223,6 +351,14 @@ neptune_Scenario:
223351
- Delete the &neptune; Assets.
224352
category: Basics
225353
languages:
354+
Python:
355+
versions:
356+
- sdk_version: 3
357+
github: python/example_code/neptune
358+
excerpts:
359+
- description:
360+
snippet_tags:
361+
- neptune.python.scenario.main
226362
Java:
227363
versions:
228364
- sdk_version: 2

‎.github/workflows/validate-doc-metadata.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- name: checkout repo content
1717
uses: actions/checkout@v4
1818
- name: validate metadata
19-
uses: awsdocs/aws-doc-sdk-examples-tools@2025.21.1
19+
uses: awsdocs/aws-doc-sdk-examples-tools@2025.24.1
2020
with:
2121
doc_gen_only: "False"
2222
strict_titles: "True"

‎.tools/readmes/requirements_freeze.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,5 @@ shellingham==1.5.4
2828
typer==0.15.1
2929
types-PyYAML==6.0.12.12
3030
typing_extensions==4.12.2
31-
urllib3==2.3.0
31+
urllib3==2.5.0
3232
yamale==4.0.4

‎.tools/test/stacks/plugin/typescript/package-lock.json‎

Lines changed: 4 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎CONTRIBUTING.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ without needing to create a fork.
4747
as [DRY](https://en.wikipedia.org/wiki/Don%27t_repeat_yourself) and [SOLID](https://en.wikipedia.org/wiki/SOLID) where possible.
4848
2. Carefully read the pull request template and follow it closely.
4949
3. Don't include AWS account identifiers or secret keys in your examples.
50+
4. To conform to licensing expectation, please follow instructions on our [Licensing guidelines wiki page](https://github.com/awsdocs/aws-doc-sdk-examples/wiki/Licensing-guidelines).
5051

5152
---
5253

‎README.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,3 +100,8 @@ Copyright © Amazon Web Services, Inc. or its affiliates. All rights reserved.
100100
Except where otherwise noted, all examples in this collection are licensed under the [Apache
101101
license, version 2.0](https://www.apache.org/licenses/LICENSE-2.0) (the "License"). The full
102102
license text is provided in the `LICENSE` file accompanying this repository.
103+
104+
Please include the following licensing text as a comment at top of all possible files:
105+
106+
*Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
107+
SPDX-License-Identifier: Apache-2.0*

‎gov2/workflows/user_pools_and_lambda_triggers/.cdk/package-lock.json‎

Lines changed: 7 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎python/example_code/bedrock-agent-runtime/requirements.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ pytest-asyncio==0.21.1
1010
python-dateutil==2.8.2
1111
s3transfer==0.8.2
1212
six==1.16.0
13-
urllib3==2.0.7
13+
urllib3==2.5.0

0 commit comments

Comments
 (0)