Merge branch 'main' into tolutheo-dev

Author: tolutheo

packages/idempotency/src/errors.ts

@@ -1,4 +1,4 @@
-import { IdempotencyRecord } from './persistence';
+import type { IdempotencyRecord } from './persistence';
 /**
  * Item attempting to be inserted into persistence store already exists and is not expired
  */

packages/idempotency/src/persistence/DynamoDBPersistenceLayer.ts

@@ -10,7 +10,6 @@ import {
   DeleteItemCommand,
   DynamoDBClient,
   DynamoDBClientConfig,
-  DynamoDBServiceException,
   GetItemCommand,
   PutItemCommand,
   UpdateItemCommand,
@@ -201,24 +200,22 @@ class DynamoDBPersistenceLayer extends BasePersistenceLayer {
         })
       );
     } catch (error) {
-      if (error instanceof DynamoDBServiceException) {
-        if (error instanceof ConditionalCheckFailedException) {
-          if (!error.Item) {
-            throw new Error('Item is undefined');
-          }
-          const Item = unmarshall(error.Item);
-          throw new IdempotencyItemAlreadyExistsError(
-            `Failed to put record for already existing idempotency key: ${record.idempotencyKey}`,
-            new IdempotencyRecord({
-              idempotencyKey: Item[this.keyAttr],
-              status: Item[this.statusAttr],
-              expiryTimestamp: Item[this.expiryAttr],
-              inProgressExpiryTimestamp: Item[this.inProgressExpiryAttr],
-              responseData: Item[this.dataAttr],
-              payloadHash: Item[this.validationKeyAttr],
-            })
-          );
+      if (error instanceof ConditionalCheckFailedException) {
+        if (!error.Item) {
+          throw new Error('item is undefined');
         }
+        const item = unmarshall(error.Item);
+        throw new IdempotencyItemAlreadyExistsError(
+          `Failed to put record for already existing idempotency key: ${record.idempotencyKey}`,
+          new IdempotencyRecord({
+            idempotencyKey: item[this.keyAttr],
+            status: item[this.statusAttr],
+            expiryTimestamp: item[this.expiryAttr],
+            inProgressExpiryTimestamp: item[this.inProgressExpiryAttr],
+            responseData: item[this.dataAttr],
+            payloadHash: item[this.validationKeyAttr],
+          })
+        );
       }
 
       throw error;

packages/idempotency/tests/unit/persistence/DynamoDbPersistenceLayer.test.ts

@@ -12,13 +12,12 @@ import { IdempotencyRecord } from '../../../src/persistence';
 import type { DynamoDBPersistenceOptions } from '../../../src/types';
 import { IdempotencyRecordStatus } from '../../../src';
 import {
+  ConditionalCheckFailedException,
   DynamoDBClient,
-  //DynamoDBServiceException,
   PutItemCommand,
   GetItemCommand,
   UpdateItemCommand,
   DeleteItemCommand,
-  ConditionalCheckFailedException,
 } from '@aws-sdk/client-dynamodb';
 import { marshall } from '@aws-sdk/util-dynamodb';
 import { mockClient } from 'aws-sdk-client-mock';
@@ -397,7 +396,6 @@ describe('Class: DynamoDBPersistenceLayer', () => {
       });
       client.on(PutItemCommand).rejects(
         new ConditionalCheckFailedException({
-          //$fault: 'client',
           $metadata: {
             httpStatusCode: 400,
             requestId: 'someRequestId',
@@ -408,7 +406,6 @@ describe('Class: DynamoDBPersistenceLayer', () => {
             status: { S: 'INPROGRESS' },
             expiration: { N: Date.now().toString() },
           },
-          //name: 'ConditionalCheckFailedException',
         })
       );
 
@@ -710,7 +707,7 @@ describe('Class: DynamoDBPersistenceLayer', () => {
       })
     );
     await expect(persistenceLayer._putRecord(mockRecord)).rejects.toThrowError(
-      'Item is undefined'
+      'item is undefined'
     );
   });
 });