Skip to content

Commit f3e5a56

Browse files
rlhagermrlhagerm
committed
Merge branch 'python-dynamodb-updates' of github.com:rlhagerm/aws-doc-sdk-examples into python-dynamodb-updates
2 parents 773c448 + e3a74f6 commit f3e5a56

File tree

13 files changed

+124
-121
lines changed

13 files changed

+124
-121
lines changed

‎.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.07.0
19+
uses: awsdocs/aws-doc-sdk-examples-tools@2025.08.0
2020
with:
2121
doc_gen_only: "False"
2222
strict_titles: "True"

‎dotnetv3/DotNetV3Examples.sln‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -839,6 +839,22 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "S3ObjectLockTests", "S3\sce
839839
EndProject
840840
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConverseToolScenario", "Bedrock-runtime\Scenarios\ConverseToolScenario\ConverseToolScenario.csproj", "{83ED7BBE-5C9A-47AC-805B-351270069570}"
841841
EndProject
842+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DynamoDB_Actions", "DynamoDB_Actions", "{72466F30-810F-4963-B748-5154A6C49926}"
843+
EndProject
844+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DynamoDB_Actions", "dynamodb\scenarios\DynamoDB_Basics\DynamoDB_Actions\DynamoDB_Actions.csproj", "{B8843CE1-23AF-4E54-A916-C3FD94B4FF9A}"
845+
EndProject
846+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AmazonNova", "AmazonNova", "{9FB5136B-F426-454C-B32D-855E07DBC0FE}"
847+
EndProject
848+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AmazonNovaText", "AmazonNovaText", "{6EA5F10D-C016-4AB0-B551-099DBFD74F95}"
849+
EndProject
850+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConverseStream", "Bedrock-runtime\Models\AmazonNova\AmazonNovaText\ConverseStream\ConverseStream.csproj", "{C0AC14E2-54E9-426E-8A4A-7B64946A4715}"
851+
EndProject
852+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Converse", "Bedrock-runtime\Models\AmazonNova\AmazonNovaText\Converse\Converse.csproj", "{FD901D0E-B970-42A3-B6E2-219BDA882F19}"
853+
EndProject
854+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AmazonNovaCanvas", "AmazonNovaCanvas", "{CDA2FA21-36E1-4847-A5A8-AF921C4BBBD7}"
855+
EndProject
856+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "InvokeModel", "Bedrock-runtime\Models\AmazonNova\AmazonNovaCanvas\InvokeModel\InvokeModel.csproj", "{1D2CF12A-F46E-4293-ABB3-2FD70D84328F}"
857+
EndProject
842858
Global
843859
GlobalSection(SolutionConfigurationPlatforms) = preSolution
844860
Debug|Any CPU = Debug|Any CPU
@@ -1921,6 +1937,22 @@ Global
19211937
{83ED7BBE-5C9A-47AC-805B-351270069570}.Debug|Any CPU.Build.0 = Debug|Any CPU
19221938
{83ED7BBE-5C9A-47AC-805B-351270069570}.Release|Any CPU.ActiveCfg = Release|Any CPU
19231939
{83ED7BBE-5C9A-47AC-805B-351270069570}.Release|Any CPU.Build.0 = Release|Any CPU
1940+
{B8843CE1-23AF-4E54-A916-C3FD94B4FF9A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
1941+
{B8843CE1-23AF-4E54-A916-C3FD94B4FF9A}.Debug|Any CPU.Build.0 = Debug|Any CPU
1942+
{B8843CE1-23AF-4E54-A916-C3FD94B4FF9A}.Release|Any CPU.ActiveCfg = Release|Any CPU
1943+
{B8843CE1-23AF-4E54-A916-C3FD94B4FF9A}.Release|Any CPU.Build.0 = Release|Any CPU
1944+
{C0AC14E2-54E9-426E-8A4A-7B64946A4715}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
1945+
{C0AC14E2-54E9-426E-8A4A-7B64946A4715}.Debug|Any CPU.Build.0 = Debug|Any CPU
1946+
{C0AC14E2-54E9-426E-8A4A-7B64946A4715}.Release|Any CPU.ActiveCfg = Release|Any CPU
1947+
{C0AC14E2-54E9-426E-8A4A-7B64946A4715}.Release|Any CPU.Build.0 = Release|Any CPU
1948+
{FD901D0E-B970-42A3-B6E2-219BDA882F19}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
1949+
{FD901D0E-B970-42A3-B6E2-219BDA882F19}.Debug|Any CPU.Build.0 = Debug|Any CPU
1950+
{FD901D0E-B970-42A3-B6E2-219BDA882F19}.Release|Any CPU.ActiveCfg = Release|Any CPU
1951+
{FD901D0E-B970-42A3-B6E2-219BDA882F19}.Release|Any CPU.Build.0 = Release|Any CPU
1952+
{1D2CF12A-F46E-4293-ABB3-2FD70D84328F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
1953+
{1D2CF12A-F46E-4293-ABB3-2FD70D84328F}.Debug|Any CPU.Build.0 = Debug|Any CPU
1954+
{1D2CF12A-F46E-4293-ABB3-2FD70D84328F}.Release|Any CPU.ActiveCfg = Release|Any CPU
1955+
{1D2CF12A-F46E-4293-ABB3-2FD70D84328F}.Release|Any CPU.Build.0 = Release|Any CPU
19241956
EndGlobalSection
19251957
GlobalSection(SolutionProperties) = preSolution
19261958
HideSolutionNode = FALSE
@@ -2303,6 +2335,14 @@ Global
23032335
{93588ED1-A248-4F6C-85A4-27E9E65D8AC7} = {7EC94891-9A5F-47EF-9C97-8A280754525C}
23042336
{BCCFBED0-E800-46C5-975B-7D404486F00F} = {7EC94891-9A5F-47EF-9C97-8A280754525C}
23052337
{83ED7BBE-5C9A-47AC-805B-351270069570} = {BA23BB28-EC63-4330-8CA7-DEB1B6489580}
2338+
{72466F30-810F-4963-B748-5154A6C49926} = {3F9C4507-5BD7-4AA5-9EE0-538DE08FAF43}
2339+
{B8843CE1-23AF-4E54-A916-C3FD94B4FF9A} = {72466F30-810F-4963-B748-5154A6C49926}
2340+
{9FB5136B-F426-454C-B32D-855E07DBC0FE} = {6520EB28-F7B4-4581-B3D8-A06E9303B16B}
2341+
{6EA5F10D-C016-4AB0-B551-099DBFD74F95} = {9FB5136B-F426-454C-B32D-855E07DBC0FE}
2342+
{C0AC14E2-54E9-426E-8A4A-7B64946A4715} = {6EA5F10D-C016-4AB0-B551-099DBFD74F95}
2343+
{FD901D0E-B970-42A3-B6E2-219BDA882F19} = {6EA5F10D-C016-4AB0-B551-099DBFD74F95}
2344+
{CDA2FA21-36E1-4847-A5A8-AF921C4BBBD7} = {9FB5136B-F426-454C-B32D-855E07DBC0FE}
2345+
{1D2CF12A-F46E-4293-ABB3-2FD70D84328F} = {CDA2FA21-36E1-4847-A5A8-AF921C4BBBD7}
23062346
EndGlobalSection
23072347
GlobalSection(ExtensibilityGlobals) = postSolution
23082348
SolutionGuid = {08502818-E8E1-4A91-A51C-4C8C8D4FF9CA}

‎dotnetv3/dynamodb/CreateTablesLoadDataExample/CreateTablesLoadDataExample/CreateTablesLoadData.cs‎

Lines changed: 50 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -71,26 +71,22 @@ public static async Task<DescribeTableResponse> CreateTableProductCatalog(IAmazo
7171
{
7272
TableName = tableName,
7373
AttributeDefinitions = new List<AttributeDefinition>()
74-
{
75-
new AttributeDefinition
76-
{
77-
AttributeName = "Id",
78-
AttributeType = ScalarAttributeType.N,
79-
},
80-
},
74+
{
75+
new AttributeDefinition
76+
{
77+
AttributeName = "Id",
78+
AttributeType = ScalarAttributeType.N,
79+
},
80+
},
8181
KeySchema = new List<KeySchemaElement>()
82-
{
83-
new KeySchemaElement
84-
{
85-
AttributeName = "Id",
86-
KeyType = KeyType.HASH,
87-
},
88-
},
89-
ProvisionedThroughput = new ProvisionedThroughput
82+
{
83+
new KeySchemaElement
9084
{
91-
ReadCapacityUnits = 10,
92-
WriteCapacityUnits = 5,
85+
AttributeName = "Id",
86+
KeyType = KeyType.HASH,
9387
},
88+
},
89+
BillingMode = BillingMode.PAY_PER_REQUEST,
9490
});
9591

9692
var result = await WaitTillTableCreated(client, tableName, response);
@@ -112,26 +108,22 @@ public static async Task<DescribeTableResponse> CreateTableForum(IAmazonDynamoDB
112108
{
113109
TableName = tableName,
114110
AttributeDefinitions = new List<AttributeDefinition>()
115-
{
116-
new AttributeDefinition
117-
{
118-
AttributeName = "Name",
119-
AttributeType = ScalarAttributeType.S,
120-
},
121-
},
111+
{
112+
new AttributeDefinition
113+
{
114+
AttributeName = "Name",
115+
AttributeType = ScalarAttributeType.S,
116+
},
117+
},
122118
KeySchema = new List<KeySchemaElement>()
123-
{
124-
new KeySchemaElement
125-
{
126-
AttributeName = "Name",
127-
KeyType = KeyType.HASH,
128-
},
129-
},
130-
ProvisionedThroughput = new ProvisionedThroughput
119+
{
120+
new KeySchemaElement
131121
{
132-
ReadCapacityUnits = 10,
133-
WriteCapacityUnits = 5,
122+
AttributeName = "Name",
123+
KeyType = KeyType.HASH,
134124
},
125+
},
126+
BillingMode = BillingMode.PAY_PER_REQUEST,
135127
});
136128

137129
var result = await WaitTillTableCreated(client, tableName, response);
@@ -154,36 +146,32 @@ public static async Task<DescribeTableResponse> CreateTableThread(IAmazonDynamoD
154146
{
155147
TableName = tableName,
156148
AttributeDefinitions = new List<AttributeDefinition>()
157-
{
158-
new AttributeDefinition
159-
{
160-
AttributeName = "ForumName", // Hash attribute.
161-
AttributeType = ScalarAttributeType.S,
162-
},
163-
new AttributeDefinition
164-
{
165-
AttributeName = "Subject",
166-
AttributeType = ScalarAttributeType.S,
167-
},
168-
},
149+
{
150+
new AttributeDefinition
151+
{
152+
AttributeName = "ForumName", // Hash attribute.
153+
AttributeType = ScalarAttributeType.S,
154+
},
155+
new AttributeDefinition
156+
{
157+
AttributeName = "Subject",
158+
AttributeType = ScalarAttributeType.S,
159+
},
160+
},
169161
KeySchema = new List<KeySchemaElement>()
170-
{
171-
new KeySchemaElement
172-
{
173-
AttributeName = "ForumName", // Hash attribute
174-
KeyType = KeyType.HASH,
175-
},
176-
new KeySchemaElement
177-
{
178-
AttributeName = "Subject", // Range attribute
179-
KeyType = KeyType.RANGE,
180-
},
181-
},
182-
ProvisionedThroughput = new ProvisionedThroughput
162+
{
163+
new KeySchemaElement
164+
{
165+
AttributeName = "ForumName", // Hash attribute
166+
KeyType = KeyType.HASH,
167+
},
168+
new KeySchemaElement
183169
{
184-
ReadCapacityUnits = 10,
185-
WriteCapacityUnits = 5,
170+
AttributeName = "Subject", // Range attribute
171+
KeyType = KeyType.RANGE,
186172
},
173+
},
174+
BillingMode = BillingMode.PAY_PER_REQUEST,
187175
});
188176

189177
var result = await WaitTillTableCreated(client, tableName, response);
@@ -256,11 +244,7 @@ public static async Task<DescribeTableResponse> CreateTableReply(IAmazonDynamoDB
256244
},
257245
},
258246
},
259-
ProvisionedThroughput = new ProvisionedThroughput
260-
{
261-
ReadCapacityUnits = 10,
262-
WriteCapacityUnits = 5,
263-
},
247+
BillingMode = BillingMode.PAY_PER_REQUEST,
264248
});
265249

