moved table interface and object check to buildDynamoDBTable function

awslabs · Apr 7, 2022 · 8f22294 · 8f22294
1 parent 1476e71
commit 8f22294
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 30 deletions.
diff --git a/source/patterns/@aws-solutions-constructs/core/lib/dynamodb-table-helper.ts b/source/patterns/@aws-solutions-constructs/core/lib/dynamodb-table-helper.ts
@@ -58,7 +58,9 @@ export interface BuildDynamoDBTableWithStreamProps {
 
 export function buildDynamoDBTable(scope: Construct, props: BuildDynamoDBTableProps): [dynamodb.ITable, dynamodb.Table?] {
   // Conditional DynamoDB Table creation
-  if (props.existingTableObj) {
+  if (props.existingTableObj && props.existingTableInterface) {
+    throw new Error('Error - Either provide existingTableInterface or existingTableObj, but not both.');
+  } else if (props.existingTableObj) {
     return [props.existingTableObj, props.existingTableObj];
   } else if (props.existingTableInterface) {
     return [props.existingTableInterface, undefined];

diff --git a/source/patterns/@aws-solutions-constructs/core/lib/input-validation.ts b/source/patterns/@aws-solutions-constructs/core/lib/input-validation.ts
@@ -97,11 +97,6 @@ export function CheckProps(propsObject: VerifiedProps | any) {
     errorFound = true;
   }
 
-  if (propsObject.existingTableObj && propsObject.existingTableInterface) {
-    errorMessages += 'Error - Either provide existingTableInterface or existingTableObj, but not both.\n';
-    errorFound = true;
-  }
-
   if (propsObject.existingStreamObj  && propsObject.kinesisStreamProps) {
     errorMessages += 'Error - Either provide existingStreamObj or kinesisStreamProps, but not both.\n';
     errorFound = true;

diff --git a/source/patterns/@aws-solutions-constructs/core/test/dynamo-table.test.ts b/source/patterns/@aws-solutions-constructs/core/test/dynamo-table.test.ts
@@ -390,3 +390,27 @@ test('test getPartitionKeyNameFromTable()', () => {
 
   expect(testKeyName).toEqual(partitionKeyName);
 });
+
+test('Test providing both existingTableInterface and existingTableObj', () => {
+  const stack = new Stack();
+
+  const tableProps: dynamodb.TableProps = {
+    partitionKey: {
+      name: 'table_id',
+      type: dynamodb.AttributeType.STRING
+    },
+    stream: dynamodb.StreamViewType.NEW_IMAGE
+  };
+
+  const existingTableInterface = new dynamodb.Table(stack, 'DynamoTable', tableProps)
+  ;
+  const newProps = {
+    existingTableInterface,
+    existingTableObj: existingTableInterface
+  };
+  const app = () => {
+    defaults.buildDynamoDBTable(stack, newProps);
+  };
+
+  expect(app).toThrowError('Error - Either provide existingTableInterface or existingTableObj, but not both.');
+});
diff --git a/source/patterns/@aws-solutions-constructs/core/test/input-validation.test.ts b/source/patterns/@aws-solutions-constructs/core/test/input-validation.test.ts
@@ -498,28 +498,4 @@ test('Test unsuccessful CheckListValues', () => {
 
   // Assertion
   expect(app).toThrowError('Invalid test value submitted - three');
-});
-
-test('Test providing both existingTableInterface and existingTableObj', () => {
-  const stack = new Stack();
-
-  const tableProps: dynamodb.TableProps = {
-    partitionKey: {
-      name: 'table_id',
-      type: dynamodb.AttributeType.STRING
-    },
-    stream: dynamodb.StreamViewType.NEW_IMAGE
-  };
-
-  const existingTableInterface = new dynamodb.Table(stack, 'DynamoTable', tableProps)
-  ;
-  const newProps = {
-    existingTableInterface,
-    existingTableObj: existingTableInterface
-  };
-  const app = () => {
-    defaults.CheckProps(newProps);
-  };
-
-  expect(app).toThrowError('Error - Either provide existingTableInterface or existingTableObj, but not both.\n');
 });