@aws-amplify/graphql-model-transformer 0.7.0-auth-dir-v-next.4 → 0.8.0-beta.0

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

@@ -13,6 +13,7 @@ import {
   verifyInputCount,
   verifyMatchingTypes,
 } from './test-utils/helpers';
+import { expect as cdkExpect, haveResource } from '@aws-cdk/assert';
 
 const featureFlags = {
   getBoolean: jest.fn(),
@@ -912,7 +913,7 @@ describe('ModelTransformer: ', () => {
     validateModelSchema(parse(definition));
   });
 
-  it('should generate sync resolver with ConflictHandlerType.Lambda', () => {
+  it('should generate sync resolver with ConflictHandlerType.LAMBDA', () => {
     const validSchema = `
       type Post @model {
           id: ID!
@@ -983,24 +984,76 @@ describe('ModelTransformer: ', () => {
     validateModelSchema(parse(definition));
   });
 
-  it('should support sandbox mode of api', async () => {
+  it('should generate iam role names under 64 chars and subscriptions under 50', () => {
     const validSchema = `
-      type AMPLIFY_GLOBAL @allow_public_data_access_with_api_key(in: "staging")
-
-      type Post @model {
+      type ThisIsAVeryLongNameModelThatShouldNotGenerateIAMRoleNamesOver64Characters @model {
           id: ID!
           title: String!
       }
     `;
 
+    const config: SyncConfig = {
+      ConflictDetection: 'VERSION',
+      ConflictHandler: ConflictHandlerType.AUTOMERGE,
+    };
+
     const transformer = new GraphQLTransform({
       transformers: [new ModelTransformer()],
       featureFlags,
+      transformConfig: {
+        ResolverConfig: {
+          project: config,
+        },
+      },
     });
-
     const out = transformer.transform(validSchema);
     expect(out).toBeDefined();
 
-    parse(out.schema);
+    const definition = out.schema;
+    expect(definition).toBeDefined();
+
+    const parsed = parse(definition);
+    const subscriptionType = getObjectType(parsed, 'Subscription');
+    expect(subscriptionType).toBeDefined();
+
+    subscriptionType!.fields!.forEach(it => {
+      expect(it.name.value.length <= 50).toBeTruthy();
+    });
+
+    const iamStackResource = out.stacks.ThisIsAVeryLongNameModelThatShouldNotGenerateIAMRoleNamesOver64Characters;
+    expect(iamStackResource).toBeDefined();
+    cdkExpect(iamStackResource).to(
+      haveResource('AWS::IAM::Role', {
+        AssumeRolePolicyDocument: {
+          Statement: [
+            {
+              Action: 'sts:AssumeRole',
+              Effect: 'Allow',
+              Principal: {
+                Service: 'appsync.amazonaws.com',
+              },
+            },
+          ],
+          Version: '2012-10-17',
+        },
+        RoleName: {
+          'Fn::Join': [
+            '',
+            [
+              'ThisIsAVeryLongNameM2d9fca-',
+              {
+                Ref: 'referencetotransformerrootstackGraphQLAPI20497F53ApiId',
+              },
+              '-',
+              {
+                Ref: 'referencetotransformerrootstackenv10C5A902Ref',
+              },
+            ],
+          ],
+        },
+      }),
+    );
+
+    validateModelSchema(parsed);
   });
 });

package/src/graphql-model-transformer.ts

@@ -78,6 +78,7 @@ import {
   ObjectDefinitionWrapper,
 } from './wrappers/object-definition-wrapper';
 import { CfnRole } from '@aws-cdk/aws-iam';
+import md5 from 'md5';
 
 export type Nullable<T> = T | null;
 export type OptionalAndNullable<T> = Partial<T>;
@@ -176,14 +177,17 @@ export class ModelTransformer extends TransformerModelBase implements Transforme
     }
     // todo: get model configuration with default values and store it in the map
     const typeName = definition.name.value;
+
+    if (ctx.isProjectUsingDataStore()) {
+      SyncUtils.validateResolverConfigForType(ctx, typeName);
+    }
+
     const directiveWrapped: DirectiveWrapper = new DirectiveWrapper(directive);
     const options = directiveWrapped.getArguments({
       queries: {
         get: toCamelCase(['get', typeName]),
         list: toCamelCase(['list', plurality(typeName, true)]),
-        ...((ctx as TransformerContextProvider).isProjectUsingDataStore()
-          ? { sync: toCamelCase(['sync', plurality(typeName, true)]) }
-          : undefined),
+        ...(ctx.isProjectUsingDataStore() ? { sync: toCamelCase(['sync', plurality(typeName, true)]) } : undefined),
       },
       mutations: {
         create: toCamelCase(['create', typeName]),
@@ -192,9 +196,9 @@ export class ModelTransformer extends TransformerModelBase implements Transforme
       },
       subscriptions: {
         level: SubscriptionLevel.on,
-        onCreate: [toCamelCase(['onCreate', typeName])],
-        onDelete: [toCamelCase(['onDelete', typeName])],
-        onUpdate: [toCamelCase(['onUpdate', typeName])],
+        onCreate: [this.ensureValidSubscriptionName(toCamelCase(['onCreate', typeName]))],
+        onDelete: [this.ensureValidSubscriptionName(toCamelCase(['onDelete', typeName]))],
+        onUpdate: [this.ensureValidSubscriptionName(toCamelCase(['onUpdate', typeName]))],
       },
       timestamps: {
         createdAt: 'createdAt',
@@ -237,7 +241,6 @@ export class ModelTransformer extends TransformerModelBase implements Transforme
       this.addAutoGeneratableFields(ctx, type);
 
       if (ctx.isProjectUsingDataStore()) {
-        this.options.SyncConfig = SyncUtils.getSyncConfig(ctx as TransformerContextProvider, def!.name.value);
         this.addModelSyncFields(ctx, type);
       }
     }
@@ -1072,7 +1075,7 @@ export class ModelTransformer extends TransformerModelBase implements Transforme
       stream: StreamViewType.NEW_AND_OLD_IMAGES,
       encryption: TableEncryption.DEFAULT,
       removalPolicy: removalPolicy,
-      ...(this.options.SyncConfig ? { timeToLiveAttribute: '_ttl' } : undefined),
+      ...(context.isProjectUsingDataStore() ? { timeToLiveAttribute: '_ttl' } : undefined),
     });
     const cfnTable = table.node.defaultChild as CfnTable;
 
@@ -1129,7 +1132,7 @@ export class ModelTransformer extends TransformerModelBase implements Transforme
     const cfnDataSource = dataSource.node.defaultChild as CfnDataSource;
     cfnDataSource.addDependsOn(role.node.defaultChild as CfnRole);
 
-    if (this.options.SyncConfig) {
+    if (context.isProjectUsingDataStore()) {
       const datasourceDynamoDb = cfnDataSource.dynamoDbConfig as any;
       datasourceDynamoDb.deltaSyncConfig = {
         deltaSyncTableName: context.resourceHelper.generateResourceName(SyncResourceIDs.syncTableName),
@@ -1153,7 +1156,7 @@ export class ModelTransformer extends TransformerModelBase implements Transforme
   }
 
   private createIAMRole(context: TransformerContextProvider, def: ObjectTypeDefinitionNode, stack: cdk.Stack, tableName: string) {
-    const roleName = context.resourceHelper.generateResourceName(ModelResourceIDs.ModelTableIAMRoleID(def!.name.value));
+    const roleName = context.resourceHelper.generateIAMRoleName(ModelResourceIDs.ModelTableIAMRoleID(def!.name.value));
     const role = new iam.Role(stack, ModelResourceIDs.ModelTableIAMRoleID(def!.name.value), {
       roleName: roleName,
       assumedBy: new iam.ServicePrincipal('appsync.amazonaws.com'),
@@ -1184,7 +1187,7 @@ export class ModelTransformer extends TransformerModelBase implements Transforme
               cdk.Fn.sub('arn:aws:dynamodb:${AWS::Region}:${AWS::AccountId}:table/${tablename}/*', {
                 tablename: tableName,
               }),
-              ...(this.options.SyncConfig
+              ...(context.isProjectUsingDataStore()
                 ? [
                     // eslint-disable-next-line no-template-curly-in-string
                     cdk.Fn.sub('arn:aws:dynamodb:${AWS::Region}:${AWS::AccountId}:table/${tablename}', {
@@ -1202,13 +1205,10 @@ export class ModelTransformer extends TransformerModelBase implements Transforme
       }),
     );
 
-    if (this.options.SyncConfig && SyncUtils.isLambdaSyncConfig(this.options.SyncConfig)) {
+    const syncConfig = SyncUtils.getSyncConfig(context, def!.name.value);
+    if (syncConfig && SyncUtils.isLambdaSyncConfig(syncConfig)) {
       role.attachInlinePolicy(
-        SyncUtils.createSyncLambdaIAMPolicy(
-          stack,
-          this.options.SyncConfig.LambdaConflictHandler.name,
-          this.options.SyncConfig.LambdaConflictHandler.region,
-        ),
+        SyncUtils.createSyncLambdaIAMPolicy(stack, syncConfig.LambdaConflictHandler.name, syncConfig.LambdaConflictHandler.region),
       );
     }
     return role;
@@ -1228,4 +1228,10 @@ export class ModelTransformer extends TransformerModelBase implements Transforme
       ...options,
     };
   };
+
+  private ensureValidSubscriptionName = (name: string): string => {
+    if (name.length <= 50) return name;
+
+    return name.slice(0, 45) + md5(name).slice(0, 5);
+  };
 }

package/src/graphql-types/query.ts

@@ -13,7 +13,7 @@ export const makeListQueryFilterInput = (
 export const makeListQueryModel = (type: ObjectTypeDefinitionNode, modelName: string, isSyncEnabled: boolean): ObjectTypeDefinitionNode => {
   const outputType = ObjectDefinitionWrapper.create(modelName);
 
-  outputType.addField(FieldWrapper.create('items', type.name.value, true, true));
+  outputType.addField(FieldWrapper.create('items', type.name.value, false, true));
   outputType.addField(FieldWrapper.create('nextToken', 'String', true, false));
 
   if (isSyncEnabled) {

package/src/resolvers/common.ts

@@ -99,7 +99,7 @@ export const generateResolverKey = (typeName: string, fieldName: string): string
  * @param ctx context to get sandbox mode
  */
 export const generateAuthExpressionForSandboxMode = (ctx: any): string => {
-  let enabled = ctx.resourceHelper.api.globalSandboxModeEnabled;
+  const enabled = ctx.resourceHelper.api.sandboxModeEnabled;
   let exp;
 
   if (enabled) exp = iff(notEquals(methodCall(ref('util.authType')), str(API_KEY)), methodCall(ref('util.unauthorized')));

package/src/resolvers/mutation.ts

@@ -152,8 +152,6 @@ export const generateUpdateRequestTemplate = (modelName: string, isSyncEnabled:
  */
 export const generateCreateRequestTemplate = (modelName: string): string => {
   const statements: Expression[] = [
-    // set key the condition
-    ...generateKeyConditionTemplate(false),
     // Generate conditions
     comment('Set the default values to put request'),
     set(ref('mergedValues'), methodCall(ref('util.defaultIfNull'), ref('ctx.stash.defaultValues'), obj({}))),
@@ -174,7 +172,6 @@ export const generateCreateRequestTemplate = (modelName: string): string => {
     ),
 
     // add conditions
-
     iff(ref('context.args.condition'), qref(methodCall(ref('ctx.stash.conditions.add'), ref('context.args.condition')))),
     // key conditions
     ...generateKeyConditionTemplate(false),

package/src/resolvers/query.ts

@@ -34,13 +34,18 @@ export const generateGetRequestTemplate = (): string => {
       ref('ctx.stash.metadata.modelObjectKey'),
       compoundExpression([
         set(ref('expression'), str('')),
+        set(ref('expressionNames'), obj({})),
         set(ref('expressionValues'), obj({})),
         forEach(ref('item'), ref('ctx.stash.metadata.modelObjectKey.entrySet()'), [
-          set(ref('expression'), str('$expression$item.key = :$item.key AND ')),
-          qref(methodCall(ref('expressionValues.put'), str(':$item.key'), ref('item.value'))),
+          set(ref('expression'), str('$expression#keyCount$velocityCount = :valueCount$velocityCount AND ')),
+          qref(methodCall(ref('expressionNames.put'), str('#keyCount$velocityCount'), ref('item.key'))),
+          qref(methodCall(ref('expressionValues.put'), str(':valueCount$velocityCount'), ref('item.value'))),
         ]),
         set(ref('expression'), methodCall(ref('expression.replaceAll'), str('AND $'), str(''))),
-        set(ref('query'), obj({ expression: ref('expression'), expressionValues: ref('expressionValues') })),
+        set(
+          ref('query'),
+          obj({ expression: ref('expression'), expressionNames: ref('expressionNames'), expressionValues: ref('expressionValues') }),
+        ),
       ]),
       set(
         ref('query'),
@@ -109,10 +114,7 @@ export const generateListRequestTemplate = (): string => {
       not(isNullOrEmpty(authFilter)),
       compoundExpression([
         set(ref('filter'), authFilter),
-        iff(
-          not(isNullOrEmpty(ref('ctx.args.filter'))),
-          set(ref('filter'), list([obj({ and: list([ref('filter'), ref('ctx.args.filter')]) })])),
-        ),
+        iff(not(isNullOrEmpty(ref('ctx.args.filter'))), set(ref('filter'), obj({ and: list([ref('filter'), ref('ctx.args.filter')]) }))),
       ]),
       iff(not(isNullOrEmpty(ref('ctx.args.filter'))), set(ref('filter'), ref('ctx.args.filter'))),
     ),
@@ -164,10 +166,7 @@ export const generateSyncRequestTemplate = (): string => {
         not(isNullOrEmpty(authFilter)),
         compoundExpression([
           set(ref('filter'), authFilter),
-          iff(
-            not(isNullOrEmpty(ref('ctx.args.filter'))),
-            set(ref('filter'), list([obj({ and: list([ref('filter'), ref('ctx.args.filter')]) })])),
-          ),
+          iff(not(isNullOrEmpty(ref('ctx.args.filter'))), set(ref('filter'), obj({ and: list([ref('filter'), ref('ctx.args.filter')]) }))),
         ]),
         iff(not(isNullOrEmpty(ref('ctx.args.filter'))), set(ref('filter'), ref('ctx.args.filter'))),
       ),

package/src/resolvers/subscriptions.ts

@@ -7,5 +7,5 @@ export const generateSubscriptionRequestTemplate = (): string => {
 
 export const generateSubscriptionResponseTemplate = (): string => {
   const statements: Expression[] = [toJson(nul())];
-  return printBlock('Subscription Resonse template')(compoundExpression(statements));
+  return printBlock('Subscription Response template')(compoundExpression(statements));
 };

package/src/wrappers/object-definition-wrapper.ts

@@ -295,7 +295,7 @@ export class FieldWrapper extends GenericFieldWrapper {
       field.makeNonNullable();
     }
     if (isList) {
-      field.wrapListType();
+      field.wrapListType().makeNonNullable();
     }
     return field;
   };