@squiz/db-lib 1.77.3 → 1.77.4

package/src/externalized/ExternalizedDynamoDbRepository.spec.ts

@@ -189,7 +189,7 @@ describe('ExternalizedDynamoDbRepository', () => {
         if (callCount === 1) {
           // First call fails with size limit error
           const error = new Error('Item size has exceeded the maximum allowed size');
-          (error as any).code = 'ValidationException';
+          error.name = 'ValidationException';
           throw error;
         }
         // Second call succeeds
@@ -453,38 +453,24 @@ describe('ExternalizedDynamoDbRepository', () => {
   });
 
   describe('isDynamoItemSizeLimitError', () => {
-    it('detects ValidationException with size message', () => {
+    it('returns true for ValidationException with size message', () => {
       const repo = new TestRepo(createDbManager(), createStorage());
       const error = {
-        code: 'ValidationException',
+        name: 'ValidationException',
         message: 'Item size has exceeded the maximum allowed size',
       };
 
       expect(repo.testIsDynamoItemSizeLimitError(error)).toBe(true);
     });
 
-    it('detects TransactionCanceledException with size in cancellation reasons', () => {
+    it('returns false for ValidationException without the DynamoDB size limit message', () => {
       const repo = new TestRepo(createDbManager(), createStorage());
       const error = {
-        code: 'TransactionCanceledException',
-        CancellationReasons: [
-          {
-            Code: 'ValidationException',
-            Message: 'Item size exceeded 400 KB limit',
-          },
-        ],
-      };
-
-      expect(repo.testIsDynamoItemSizeLimitError(error)).toBe(true);
-    });
-
-    it('detects size keywords in error message', () => {
-      const repo = new TestRepo(createDbManager(), createStorage());
-      const error = {
-        message: 'The item size exceeds the maximum allowed size',
+        name: 'ValidationException',
+        message: 'Invalid UpdateExpression',
       };
 
-      expect(repo.testIsDynamoItemSizeLimitError(error)).toBe(true);
+      expect(repo.testIsDynamoItemSizeLimitError(error)).toBe(false);
     });
 
     it('returns false for non-size-related errors', () => {

package/src/externalized/ExternalizedDynamoDbRepository.ts

@@ -16,6 +16,8 @@ import { DynamoDbManager, Transaction } from '../dynamodb/DynamoDbManager';
 // Local
 import { S3ExternalStorage, S3StorageLocation } from '../s3/S3ExternalStorage';
 
+const DYNAMO_ITEM_SIZE_LIMIT_ERROR_MESSAGE = 'Item size has exceeded the maximum allowed size';
+
 /**
  * The ExternalizedDynamoDbRepository class is used to store and retrieve externalized items from DynamoDB and S3.
  * @class ExternalizedDynamoDbRepository
@@ -592,46 +594,6 @@ export abstract class ExternalizedDynamoDbRepository<
     }
 
     const err = error as Record<string, unknown>;
-    const cancellationReasons = (err?.CancellationReasons ?? err?.cancellationReasons) as
-      | Array<Record<string, unknown>>
-      | undefined;
-    const validationCodes = ['ValidationException', 'TransactionCanceledException'];
-
-    const hasValidationCode =
-      validationCodes.includes(err?.code as string) ||
-      validationCodes.includes(err?.name as string) ||
-      validationCodes.includes((err?.originalError as Record<string, unknown>)?.code as string) ||
-      validationCodes.includes((err?.originalError as Record<string, unknown>)?.name as string) ||
-      (Array.isArray(cancellationReasons) &&
-        cancellationReasons.some((reason) => validationCodes.includes((reason?.Code ?? reason?.code) as string)));
-
-    const hasSizeMessage =
-      this.hasDynamoSizeKeyword(err?.message as string) ||
-      this.hasDynamoSizeKeyword((err?.originalError as Record<string, unknown>)?.message as string) ||
-      (Array.isArray(cancellationReasons) &&
-        cancellationReasons.some((reason) =>
-          this.hasDynamoSizeKeyword((reason?.Message ?? reason?.message) as string),
-        ));
-
-    return hasValidationCode || hasSizeMessage;
-  }
-
-  /**
-   * Check if the message contains the DynamoDB size keyword.
-   * @param {string} message - The message to check.
-   * @returns {boolean} True if the message contains the DynamoDB size keyword, false otherwise.
-   */
-  private hasDynamoSizeKeyword(message?: string): boolean {
-    if (typeof message !== 'string') {
-      return false;
-    }
-    const normalized = message.toLowerCase();
-    return (
-      normalized.includes('item size') ||
-      normalized.includes('maximum allowed size') ||
-      normalized.includes('exceeds') ||
-      normalized.includes('400 kb') ||
-      normalized.includes('400kb')
-    );
+    return err.name === 'ValidationException' && err.message === DYNAMO_ITEM_SIZE_LIMIT_ERROR_MESSAGE;
   }
 }