266250
var result = await WaitTillTableCreated(client, tableName, response);

‎dotnetv3/dynamodb/CreateTablesLoadDataExample/CreateTablesLoadDataExample/CreateTablesLoadDataExample.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="AWSSDK.Core" Version="3.7.2.10" />
10-
<PackageReference Include="AWSSDK.DynamoDBv2" Version="3.7.0.59" />
9+
<PackageReference Include="AWSSDK.Core" Version="3.7.402.7" />
10+
<PackageReference Include="AWSSDK.DynamoDBv2" Version="3.7.405.28" />
1111
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
1212
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1313
<PrivateAssets>all</PrivateAssets>

‎dotnetv3/dynamodb/README.md‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -47,18 +47,18 @@ Code excerpts that show you how to call individual service functions.
4747

4848
- [BatchExecuteStatement](scenarios/PartiQL_Batch_Scenario/PartiQL_Batch_Scenario/PartiQLBatchMethods.cs#L10)
4949
- [BatchGetItem](low-level-api/LowLevelBatchGet/LowLevelBatchGet.cs#L4)
50-
- [BatchWriteItem](scenarios/DynamoDB_Basics/DynamoDB_Actions/DynamoDbMethods.cs#L202)
50+
- [BatchWriteItem](scenarios/DynamoDB_Basics/DynamoDB_Actions/DynamoDbMethods.cs#L198)
5151
- [CreateTable](scenarios/DynamoDB_Basics/DynamoDB_Actions/DynamoDbMethods.cs#L14)
52-
- [DeleteItem](scenarios/DynamoDB_Basics/DynamoDB_Actions/DynamoDbMethods.cs#L262)
53-
- [DeleteTable](scenarios/DynamoDB_Basics/DynamoDB_Actions/DynamoDbMethods.cs#L391)
54-
- [DescribeTable](low-level-api/LowLevelTableExample/LowLevelTableExample.cs#L126)
52+
- [DeleteItem](scenarios/DynamoDB_Basics/DynamoDB_Actions/DynamoDbMethods.cs#L258)
53+
- [DeleteTable](scenarios/DynamoDB_Basics/DynamoDB_Actions/DynamoDbMethods.cs#L387)
54+
- [DescribeTable](low-level-api/LowLevelTableExample/LowLevelTableExample.cs#L120)
5555
- [ExecuteStatement](scenarios/PartiQL_Basics_Scenario/PartiQL_Basics_Scenario/PartiQLMethods.cs#L163)
56-
- [GetItem](scenarios/DynamoDB_Basics/DynamoDB_Actions/DynamoDbMethods.cs#L171)
57-
- [ListTables](low-level-api/LowLevelTableExample/LowLevelTableExample.cs#L102)
58-
- [PutItem](scenarios/DynamoDB_Basics/DynamoDB_Actions/DynamoDbMethods.cs#L89)
59-
- [Query](scenarios/DynamoDB_Basics/DynamoDB_Actions/DynamoDbMethods.cs#L297)
60-
- [Scan](scenarios/DynamoDB_Basics/DynamoDB_Actions/DynamoDbMethods.cs#L350)
61-
- [UpdateItem](scenarios/DynamoDB_Basics/DynamoDB_Actions/DynamoDbMethods.cs#L119)
56+
- [GetItem](scenarios/DynamoDB_Basics/DynamoDB_Actions/DynamoDbMethods.cs#L167)
57+
- [ListTables](low-level-api/LowLevelTableExample/LowLevelTableExample.cs#L96)
58+
- [PutItem](scenarios/DynamoDB_Basics/DynamoDB_Actions/DynamoDbMethods.cs#L85)
59+
- [Query](scenarios/DynamoDB_Basics/DynamoDB_Actions/DynamoDbMethods.cs#L293)
60+
- [Scan](scenarios/DynamoDB_Basics/DynamoDB_Actions/DynamoDbMethods.cs#L346)
61+
- [UpdateItem](scenarios/DynamoDB_Basics/DynamoDB_Actions/DynamoDbMethods.cs#L115)
6262

6363
### Scenarios
6464

@@ -240,4 +240,4 @@ in the `dotnetv3` folder.
240240

241241
Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
242242

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

‎dotnetv3/dynamodb/low-level-api/LowLevelTableExample/LowLevelTableExample.cs‎

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -80,18 +80,12 @@ private static async Task CreateExampleTable()
8080
KeyType = KeyType.RANGE //Sort key
8181
}
8282
},
83-
ProvisionedThroughput = new ProvisionedThroughput
84-
{
85-
ReadCapacityUnits = 5,
86-
WriteCapacityUnits = 6
87-
},
88-
TableName = ExampleTableName
83+
TableName = ExampleTableName,
84+
BillingMode = BillingMode.PAY_PER_REQUEST,
8985
});
9086

9187
var tableDescription = response.TableDescription;
92-
Console.WriteLine($"{tableDescription.TableName}: {tableDescription.TableStatus} \t " +
93-
$"ReadsPerSec: {tableDescription.ProvisionedThroughput.ReadCapacityUnits} \t " +
94-
$"WritesPerSec: {tableDescription.ProvisionedThroughput.WriteCapacityUnits}");
88+
Console.WriteLine($"{tableDescription.TableName}: {tableDescription.TableStatus}");
9589

9690
Console.WriteLine($"{ExampleTableName} - {tableDescription.TableStatus}");
9791

@@ -136,21 +130,19 @@ private static async Task GetTableInformation()
136130
var table = response.Table;
137131
Console.WriteLine($"Name: {table.TableName}");
138132
Console.WriteLine($"# of items: {table.ItemCount}");
139-
Console.WriteLine($"Provision Throughput (reads/sec): " +
140-
$"{table.ProvisionedThroughput.ReadCapacityUnits}");
141-
Console.WriteLine($"Provision Throughput (writes/sec): " +
142-
$"{table.ProvisionedThroughput.WriteCapacityUnits}");
133+
143134
}
144135
// snippet-end:[dynamodb.dotnetv3.DescribeTableExample]
145136

146137
// snippet-start:[dynamodb.dotnetv3.UpdateExampleTable]
147138
private static async Task UpdateExampleTable()
148139
{
149-
Console.WriteLine("\n*** Updating table ***");
140+
Console.WriteLine("\n*** Updating table billing mode ***");
150141

151142
await Client.UpdateTableAsync(new UpdateTableRequest
152143
{
153144
TableName = ExampleTableName,
145+
BillingMode = BillingMode.PROVISIONED,
154146
ProvisionedThroughput = new ProvisionedThroughput
155147
{
156148
ReadCapacityUnits = 6,

‎dotnetv3/dynamodb/scenarios/DynamoDB_Basics/DynamoDB_Actions/DynamoDbMethods.cs‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,7 @@ public static async Task<bool> CreateMovieTableAsync(AmazonDynamoDBClient client
5151
KeyType = KeyType.RANGE,
5252
},
5353
},
54-
ProvisionedThroughput = new ProvisionedThroughput
55-
{
56-
ReadCapacityUnits = 5,
57-
WriteCapacityUnits = 5,
58-
},
54+
BillingMode = BillingMode.PAY_PER_REQUEST,
5955
});
6056

6157
// Wait until the table is ACTIVE and then report success.

‎dotnetv3/dynamodb/scenarios/PartiQL_Basics_Scenario/PartiQL_Basics_Scenario/DynamoDBMethods.cs‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,7 @@ public static async Task<bool> CreateMovieTableAsync(string tableName)
4949
KeyType = KeyType.RANGE,
5050
},
5151
},
52-
ProvisionedThroughput = new ProvisionedThroughput
53-
{
54-
ReadCapacityUnits = 5,
55-
WriteCapacityUnits = 5,
56-
},
52+
BillingMode = BillingMode.PAY_PER_REQUEST,
5753
});
5854

5955
// Wait until the table is ACTIVE and then report success.

‎dotnetv3/dynamodb/scenarios/PartiQL_Basics_Scenario/PartiQL_Basics_Scenario/PartiQLBasics.cs‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,10 @@
33

44
// snippet-start:[PartiQL.dotnetv3.PartiQLBasicsScenario]
55

6-
// Before you run this example, download 'movies.json' from
7-
// https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/GettingStarted.Js.02.html,
8-
// and put it in the same folder as the example.
9-
106
// Separator for the console display.
117
var SepBar = new string('-', 80);
128
const string tableName = "movie_table";
13-
const string movieFileName = "moviedata.json";
9+
const string movieFileName = @"..\..\..\..\..\..\..\..\resources\sample_files\movies.json";
1410

1511
var client = new AmazonDynamoDBClient();
1612

‎dotnetv3/dynamodb/scenarios/PartiQL_Batch_Scenario/PartiQL_Batch_Scenario/DynamoDBMethods.cs‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,7 @@ public static async Task<bool> CreateMovieTableAsync(string tableName)
4949
KeyType = KeyType.RANGE,
5050
},
5151
},
52-
ProvisionedThroughput = new ProvisionedThroughput
53-
{
54-
ReadCapacityUnits = 5,
55-
WriteCapacityUnits = 5,
56-
},
52+
BillingMode = BillingMode.PAY_PER_REQUEST,
5753
});
5854

5955
// Wait until the table is ACTIVE and then report success.

0 commit comments

Comments
 (0)