@aws-amplify/graphql-model-transformer 0.16.7 → 0.16.8

package/CHANGELOG.md

@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.16.8](https://github.com/aws-amplify/amplify-category-api/compare/@aws-amplify/graphql-model-transformer@0.16.7...@aws-amplify/graphql-model-transformer@0.16.8) (2023-02-10)
+
+### Bug Fixes
+
+- **transformer:** conflict detection respects to per model rule ([#1201](https://github.com/aws-amplify/amplify-category-api/issues/1201)) ([9fd7e16](https://github.com/aws-amplify/amplify-category-api/commit/9fd7e166c78c265c704653213adce47a5c8a55f7))
+
 ## [0.16.7](https://github.com/aws-amplify/amplify-category-api/compare/@aws-amplify/graphql-model-transformer@0.16.6...@aws-amplify/graphql-model-transformer@0.16.7) (2023-01-26)
 
 **Note:** Version bump only for package @aws-amplify/graphql-model-transformer

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/graphql-model-transformer",
-  "version": "0.16.7",
+  "version": "0.16.8",
   "description": "Amplify graphql @model transformer",
   "repository": {
     "type": "git",
@@ -29,7 +29,7 @@
     "extract-api": "ts-node ../../scripts/extract-api.ts"
   },
   "dependencies": {
-    "@aws-amplify/graphql-transformer-core": "0.18.3",
+    "@aws-amplify/graphql-transformer-core": "0.18.4",
     "@aws-amplify/graphql-transformer-interfaces": "1.14.12",
     "@aws-cdk/aws-applicationautoscaling": "~1.172.0",
     "@aws-cdk/aws-appsync": "~1.172.0",
@@ -72,5 +72,5 @@
       "overrides"
     ]
   },
-  "gitHead": "5cf9a2cdc6ab0eab7e0eb7e4d7e5458f2007f6a8"
+  "gitHead": "f1a6a2b90de01421f8aa1b5de524533bcc76c5a0"
 }

package/src/__tests__/model-transformer.test.ts

@@ -13,7 +13,7 @@ import {
   verifyInputCount,
   verifyMatchingTypes,
 } from './test-utils/helpers';
-import { expect as cdkExpect, haveResource } from '@aws-cdk/assert';
+import { expect as cdkExpect, haveResource, haveResourceLike } from '@aws-cdk/assert';
 
 const featureFlags = {
   getBoolean: jest.fn(),
@@ -1170,7 +1170,95 @@ describe('ModelTransformer: ', () => {
       }),
     );
   });
+  it("the conflict detection of per model rule should be respected", () => {
+    const validSchema = `
+      type Todo @model {
+        name: String
+      }
+      type Author @model {
+        name: String
+      }
+    `;
+
+    const transformer = new GraphQLTransform({
+      transformConfig: {},
+      resolverConfig: {
+        project: {
+          ConflictDetection: "VERSION",
+          ConflictHandler: ConflictHandlerType.AUTOMERGE
+        },
+        models: {
+          Todo: {
+            ConflictDetection: "VERSION",
+            ConflictHandler: ConflictHandlerType.LAMBDA,
+            LambdaConflictHandler: {
+              name: "myTodoConflictHandler"
+            }
+          },
+          Author: {
+            ConflictDetection: "VERSION",
+            ConflictHandler: ConflictHandlerType.AUTOMERGE
+          }
+        }
+      },
+      sandboxModeEnabled: true,
+      transformers: [new ModelTransformer()]
+    });
+    const out = transformer.transform(validSchema);
+    expect(out).toBeDefined();
+    const schema = parse(out.schema);
+    validateModelSchema(schema);
+    // nested stacks for models
+    const todoStack = out.stacks["Todo"];
+    const authorStack = out.stacks["Author"];
+    // Todo stack should have lambda for conflict detect rather than auto merge
+    cdkExpect(todoStack).to(
+      haveResourceLike(
+        "AWS::AppSync::FunctionConfiguration",
+        {
+          SyncConfig: {
+            ConflictDetection: "VERSION",
+            ConflictHandler: "LAMBDA",
+          }
+        }
+      )
+    );
+    cdkExpect(todoStack).notTo(
+      haveResourceLike(
+        "AWS::AppSync::FunctionConfiguration",
+        {
+          SyncConfig: {
+            ConflictDetection: "VERSION",
+            ConflictHandler: "AUTOMERGE",
+          }
+        }
+      )
+    );
+    // Author stack should have automerge for conflict detect rather than lambda
+    cdkExpect(authorStack).notTo(
+      haveResourceLike(
+        "AWS::AppSync::FunctionConfiguration",
+        {
+          SyncConfig: {
+            ConflictDetection: "VERSION",
+            ConflictHandler: "LAMBDA",
+          }
+        }
+      )
+    );
+    cdkExpect(authorStack).to(
+      haveResourceLike(
+        "AWS::AppSync::FunctionConfiguration",
+        {
+          SyncConfig: {
+            ConflictDetection: "VERSION",
+            ConflictHandler: "AUTOMERGE",
+          }
+        }
+      )
+    );
 
+  });
   it('should add the model parameters at the root sack', () => {
     const modelParams = {
       DynamoDBModelTableReadIOPS: expect.objectContaining({