From 77420a37b5ad176d1762b75e73543400afb042b0 Mon Sep 17 00:00:00 2001 From: Guillaume Duboc Date: Fri, 26 Jan 2024 18:06:05 +0100 Subject: [PATCH] chore: remove document client from unit tests --- .../operations/batch/batchWrite.unit.test.ts | 13 ++----------- .../BatchDeleteItemParams.unit.test.ts | 10 +--------- .../putItem/BatchPutItemParams.unit.test.ts | 10 +--------- .../deleteItemParams.unit.test.ts | 10 +--------- .../getItemParams/getItemParams.unit.test.ts | 13 ++----------- .../putItemParams/putItemParams.unit.test.ts | 16 +++------------- .../queryParams/queryParams.unit.test.ts | 9 +-------- .../scan/scanParams/scanParams.unit.test.ts | 9 +-------- .../transactDeleteItemParams.unit.test.ts | 10 +--------- .../transactPutItemParams.unit.test.ts | 16 +++------------- .../transactUpdateItemParams.unit.test.ts | 19 ++++--------------- .../updateItemParams.unit.test.ts | 19 ++++--------------- 12 files changed, 24 insertions(+), 130 deletions(-) diff --git a/src/v1/operations/batch/batchWrite.unit.test.ts b/src/v1/operations/batch/batchWrite.unit.test.ts index b67680c37..7feb494f8 100644 --- a/src/v1/operations/batch/batchWrite.unit.test.ts +++ b/src/v1/operations/batch/batchWrite.unit.test.ts @@ -1,15 +1,8 @@ -import { DynamoDBClient } from '@aws-sdk/client-dynamodb' -import { DynamoDBDocumentClient } from '@aws-sdk/lib-dynamodb' - import { DynamoDBToolboxError, EntityV2, TableV2, schema, string } from 'v1' import { BatchPutItemRequest } from './putItem/operation' import { BatchDeleteItemRequest } from './deleteItem/operation' import { getBatchWriteCommandInput } from './batchWrite' -const dynamoDbClient = new DynamoDBClient({}) - -const documentClient = DynamoDBDocumentClient.from(dynamoDbClient) - const TestTable = new TableV2({ name: 'test-table', partitionKey: { @@ -19,8 +12,7 @@ const TestTable = new TableV2({ sortKey: { type: 'string', name: 'sk' - }, - documentClient + } }) const TestTable2 = new TableV2({ name: 'test-table2', @@ -38,8 +30,7 @@ const TestTable2 = new TableV2({ sortKey: { name: 'GSIsk1', type: 'string' }, type: 'global' } - }, - documentClient + } }) const TestEntity = new EntityV2({ diff --git a/src/v1/operations/batch/deleteItem/BatchDeleteItemParams.unit.test.ts b/src/v1/operations/batch/deleteItem/BatchDeleteItemParams.unit.test.ts index b7bc9fde5..a3c946cb4 100644 --- a/src/v1/operations/batch/deleteItem/BatchDeleteItemParams.unit.test.ts +++ b/src/v1/operations/batch/deleteItem/BatchDeleteItemParams.unit.test.ts @@ -1,13 +1,6 @@ -import { DynamoDBClient } from '@aws-sdk/client-dynamodb' -import { DynamoDBDocumentClient } from '@aws-sdk/lib-dynamodb' - import { DynamoDBToolboxError, EntityV2, TableV2, schema, string } from 'v1' import { BatchDeleteItemRequest } from './operation' -const dynamoDbClient = new DynamoDBClient({}) - -const documentClient = DynamoDBDocumentClient.from(dynamoDbClient) - const TestTable = new TableV2({ name: 'test-table', partitionKey: { @@ -17,8 +10,7 @@ const TestTable = new TableV2({ sortKey: { type: 'string', name: 'sk' - }, - documentClient + } }) const TestEntity = new EntityV2({ diff --git a/src/v1/operations/batch/putItem/BatchPutItemParams.unit.test.ts b/src/v1/operations/batch/putItem/BatchPutItemParams.unit.test.ts index bfaffc84c..195da1773 100644 --- a/src/v1/operations/batch/putItem/BatchPutItemParams.unit.test.ts +++ b/src/v1/operations/batch/putItem/BatchPutItemParams.unit.test.ts @@ -1,13 +1,6 @@ -import { DynamoDBClient } from '@aws-sdk/client-dynamodb' -import { DynamoDBDocumentClient } from '@aws-sdk/lib-dynamodb' - import { DynamoDBToolboxError, EntityV2, TableV2, schema, string } from 'v1' import { BatchPutItemRequest } from './operation' -const dynamoDbClient = new DynamoDBClient({}) - -const documentClient = DynamoDBDocumentClient.from(dynamoDbClient) - const TestTable = new TableV2({ name: 'test-table', partitionKey: { @@ -17,8 +10,7 @@ const TestTable = new TableV2({ sortKey: { type: 'string', name: 'sk' - }, - documentClient + } }) const TestEntity = new EntityV2({ diff --git a/src/v1/operations/deleteItem/deleteItemParams/deleteItemParams.unit.test.ts b/src/v1/operations/deleteItem/deleteItemParams/deleteItemParams.unit.test.ts index d5b7b1bb5..ab80bb243 100644 --- a/src/v1/operations/deleteItem/deleteItemParams/deleteItemParams.unit.test.ts +++ b/src/v1/operations/deleteItem/deleteItemParams/deleteItemParams.unit.test.ts @@ -1,6 +1,3 @@ -import { DynamoDBClient } from '@aws-sdk/client-dynamodb' -import { DynamoDBDocumentClient } from '@aws-sdk/lib-dynamodb' - import { TableV2, EntityV2, @@ -11,10 +8,6 @@ import { prefix } from 'v1' -const dynamoDbClient = new DynamoDBClient({}) - -const documentClient = DynamoDBDocumentClient.from(dynamoDbClient) - const TestTable = new TableV2({ name: 'test-table', partitionKey: { @@ -24,8 +17,7 @@ const TestTable = new TableV2({ sortKey: { type: 'string', name: 'sk' - }, - documentClient + } }) const TestEntity = new EntityV2({ diff --git a/src/v1/operations/getItem/getItemParams/getItemParams.unit.test.ts b/src/v1/operations/getItem/getItemParams/getItemParams.unit.test.ts index f6b3d2b9e..a01d39abe 100644 --- a/src/v1/operations/getItem/getItemParams/getItemParams.unit.test.ts +++ b/src/v1/operations/getItem/getItemParams/getItemParams.unit.test.ts @@ -1,12 +1,5 @@ -import { DynamoDBClient } from '@aws-sdk/client-dynamodb' -import { DynamoDBDocumentClient } from '@aws-sdk/lib-dynamodb' - import { TableV2, EntityV2, schema, string, DynamoDBToolboxError, GetItemCommand, prefix } from 'v1' -const dynamoDbClient = new DynamoDBClient({}) - -const documentClient = DynamoDBDocumentClient.from(dynamoDbClient) - const TestTable = new TableV2({ name: 'test-table', partitionKey: { @@ -16,8 +9,7 @@ const TestTable = new TableV2({ sortKey: { type: 'string', name: 'sk' - }, - documentClient + } }) const TestEntity = new EntityV2({ @@ -33,8 +25,7 @@ const TestEntity = new EntityV2({ const TestTable2 = new TableV2({ name: 'test-table', partitionKey: { type: 'string', name: 'pk' }, - sortKey: { type: 'string', name: 'sk' }, - documentClient + sortKey: { type: 'string', name: 'sk' } }) const TestEntity2 = new EntityV2({ diff --git a/src/v1/operations/putItem/putItemParams/putItemParams.unit.test.ts b/src/v1/operations/putItem/putItemParams/putItemParams.unit.test.ts index dc3470839..8c16dcbba 100644 --- a/src/v1/operations/putItem/putItemParams/putItemParams.unit.test.ts +++ b/src/v1/operations/putItem/putItemParams/putItemParams.unit.test.ts @@ -1,6 +1,3 @@ -import { DynamoDBDocumentClient } from '@aws-sdk/lib-dynamodb' -import { DynamoDBClient } from '@aws-sdk/client-dynamodb' - import { TableV2, EntityV2, @@ -19,10 +16,6 @@ import { prefix } from 'v1' -const dynamoDbClient = new DynamoDBClient({}) - -const documentClient = DynamoDBDocumentClient.from(dynamoDbClient) - const TestTable = new TableV2({ name: 'test-table', partitionKey: { @@ -32,8 +25,7 @@ const TestTable = new TableV2({ sortKey: { type: 'string', name: 'sk' - }, - documentClient + } }) const TestEntity = new EntityV2({ @@ -62,8 +54,7 @@ const TestEntity = new EntityV2({ const TestTable2 = new TableV2({ name: 'test-table', - partitionKey: { type: 'string', name: 'pk' }, - documentClient + partitionKey: { type: 'string', name: 'pk' } }) const TestEntity2 = new EntityV2({ @@ -97,8 +88,7 @@ const TestEntity3 = new EntityV2({ const TestTable3 = new TableV2({ name: 'TestTable3', partitionKey: { type: 'string', name: 'pk' }, - sortKey: { type: 'string', name: 'sk' }, - documentClient + sortKey: { type: 'string', name: 'sk' } }) const TestEntity4 = new EntityV2({ diff --git a/src/v1/operations/query/queryParams/queryParams.unit.test.ts b/src/v1/operations/query/queryParams/queryParams.unit.test.ts index 91b6755d1..7aeddb424 100644 --- a/src/v1/operations/query/queryParams/queryParams.unit.test.ts +++ b/src/v1/operations/query/queryParams/queryParams.unit.test.ts @@ -1,5 +1,3 @@ -import { DynamoDBClient } from '@aws-sdk/client-dynamodb' -import { DynamoDBDocumentClient } from '@aws-sdk/lib-dynamodb' import type { A } from 'ts-toolbelt' import { @@ -15,10 +13,6 @@ import { prefix } from 'v1' -const dynamoDbClient = new DynamoDBClient({}) - -const documentClient = DynamoDBDocumentClient.from(dynamoDbClient) - const TestTable = new TableV2({ name: 'test-table', partitionKey: { @@ -48,8 +42,7 @@ const TestTable = new TableV2({ type: 'string' } } - }, - documentClient + } }) const Entity1 = new EntityV2({ diff --git a/src/v1/operations/scan/scanParams/scanParams.unit.test.ts b/src/v1/operations/scan/scanParams/scanParams.unit.test.ts index a9af0142f..cdc8177e4 100644 --- a/src/v1/operations/scan/scanParams/scanParams.unit.test.ts +++ b/src/v1/operations/scan/scanParams/scanParams.unit.test.ts @@ -1,5 +1,3 @@ -import { DynamoDBClient } from '@aws-sdk/client-dynamodb' -import { DynamoDBDocumentClient } from '@aws-sdk/lib-dynamodb' import type { A } from 'ts-toolbelt' import { @@ -15,10 +13,6 @@ import { prefix } from 'v1' -const dynamoDbClient = new DynamoDBClient({}) - -const documentClient = DynamoDBDocumentClient.from(dynamoDbClient) - const TestTable = new TableV2({ name: 'test-table', partitionKey: { @@ -41,8 +35,7 @@ const TestTable = new TableV2({ type: 'string' } } - }, - documentClient + } }) const Entity1 = new EntityV2({ diff --git a/src/v1/operations/transactions/deleteItem/transactDeleteItemParams/transactDeleteItemParams.unit.test.ts b/src/v1/operations/transactions/deleteItem/transactDeleteItemParams/transactDeleteItemParams.unit.test.ts index c1baf860a..f7bdf1751 100644 --- a/src/v1/operations/transactions/deleteItem/transactDeleteItemParams/transactDeleteItemParams.unit.test.ts +++ b/src/v1/operations/transactions/deleteItem/transactDeleteItemParams/transactDeleteItemParams.unit.test.ts @@ -1,13 +1,6 @@ -import { DynamoDBDocumentClient } from '@aws-sdk/lib-dynamodb' -import { DynamoDBClient } from '@aws-sdk/client-dynamodb' - import { TableV2, EntityV2, schema, string, DynamoDBToolboxError } from 'v1' import { DeleteItemTransaction } from '../operation' -const dynamoDbClient = new DynamoDBClient({}) - -const documentClient = DynamoDBDocumentClient.from(dynamoDbClient) - const TestTable = new TableV2({ name: 'test-table', partitionKey: { @@ -17,8 +10,7 @@ const TestTable = new TableV2({ sortKey: { type: 'string', name: 'sk' - }, - documentClient + } }) const TestEntity = new EntityV2({ diff --git a/src/v1/operations/transactions/putItem/transactPutItemParams/transactPutItemParams.unit.test.ts b/src/v1/operations/transactions/putItem/transactPutItemParams/transactPutItemParams.unit.test.ts index 9e326ee08..45e72faeb 100644 --- a/src/v1/operations/transactions/putItem/transactPutItemParams/transactPutItemParams.unit.test.ts +++ b/src/v1/operations/transactions/putItem/transactPutItemParams/transactPutItemParams.unit.test.ts @@ -1,6 +1,3 @@ -import { DynamoDBDocumentClient } from '@aws-sdk/lib-dynamodb' -import { DynamoDBClient } from '@aws-sdk/client-dynamodb' - import { TableV2, EntityV2, @@ -17,10 +14,6 @@ import { PutItemTransaction } from 'v1' -const dynamoDbClient = new DynamoDBClient({}) - -const documentClient = DynamoDBDocumentClient.from(dynamoDbClient) - const TestTable = new TableV2({ name: 'test-table', partitionKey: { @@ -30,8 +23,7 @@ const TestTable = new TableV2({ sortKey: { type: 'string', name: 'sk' - }, - documentClient + } }) const TestEntity = new EntityV2({ @@ -58,8 +50,7 @@ const TestEntity = new EntityV2({ const TestTable2 = new TableV2({ name: 'test-table', - partitionKey: { type: 'string', name: 'pk' }, - documentClient + partitionKey: { type: 'string', name: 'pk' } }) const TestEntity2 = new EntityV2({ @@ -93,8 +84,7 @@ const TestEntity3 = new EntityV2({ const TestTable3 = new TableV2({ name: 'TestTable3', partitionKey: { type: 'string', name: 'pk' }, - sortKey: { type: 'string', name: 'sk' }, - documentClient + sortKey: { type: 'string', name: 'sk' } }) const TestEntity4 = new EntityV2({ diff --git a/src/v1/operations/transactions/updateItem/transactUpdateItemParams/transactUpdateItemParams.unit.test.ts b/src/v1/operations/transactions/updateItem/transactUpdateItemParams/transactUpdateItemParams.unit.test.ts index 3cb728d3c..bdb45666c 100644 --- a/src/v1/operations/transactions/updateItem/transactUpdateItemParams/transactUpdateItemParams.unit.test.ts +++ b/src/v1/operations/transactions/updateItem/transactUpdateItemParams/transactUpdateItemParams.unit.test.ts @@ -1,6 +1,3 @@ -import { DynamoDBDocumentClient } from '@aws-sdk/lib-dynamodb' -import { DynamoDBClient } from '@aws-sdk/client-dynamodb' - import { TableV2, EntityV2, @@ -30,10 +27,6 @@ import { $prepend } from 'v1/operations/updateItem/utils' -const dynamoDbClient = new DynamoDBClient({}) - -const documentClient = DynamoDBDocumentClient.from(dynamoDbClient) - const TestTable = new TableV2({ name: 'test-table', partitionKey: { @@ -43,8 +36,7 @@ const TestTable = new TableV2({ sortKey: { type: 'string', name: 'sk' - }, - documentClient + } }) const TestEntity = new EntityV2({ @@ -88,8 +80,7 @@ const TestTable2 = new TableV2({ partitionKey: { type: 'string', name: 'pk' - }, - documentClient + } }) const TestEntity2 = new EntityV2({ @@ -121,8 +112,7 @@ const TestTable3 = new TableV2({ partitionKey: { type: 'string', name: 'pk' - }, - documentClient + } }) const TestEntity3 = new EntityV2({ @@ -142,8 +132,7 @@ const TestTable4 = new TableV2({ partitionKey: { type: 'string', name: 'pk' - }, - documentClient + } }) const TestEntity4 = new EntityV2({ diff --git a/src/v1/operations/updateItem/updateItemParams/updateItemParams.unit.test.ts b/src/v1/operations/updateItem/updateItemParams/updateItemParams.unit.test.ts index b768da6be..0b4a488ff 100644 --- a/src/v1/operations/updateItem/updateItemParams/updateItemParams.unit.test.ts +++ b/src/v1/operations/updateItem/updateItemParams/updateItemParams.unit.test.ts @@ -1,6 +1,3 @@ -import { DynamoDBDocumentClient } from '@aws-sdk/lib-dynamodb' -import { DynamoDBClient } from '@aws-sdk/client-dynamodb' - import { TableV2, EntityV2, @@ -20,10 +17,6 @@ import { } from 'v1' import { $set, $get, $remove, $sum, $subtract, $add, $delete, $append, $prepend } from '../utils' -const dynamoDbClient = new DynamoDBClient({}) - -const documentClient = DynamoDBDocumentClient.from(dynamoDbClient) - const TestTable = new TableV2({ name: 'test-table', partitionKey: { @@ -33,8 +26,7 @@ const TestTable = new TableV2({ sortKey: { type: 'string', name: 'sk' - }, - documentClient + } }) const TestEntity = new EntityV2({ @@ -78,8 +70,7 @@ const TestTable2 = new TableV2({ partitionKey: { type: 'string', name: 'pk' - }, - documentClient + } }) const TestEntity2 = new EntityV2({ @@ -111,8 +102,7 @@ const TestTable3 = new TableV2({ partitionKey: { type: 'string', name: 'pk' - }, - documentClient + } }) const TestEntity3 = new EntityV2({ @@ -132,8 +122,7 @@ const TestTable4 = new TableV2({ partitionKey: { type: 'string', name: 'pk' - }, - documentClient + } }) const TestEntity4 = new EntityV2({