Skip to content

Commit f85b847

Browse files
scmacdonscmacdon
authored
Kotlin updated the Kotlin DynamoDB examples to use Billing Mode (#7278)
* updated the Kotlin DynamoDB to use Billing Mode * updated the Kotlin DynamoDB to use Billing Mode * fixed linter error * fixed linter error * fixed linter error * fixed linter error * fixed linter error * fixed linter error * fixed linter error * fixed linter error * fixed linter error * fixed linter error * fixed linter error * updated Readme
1 parent a678b75 commit f85b847

File tree

7 files changed

+37
-211
lines changed

7 files changed

+37
-211
lines changed

‎kotlin/services/dynamodb/README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ For prerequisites, see the [README](../../README.md#Prerequisites) in the `kotli
3333

3434
Code examples that show you how to perform the essential operations within a service.
3535

36-
- [Learn the basics](src/main/kotlin/com/kotlin/dynamodb/Scenario.kt)
36+
- [Learn the basics](src/main/kotlin/com/kotlin/dynamodb/scenario/Scenario.kt)
3737

3838

3939
### Single actions
@@ -55,8 +55,8 @@ Code excerpts that show you how to call individual service functions.
5555
Code examples that show you how to accomplish a specific task by calling multiple
5656
functions within the same service.
5757

58-
- [Query a table by using batches of PartiQL statements](src/main/kotlin/com/kotlin/dynamodb/ScenarioPartiQLBatch.kt)
59-
- [Query a table using PartiQL](src/main/kotlin/com/kotlin/dynamodb/ScenarioPartiQ.kt)
58+
- [Query a table by using batches of PartiQL statements](src/main/kotlin/com/kotlin/dynamodb/scenario/ScenarioPartiQLBatch.kt)
59+
- [Query a table using PartiQL](src/main/kotlin/com/kotlin/dynamodb/scenario/ScenarioPartiQ.kt)
6060

6161

6262
<!--custom.examples.start-->
@@ -148,4 +148,4 @@ in the `kotlin` folder.
148148

149149
Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
150150

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

‎kotlin/services/dynamodb/src/main/kotlin/com/kotlin/dynamodb/CreateTable.kt‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ package com.kotlin.dynamodb
66
// snippet-start:[dynamodb.kotlin.create_table.import]
77
import aws.sdk.kotlin.services.dynamodb.DynamoDbClient
88
import aws.sdk.kotlin.services.dynamodb.model.AttributeDefinition
9+
import aws.sdk.kotlin.services.dynamodb.model.BillingMode
910
import aws.sdk.kotlin.services.dynamodb.model.CreateTableRequest
1011
import aws.sdk.kotlin.services.dynamodb.model.KeySchemaElement
1112
import aws.sdk.kotlin.services.dynamodb.model.KeyType
12-
import aws.sdk.kotlin.services.dynamodb.model.ProvisionedThroughput
1313
import aws.sdk.kotlin.services.dynamodb.model.ScalarAttributeType
1414
import aws.sdk.kotlin.services.dynamodb.waiters.waitUntilTableExists
1515
import kotlin.system.exitProcess
@@ -62,17 +62,11 @@ suspend fun createNewTable(
6262
keyType = KeyType.Hash
6363
}
6464

65-
val provisionedVal =
66-
ProvisionedThroughput {
67-
readCapacityUnits = 10
68-
writeCapacityUnits = 10
69-
}
70-
7165
val request =
7266
CreateTableRequest {
7367
attributeDefinitions = listOf(attDef)
7468
keySchema = listOf(keySchemaVal)
75-
provisionedThroughput = provisionedVal
69+
billingMode = BillingMode.PayPerRequest
7670
tableName = tableNameVal
7771
}
7872

‎kotlin/services/dynamodb/src/main/kotlin/com/kotlin/dynamodb/DynamoDBPartiQ.kt‎

Lines changed: 0 additions & 120 deletions
This file was deleted.

‎kotlin/services/dynamodb/src/main/kotlin/com/kotlin/dynamodb/Scenario.kt‎ renamed to ‎kotlin/services/dynamodb/src/main/kotlin/com/kotlin/dynamodb/scenario/Scenario.kt‎

Lines changed: 6 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
22
// SPDX-License-Identifier: Apache-2.0
33

4-
package com.kotlin.dynamodb
4+
package com.kotlin.dynamodb.scenario
55

66
// snippet-start:[dynamodb.kotlin.scenario.import]
77
import aws.sdk.kotlin.services.dynamodb.DynamoDbClient
88
import aws.sdk.kotlin.services.dynamodb.model.AttributeDefinition
99
import aws.sdk.kotlin.services.dynamodb.model.AttributeValue
10+
import aws.sdk.kotlin.services.dynamodb.model.BillingMode
1011
import aws.sdk.kotlin.services.dynamodb.model.CreateTableRequest
1112
import aws.sdk.kotlin.services.dynamodb.model.DeleteTableRequest
1213
import aws.sdk.kotlin.services.dynamodb.model.GetItemRequest
1314
import aws.sdk.kotlin.services.dynamodb.model.KeySchemaElement
1415
import aws.sdk.kotlin.services.dynamodb.model.KeyType
15-
import aws.sdk.kotlin.services.dynamodb.model.ProvisionedThroughput
1616
import aws.sdk.kotlin.services.dynamodb.model.PutItemRequest
1717
import aws.sdk.kotlin.services.dynamodb.model.QueryRequest
1818
import aws.sdk.kotlin.services.dynamodb.model.ScalarAttributeType
@@ -23,7 +23,7 @@ import com.fasterxml.jackson.databind.JsonNode
2323
import com.fasterxml.jackson.databind.ObjectMapper
2424
import com.fasterxml.jackson.databind.node.ObjectNode
2525
import java.io.File
26-
import kotlin.system.exitProcess
26+
2727
// snippet-end:[dynamodb.kotlin.scenario.import]
2828

2929
/**
@@ -35,23 +35,9 @@ https://docs.aws.amazon.com/sdk-for-kotlin/latest/developer-guide/setup.html
3535
*/
3636

3737
// snippet-start:[dynamodb.kotlin.scenario.main]
38-
suspend fun main(args: Array<String>) {
39-
val usage = """
40-
Usage:
41-
<fileName>
42-
43-
Where:
44-
fileName - The path to the moviedata.json you can download from the Amazon DynamoDB Developer Guide.
45-
"""
46-
47-
if (args.size != 1) {
48-
println(usage)
49-
exitProcess(1)
50-
}
51-
52-
// Get the moviedata.json from the Amazon DynamoDB Developer Guide.
38+
suspend fun main() {
5339
val tableName = "Movies"
54-
val fileName = args[0]
40+
val fileName = "../../../resources/sample_files/movies.json"
5541
val partitionAlias = "#a"
5642

5743
println("Creating an Amazon DynamoDB table named Movies with a key named id and a sort key named title.")
@@ -93,17 +79,11 @@ suspend fun createScenarioTable(
9379
keyType = KeyType.Range
9480
}
9581

96-
val provisionedVal =
97-
ProvisionedThroughput {
98-
readCapacityUnits = 10
99-
writeCapacityUnits = 10
100-
}
101-
10282
val request =
10383
CreateTableRequest {
10484
attributeDefinitions = listOf(attDef, attDef1)
10585
keySchema = listOf(keySchemaVal, keySchemaVal1)
106-
provisionedThroughput = provisionedVal
86+
billingMode = BillingMode.PayPerRequest
10787
tableName = tableNameVal
10888
}
10989

‎kotlin/services/dynamodb/src/main/kotlin/com/kotlin/dynamodb/ScenarioPartiQ.kt‎ renamed to ‎kotlin/services/dynamodb/src/main/kotlin/com/kotlin/dynamodb/scenario/ScenarioPartiQ.kt‎

Lines changed: 5 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,26 @@
11
// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
22
// SPDX-License-Identifier: Apache-2.0
33

4-
package com.kotlin.dynamodb
4+
package com.kotlin.dynamodb.scenario
55

66
// snippet-start:[dynamodb.kotlin.scenario.partiql.import]
77
import aws.sdk.kotlin.services.dynamodb.DynamoDbClient
88
import aws.sdk.kotlin.services.dynamodb.model.AttributeDefinition
99
import aws.sdk.kotlin.services.dynamodb.model.AttributeValue
10+
import aws.sdk.kotlin.services.dynamodb.model.BillingMode
1011
import aws.sdk.kotlin.services.dynamodb.model.CreateTableRequest
1112
import aws.sdk.kotlin.services.dynamodb.model.DeleteTableRequest
1213
import aws.sdk.kotlin.services.dynamodb.model.ExecuteStatementRequest
1314
import aws.sdk.kotlin.services.dynamodb.model.ExecuteStatementResponse
1415
import aws.sdk.kotlin.services.dynamodb.model.KeySchemaElement
1516
import aws.sdk.kotlin.services.dynamodb.model.KeyType
16-
import aws.sdk.kotlin.services.dynamodb.model.ProvisionedThroughput
1717
import aws.sdk.kotlin.services.dynamodb.model.ScalarAttributeType
1818
import aws.sdk.kotlin.services.dynamodb.waiters.waitUntilTableExists
1919
import com.fasterxml.jackson.core.JsonFactory
2020
import com.fasterxml.jackson.databind.JsonNode
2121
import com.fasterxml.jackson.databind.ObjectMapper
2222
import com.fasterxml.jackson.databind.node.ObjectNode
2323
import java.io.File
24-
import kotlin.system.exitProcess
2524
// snippet-end:[dynamodb.kotlin.scenario.partiql.import]
2625

2726
/**
@@ -33,25 +32,10 @@ import kotlin.system.exitProcess
3332
*/
3433

3534
// snippet-start:[dynamodb.kotlin.scenario.partiql.main]
36-
suspend fun main(args: Array<String>) {
37-
val usage = """
38-
Usage:
39-
<fileName>
40-
41-
Where:
42-
fileName - The path to the moviedata.json file You can download from the Amazon DynamoDB Developer Guide.
43-
"""
44-
45-
if (args.size != 1) {
46-
println(usage)
47-
exitProcess(1)
48-
}
49-
35+
suspend fun main() {
5036
val ddb = DynamoDbClient { region = "us-east-1" }
5137
val tableName = "MoviesPartiQ"
52-
53-
// Get the moviedata.json from the Amazon DynamoDB Developer Guide.
54-
val fileName = args[0]
38+
val fileName = "../../../resources/sample_files/movies.json"
5539
println("Creating an Amazon DynamoDB table named MoviesPartiQ with a key named id and a sort key named title.")
5640
createTablePartiQL(ddb, tableName, "year")
5741
loadDataPartiQL(ddb, fileName)
@@ -101,17 +85,11 @@ suspend fun createTablePartiQL(
10185
keyType = KeyType.Range
10286
}
10387

104-
val provisionedVal =
105-
ProvisionedThroughput {
106-
readCapacityUnits = 10
107-
writeCapacityUnits = 10
108-
}
109-
11088
val request =
11189
CreateTableRequest {
11290
attributeDefinitions = listOf(attDef, attDef1)
11391
keySchema = listOf(keySchemaVal, keySchemaVal1)
114-
provisionedThroughput = provisionedVal
92+
billingMode = BillingMode.PayPerRequest
11593
tableName = tableNameVal
11694
}
11795

‎kotlin/services/dynamodb/src/main/kotlin/com/kotlin/dynamodb/ScenarioPartiQLBatch.kt‎ renamed to ‎kotlin/services/dynamodb/src/main/kotlin/com/kotlin/dynamodb/scenario/ScenarioPartiQLBatch.kt‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
22
// SPDX-License-Identifier: Apache-2.0
33

4-
package com.kotlin.dynamodb
4+
package com.kotlin.dynamodb.scenario
55

66
// snippet-start:[dynamodb.kotlin.scenario.partiql.batch.import]
77
import aws.sdk.kotlin.services.dynamodb.DynamoDbClient
88
import aws.sdk.kotlin.services.dynamodb.model.AttributeDefinition
99
import aws.sdk.kotlin.services.dynamodb.model.AttributeValue
1010
import aws.sdk.kotlin.services.dynamodb.model.BatchExecuteStatementRequest
1111
import aws.sdk.kotlin.services.dynamodb.model.BatchStatementRequest
12+
import aws.sdk.kotlin.services.dynamodb.model.BillingMode
1213
import aws.sdk.kotlin.services.dynamodb.model.CreateTableRequest
1314
import aws.sdk.kotlin.services.dynamodb.model.DeleteTableRequest
1415
import aws.sdk.kotlin.services.dynamodb.model.KeySchemaElement
1516
import aws.sdk.kotlin.services.dynamodb.model.KeyType
16-
import aws.sdk.kotlin.services.dynamodb.model.ProvisionedThroughput
1717
import aws.sdk.kotlin.services.dynamodb.model.ScalarAttributeType
1818
import aws.sdk.kotlin.services.dynamodb.waiters.waitUntilTableExists
1919
// snippet-end:[dynamodb.kotlin.scenario.partiql.batch.import]
@@ -75,17 +75,11 @@ suspend fun createTablePartiQLBatch(
7575
keyType = KeyType.Range
7676
}
7777

78-
val provisionedVal =
79-
ProvisionedThroughput {
80-
readCapacityUnits = 10
81-
writeCapacityUnits = 10
82-
}
83-
8478
val request =
8579
CreateTableRequest {
8680
attributeDefinitions = listOf(attDef, attDef1)
8781
keySchema = listOf(keySchemaVal, keySchemaVal1)
88-
provisionedThroughput = provisionedVal
82+
billingMode = BillingMode.PayPerRequest
8983
tableName = tableNameVal
9084
}
9185

0 commit comments

Comments
 (0)