updated the Kotlin DynamoDB to use Billing Mode

Author: scmacdon

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

@@ -6,6 +6,7 @@ package com.kotlin.dynamodb
 // snippet-start:[dynamodb.kotlin.create_table.import]
 import aws.sdk.kotlin.services.dynamodb.DynamoDbClient
 import aws.sdk.kotlin.services.dynamodb.model.AttributeDefinition
+import aws.sdk.kotlin.services.dynamodb.model.BillingMode
 import aws.sdk.kotlin.services.dynamodb.model.CreateTableRequest
 import aws.sdk.kotlin.services.dynamodb.model.KeySchemaElement
 import aws.sdk.kotlin.services.dynamodb.model.KeyType
@@ -62,17 +63,11 @@ suspend fun createNewTable(
             keyType = KeyType.Hash
         }
 
-    val provisionedVal =
-        ProvisionedThroughput {
-            readCapacityUnits = 10
-            writeCapacityUnits = 10
-        }
-
     val request =
         CreateTableRequest {
             attributeDefinitions = listOf(attDef)
             keySchema = listOf(keySchemaVal)
-            provisionedThroughput = provisionedVal
+            billingMode = BillingMode.PayPerRequest
             tableName = tableNameVal
         }
 

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

@@ -1,18 +1,18 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-package com.kotlin.dynamodb
+package com.kotlin.dynamodb.scenario
 
 // snippet-start:[dynamodb.kotlin.scenario.import]
 import aws.sdk.kotlin.services.dynamodb.DynamoDbClient
 import aws.sdk.kotlin.services.dynamodb.model.AttributeDefinition
 import aws.sdk.kotlin.services.dynamodb.model.AttributeValue
+import aws.sdk.kotlin.services.dynamodb.model.BillingMode
 import aws.sdk.kotlin.services.dynamodb.model.CreateTableRequest
 import aws.sdk.kotlin.services.dynamodb.model.DeleteTableRequest
 import aws.sdk.kotlin.services.dynamodb.model.GetItemRequest
 import aws.sdk.kotlin.services.dynamodb.model.KeySchemaElement
 import aws.sdk.kotlin.services.dynamodb.model.KeyType
-import aws.sdk.kotlin.services.dynamodb.model.ProvisionedThroughput
 import aws.sdk.kotlin.services.dynamodb.model.PutItemRequest
 import aws.sdk.kotlin.services.dynamodb.model.QueryRequest
 import aws.sdk.kotlin.services.dynamodb.model.ScalarAttributeType
@@ -23,7 +23,7 @@ import com.fasterxml.jackson.databind.JsonNode
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.fasterxml.jackson.databind.node.ObjectNode
 import java.io.File
