feat: replace conflictResolution with dataStoreConfiguration

aws-amplify · Feb 23, 2024 · fad2301 · fad2301
1 parent ac27b2f
commit fad2301
Show file tree

Hide file tree

Showing 9 changed files with 373 additions and 157 deletions.
diff --git a/packages/amplify-data-construct/API.md b/packages/amplify-data-construct/API.md
@@ -21,6 +21,7 @@ import { ConflictResolutionStrategy } from '@aws-amplify/graphql-api-construct';
 import { ConflictResolutionStrategyBase } from '@aws-amplify/graphql-api-construct';
 import { CustomConflictResolutionStrategy } from '@aws-amplify/graphql-api-construct';
 import { CustomSqlDataSourceStrategy } from '@aws-amplify/graphql-api-construct';
+import { DataStoreConfiguration } from '@aws-amplify/graphql-api-construct';
 import { DefaultDynamoDbModelDataSourceStrategy } from '@aws-amplify/graphql-api-construct';
 import { FunctionSlot } from '@aws-amplify/graphql-api-construct';
 import { FunctionSlotBase } from '@aws-amplify/graphql-api-construct';
@@ -87,6 +88,8 @@ export { CustomConflictResolutionStrategy }
 
 export { CustomSqlDataSourceStrategy }
 
+export { DataStoreConfiguration }
+
 export { DefaultDynamoDbModelDataSourceStrategy }
 
 export { FunctionSlot }

diff --git a/packages/amplify-data-construct/src/index.ts b/packages/amplify-data-construct/src/index.ts
@@ -16,6 +16,7 @@ import {
   ConflictResolutionStrategyBase,
   CustomConflictResolutionStrategy,
   CustomSqlDataSourceStrategy,
+  DataStoreConfiguration,
   DefaultDynamoDbModelDataSourceStrategy,
   FunctionSlot,
   FunctionSlotBase,
@@ -67,6 +68,7 @@ export {
   ConflictResolutionStrategyBase,
   CustomConflictResolutionStrategy,
   CustomSqlDataSourceStrategy,
+  DataStoreConfiguration,
   DefaultDynamoDbModelDataSourceStrategy,
   FunctionSlot,
   FunctionSlotBase,

diff --git a/...l-api-construct-tests/src/__tests__/backends/amplify-table/simple-todo/updateIndex/app.ts b/...l-api-construct-tests/src/__tests__/backends/amplify-table/simple-todo/updateIndex/app.ts
@@ -30,7 +30,7 @@ const api = new AmplifyGraphqlApi(stack, 'GraphqlApi', {
   authorizationModes: {
     apiKeyConfig: { expires: Duration.days(7) },
   },
-  conflictResolution: {
+  dataStoreConfiguration: {
     project: {
       detectionType: 'VERSION',
       handlerType: 'AUTOMERGE',