@aws-amplify/graphql-model-transformer 0.16.10-alpha.0 → 0.16.10-alpha.74

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

@@ -37,4 +37,33 @@ describe('ModelTransformer: ', () => {
     expect(postStack).toMatchSnapshot();
     expect(commentStack).toMatchSnapshot();
   });
+
+  it('should not override model objects when override file does not exist', () => {
+    const validSchema = `
+      type Post @model {
+        id: ID!
+        comments: [Comment]
+      }
+      type Comment @model{
+        id: String!
+        text: String!
+      }
+    `;
+    const transformer = new GraphQLTransform({
+      transformers: [new ModelTransformer()],
+      overrideConfig: {
+        overrideDir: path.join(__dirname, 'non-existing-override-directory'),
+        overrideFlag: true,
+        resourceName: 'myResource',
+      },
+      featureFlags,
+    });
+    const out = transformer.transform(validSchema);
+    expect(out).toBeDefined();
+    const postStack = out.stacks.Post;
+    const commentStack = out.stacks.Comment;
+
+    expect(postStack).toMatchSnapshot();
+    expect(commentStack).toMatchSnapshot();
+  });
 });

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

@@ -13,7 +13,7 @@ import {
   verifyInputCount,
   verifyMatchingTypes,
 } from './test-utils/helpers';
-import { expect as cdkExpect, haveResource, haveResourceLike } from '@aws-cdk/assert';
+import { Template } from 'aws-cdk-lib/assertions';
 
 const featureFlags = {
   getBoolean: jest.fn(),
@@ -1027,8 +1027,8 @@ describe('ModelTransformer: ', () => {
 
     const iamStackResource = out.stacks.ThisIsAVeryLongNameModelThatShouldNotGenerateIAMRoleNamesOver64Characters;
     expect(iamStackResource).toBeDefined();
-    cdkExpect(iamStackResource).to(
-      haveResource('AWS::IAM::Role', {
+    Template.fromJSON(iamStackResource)
+      .hasResourceProperties('AWS::IAM::Role', {
         AssumeRolePolicyDocument: {
           Statement: [
             {
@@ -1056,8 +1056,7 @@ describe('ModelTransformer: ', () => {
             ],
           ],
         },
-      }),
-    );
+      });
 
     validateModelSchema(parsed);
   });
@@ -1122,8 +1121,8 @@ describe('ModelTransformer: ', () => {
     expect(out.resolvers['Query.syncTodos.req.vtl']).toMatchSnapshot();
     expect(out.resolvers['Query.syncTodos.res.vtl']).toMatchSnapshot();
     // ds table
-    cdkExpect(out.rootStack).to(
-      haveResource('AWS::DynamoDB::Table', {
+    Template.fromJSON(out.rootStack)
+      .hasResourceProperties('AWS::DynamoDB::Table', {
         KeySchema: [
           {
             AttributeName: 'ds_pk',
@@ -1167,8 +1166,7 @@ describe('ModelTransformer: ', () => {
           AttributeName: '_ttl',
           Enabled: true,
         },
-      }),
-    );
+      });
   });
   it("the conflict detection of per model rule should be respected", () => {
     const validSchema = `
@@ -1212,50 +1210,44 @@ describe('ModelTransformer: ', () => {
     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",
-          }
+    Template.fromJSON(todoStack).hasResourceProperties(
+      "AWS::AppSync::FunctionConfiguration",
+      {
+        SyncConfig: {
+          ConflictDetection: "VERSION",
+          ConflictHandler: "LAMBDA",
         }
-      )
+      }
     );
-    cdkExpect(todoStack).notTo(
-      haveResourceLike(
-        "AWS::AppSync::FunctionConfiguration",
-        {
-          SyncConfig: {
-            ConflictDetection: "VERSION",
-            ConflictHandler: "AUTOMERGE",
-          }
+    Template.fromJSON(todoStack).resourcePropertiesCountIs(
+      "AWS::AppSync::FunctionConfiguration",
+      {
+        SyncConfig: {
+          ConflictDetection: "VERSION",
+          ConflictHandler: "AUTOMERGE",
         }
-      )
+      },
+      0
     );
     // Author stack should have automerge for conflict detect rather than lambda
-    cdkExpect(authorStack).notTo(
-      haveResourceLike(
-        "AWS::AppSync::FunctionConfiguration",
-        {
-          SyncConfig: {
-            ConflictDetection: "VERSION",
-            ConflictHandler: "LAMBDA",
-          }
+    Template.fromJSON(authorStack).resourcePropertiesCountIs(
+      "AWS::AppSync::FunctionConfiguration",
+      {
+        SyncConfig: {
+          ConflictDetection: "VERSION",
+          ConflictHandler: "LAMBDA",
         }
-      )
+      },
+      0
     );
-    cdkExpect(authorStack).to(
-      haveResourceLike(
-        "AWS::AppSync::FunctionConfiguration",
-        {
-          SyncConfig: {
-            ConflictDetection: "VERSION",
-            ConflictHandler: "AUTOMERGE",
-          }
+    Template.fromJSON(authorStack).hasResourceProperties(
+      "AWS::AppSync::FunctionConfiguration",
+      {
+        SyncConfig: {
+          ConflictDetection: "VERSION",
+          ConflictHandler: "AUTOMERGE",
         }
-      )
+      }
     );
 
   });

package/src/graphql-model-transformer.ts

@@ -35,11 +35,11 @@ import {
   StreamViewType,
   Table,
   TableEncryption,
-} from '@aws-cdk/aws-dynamodb';
-import * as iam from '@aws-cdk/aws-iam';
-import { CfnRole } from '@aws-cdk/aws-iam';
-import * as cdk from '@aws-cdk/core';
-import { CfnDataSource } from '@aws-cdk/aws-appsync';
+} from 'aws-cdk-lib/aws-dynamodb';
+import * as iam from 'aws-cdk-lib/aws-iam';
+import { CfnRole } from 'aws-cdk-lib/aws-iam';
+import * as cdk from 'aws-cdk-lib';
+import { CfnDataSource } from 'aws-cdk-lib/aws-appsync';
 import {
   DirectiveNode,
   FieldDefinitionNode,
@@ -1238,6 +1238,10 @@ export class ModelTransformer extends TransformerModelBase implements Transforme
     });
     const cfnTable = table.node.defaultChild as CfnTable;
 
+    // CDK started to append hash to logical id of dynamodb table.
+    // This line overrides that behavior to avoid deletion and re-creation of existing tables.
+    cfnTable.overrideLogicalId(tableLogicalName);
+
     cfnTable.provisionedThroughput = cdk.Fn.conditionIf(usePayPerRequestBilling.logicalId, cdk.Fn.ref('AWS::NoValue'), {
       ReadCapacityUnits: readIops,
       WriteCapacityUnits: writeIops,