-import kotlin.system.exitProcess
+
 // snippet-end:[dynamodb.kotlin.scenario.import]
 
 /**
@@ -36,22 +36,8 @@ https://docs.aws.amazon.com/sdk-for-kotlin/latest/developer-guide/setup.html
 
 // snippet-start:[dynamodb.kotlin.scenario.main]
 suspend fun main(args: Array<String>) {
-    val usage = """
-        Usage:
-          <fileName>
-
-        Where:
-           fileName - The path to the moviedata.json you can download from the Amazon DynamoDB Developer Guide.
-    """
-
-    if (args.size != 1) {
-        println(usage)
-        exitProcess(1)
-    }
-
-    // Get the moviedata.json from the Amazon DynamoDB Developer Guide.
     val tableName = "Movies"
-    val fileName = args[0]
+    val fileName = "../../../resources/sample_files/movies.json"
     val partitionAlias = "#a"
 
     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(
             keyType = KeyType.Range
         }
 
-    val provisionedVal =
-        ProvisionedThroughput {
-            readCapacityUnits = 10
-            writeCapacityUnits = 10
-        }
-
     val request =
         CreateTableRequest {
             attributeDefinitions = listOf(attDef, attDef1)
             keySchema = listOf(keySchemaVal, keySchemaVal1)
-            provisionedThroughput = provisionedVal
+            billingMode = BillingMode.PayPerRequest
             tableName = tableNameVal
         }
 

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

@@ -1,19 +1,19 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-package com.kotlin.dynamodb
+package com.kotlin.dynamodb.scenario
 
 // snippet-start:[dynamodb.kotlin.scenario.partiql.import]
 import aws.sdk.kotlin.services.dynamodb.DynamoDbClient
 import aws.sdk.kotlin.services.dynamodb.model.AttributeDefinition
 import aws.sdk.kotlin.services.dynamodb.model.AttributeValue
+import aws.sdk.kotlin.services.dynamodb.model.BillingMode
 import aws.sdk.kotlin.services.dynamodb.model.CreateTableRequest
 import aws.sdk.kotlin.services.dynamodb.model.DeleteTableRequest
 import aws.sdk.kotlin.services.dynamodb.model.ExecuteStatementRequest
 import aws.sdk.kotlin.services.dynamodb.model.ExecuteStatementResponse
 import aws.sdk.kotlin.services.dynamodb.model.KeySchemaElement
 import aws.sdk.kotlin.services.dynamodb.model.KeyType
-import aws.sdk.kotlin.services.dynamodb.model.ProvisionedThroughput
 import aws.sdk.kotlin.services.dynamodb.model.ScalarAttributeType
 import aws.sdk.kotlin.services.dynamodb.waiters.waitUntilTableExists
 import com.fasterxml.jackson.core.JsonFactory
@@ -101,17 +101,11 @@ suspend fun createTablePartiQL(
             keyType = KeyType.Range
         }
 
-    val provisionedVal =
-        ProvisionedThroughput {
-            readCapacityUnits = 10
-            writeCapacityUnits = 10
-        }
-
     val request =
         CreateTableRequest {
             attributeDefinitions = listOf(attDef, attDef1)
             keySchema = listOf(keySchemaVal, keySchemaVal1)
-            provisionedThroughput = provisionedVal
+            billingMode = BillingMode.PayPerRequest
             tableName = tableNameVal
         }
 

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

@@ -1,19 +1,19 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-package com.kotlin.dynamodb
+package com.kotlin.dynamodb.scenario
 
 // snippet-start:[dynamodb.kotlin.scenario.partiql.batch.import]
 import aws.sdk.kotlin.services.dynamodb.DynamoDbClient
 import aws.sdk.kotlin.services.dynamodb.model.AttributeDefinition
 import aws.sdk.kotlin.services.dynamodb.model.AttributeValue
 import aws.sdk.kotlin.services.dynamodb.model.BatchExecuteStatementRequest
 import aws.sdk.kotlin.services.dynamodb.model.BatchStatementRequest
+import aws.sdk.kotlin.services.dynamodb.model.BillingMode
 import aws.sdk.kotlin.services.dynamodb.model.CreateTableRequest
 import aws.sdk.kotlin.services.dynamodb.model.DeleteTableRequest
 import aws.sdk.kotlin.services.dynamodb.model.KeySchemaElement
 import aws.sdk.kotlin.services.dynamodb.model.KeyType
-import aws.sdk.kotlin.services.dynamodb.model.ProvisionedThroughput
 import aws.sdk.kotlin.services.dynamodb.model.ScalarAttributeType
 import aws.sdk.kotlin.services.dynamodb.waiters.waitUntilTableExists
 // snippet-end:[dynamodb.kotlin.scenario.partiql.batch.import]
@@ -75,17 +75,11 @@ suspend fun createTablePartiQLBatch(
             keyType = KeyType.Range
         }
 
-    val provisionedVal =
-        ProvisionedThroughput {
-            readCapacityUnits = 10
-            writeCapacityUnits = 10
-        }
-
     val request =
         CreateTableRequest {
             attributeDefinitions = listOf(attDef, attDef1)
             keySchema = listOf(keySchemaVal, keySchemaVal1)
-            provisionedThroughput = provisionedVal
+            billingMode = BillingMode.PayPerRequest
             tableName = tableNameVal
         }
 

kotlin/services/dynamodb/src/test/kotlin/DynamoDB.kt

@@ -6,31 +6,31 @@ import aws.sdk.kotlin.services.secretsmanager.SecretsManagerClient
 import aws.sdk.kotlin.services.secretsmanager.model.GetSecretValueRequest
 import com.google.gson.Gson
 import com.kotlin.dynamodb.createNewTable
-import com.kotlin.dynamodb.createScenarioTable
-import com.kotlin.dynamodb.createTablePartiQL
-import com.kotlin.dynamodb.createTablePartiQLBatch
-import com.kotlin.dynamodb.deletIssuesTable
+import com.kotlin.dynamodb.scenario.createScenarioTable
+import com.kotlin.dynamodb.scenario.createTablePartiQL
+import com.kotlin.dynamodb.scenario.createTablePartiQLBatch
+import com.kotlin.dynamodb.scenario.deletIssuesTable
 import com.kotlin.dynamodb.deleteDynamoDBTable
-import com.kotlin.dynamodb.deleteItemsBatch
-import com.kotlin.dynamodb.deleteTablePartiQL
-import com.kotlin.dynamodb.deleteTablePartiQLBatch
+import com.kotlin.dynamodb.scenario.deleteItemsBatch
+import com.kotlin.dynamodb.scenario.deleteTablePartiQL
+import com.kotlin.dynamodb.scenario.deleteTablePartiQLBatch
 import com.kotlin.dynamodb.describeDymamoDBTable
-import com.kotlin.dynamodb.getMovie
-import com.kotlin.dynamodb.getMoviePartiQL
+import com.kotlin.dynamodb.scenario.getMovie
+import com.kotlin.dynamodb.scenario.getMoviePartiQL
 import com.kotlin.dynamodb.getSpecificItem
 import com.kotlin.dynamodb.listAllTables
-import com.kotlin.dynamodb.loadData
-import com.kotlin.dynamodb.loadDataPartiQL
+import com.kotlin.dynamodb.scenario.loadData
+import com.kotlin.dynamodb.scenario.loadDataPartiQL
 import com.kotlin.dynamodb.putItemInTable
-import com.kotlin.dynamodb.putRecordBatch
-import com.kotlin.dynamodb.putRecordPartiQL
+import com.kotlin.dynamodb.scenario.putRecordBatch
+import com.kotlin.dynamodb.scenario.putRecordPartiQL
 import com.kotlin.dynamodb.queryDynTable
-import com.kotlin.dynamodb.queryTablePartiQL
+import com.kotlin.dynamodb.scenario.queryTablePartiQL
 import com.kotlin.dynamodb.scanItems
-import com.kotlin.dynamodb.scanMovies
+import com.kotlin.dynamodb.scenario.scanMovies
 import com.kotlin.dynamodb.updateTableItem
-import com.kotlin.dynamodb.updateTableItemBatchBatch
-import com.kotlin.dynamodb.updateTableItemPartiQL
+import com.kotlin.dynamodb.scenario.updateTableItemBatchBatch
+import com.kotlin.dynamodb.scenario.updateTableItemPartiQL
 import kotlinx.coroutines.runBlocking
 import org.junit.jupiter.api.BeforeAll
 import org.junit.jupiter.api.DisplayName