Merge branch 'master' into feature/authorization_within_httpdatasource

Author: haruharuharuby

packages/@aws-cdk/aws-apigateway/lib/usage-plan.ts

@@ -248,8 +248,8 @@ export class UsagePlan extends Resource {
       validateInteger(rateLimit, 'Throttle rate limit');
 
       ret = {
-        burstLimit: burstLimit ? burstLimit : undefined,
-        rateLimit: rateLimit ? rateLimit : undefined,
+        burstLimit: burstLimit,
+        rateLimit: rateLimit,
       };
     }
     return ret!;

packages/@aws-cdk/aws-apigateway/test/test.usage-plan.ts

@@ -34,7 +34,7 @@ export = {
     const api = new apigateway.RestApi(stack, 'my-api', { cloudWatchRole: false, deploy: true, deployOptions: { stageName: 'test' } });
     const method: apigateway.Method = api.root.addMethod('GET'); // Need at least one method on the api
     const usagePlanName = 'Basic';
-    const usagePlanDescription = 'Basic Usage Plan with no throttling limits';
+    const usagePlanDescription = 'Basic Usage Plan with throttling limits';
 
     // WHEN
     new apigateway.UsagePlan(stack, 'my-usage-plan', {
@@ -82,6 +82,60 @@ export = {
 
   },
 
+  'usage plan with blocked methods'(test: Test) {
+    // GIVEN
+    const stack = new cdk.Stack();
+    const api = new apigateway.RestApi(stack, 'my-api', { cloudWatchRole: false, deploy: true, deployOptions: { stageName: 'test' } });
+    const method: apigateway.Method = api.root.addMethod('GET'); // Need at least one method on the api
+    const usagePlanName = 'Basic';
+    const usagePlanDescription = 'Basic Usage Plan with throttling limits';
+
+    // WHEN
+    new apigateway.UsagePlan(stack, 'my-usage-plan', {
+      name: usagePlanName,
+      description: usagePlanDescription,
+      apiStages: [
+        {
+          stage: api.deploymentStage,
+          throttle: [
+            {
+              method,
+              throttle: {
+                burstLimit: 0,
+                rateLimit: 0,
+              },
+            },
+          ],
+        },
+      ],
+    });
+
+    // THEN
+    expect(stack).to(haveResource(RESOURCE_TYPE, {
+      UsagePlanName: usagePlanName,
+      Description: usagePlanDescription,
+      ApiStages: [
+        {
+          ApiId: {
+            Ref: 'myapi4C7BF186',
+          },
+          Stage: {
+            Ref: 'myapiDeploymentStagetest4A4AB65E',
+          },
+          Throttle: {
+            '//GET': {
+              BurstLimit: 0,
+              RateLimit: 0,
+            },
+          },
+        },
+      ],
+    }, ResourcePart.Properties));
+
+    test.done();
+
+  },
+
   'usage plan with quota limits'(test: Test) {
     // GIVEN
     const stack = new cdk.Stack();

packages/@aws-cdk/aws-appsync/README.md

@@ -47,7 +47,7 @@ CDK stack file `app-stack.ts`:
 import * as appsync from '@aws-cdk/aws-appsync';
 import * as db from '@aws-cdk/aws-dynamodb';
 
-const api = new appsync.GraphQLApi(stack, 'Api', {
+const api = new appsync.GraphqlApi(stack, 'Api', {
   name: 'demo',
   schema: appsync.Schema.fromAsset(join(__dirname, 'schema.graphql')),
   authorizationConfig: {
@@ -173,7 +173,7 @@ When declaring your GraphQL Api, CDK defaults to a code-first approach if the
 `schema` property is not configured. 
 
 ```ts
-const api = new appsync.GraphQLApi(stack, 'api', { name: 'myApi' });
+const api = new appsync.GraphqlApi(stack, 'api', { name: 'myApi' });
 ```
 
 CDK will declare a `Schema` class that will give your Api access functions to
@@ -187,7 +187,7 @@ const schema = new appsync.Schema();
 schema.addObjectType('demo', {
   definition: { id: appsync.GraphqlType.id() },
 });
-const api = new appsync.GraphQLApi(stack, 'api', {
+const api = new appsync.GraphqlApi(stack, 'api', {
   name: 'myApi',
   schema
 });
@@ -201,7 +201,7 @@ You can define your GraphQL Schema from a file on disk. For convenience, use
 the `appsync.Schema.fromAsset` to specify the file representing your schema.
 
 ```ts
-const api = appsync.GraphQLApi(stack, 'api', {
+const api = appsync.GraphqlApi(stack, 'api', {
   name: 'myApi',
   schema: appsync.Schema.fromAsset(join(__dirname, 'schema.graphl')),
 });
@@ -210,10 +210,10 @@ const api = appsync.GraphQLApi(stack, 'api', {
 ## Imports
 Any GraphQL Api that has been created outside the stack can be imported from 
 another stack into your CDK app. Utilizing the `fromXxx` function, you have 
-the ability to add data sources and resolvers through a `IGraphQLApi` interface.
+the ability to add data sources and resolvers through a `IGraphqlApi` interface.
 
 ```ts
-const importedApi = appsync.GraphQLApi.fromGraphQLApiAttributes(stack, 'IApi', {
+const importedApi = appsync.GraphqlApi.fromGraphqlApiAttributes(stack, 'IApi', {
   graphqlApiId: api.apiId,
   graphqlArn: api.arn,
 });
@@ -269,7 +269,7 @@ Use the `grant` function for more granular authorization.
 const role = new iam.Role(stack, 'Role', {
   assumedBy: new iam.ServicePrincipal('lambda.amazonaws.com'),
 });
-const api = new appsync.GraphQLApi(stack, 'API', {
+const api = new appsync.GraphqlApi(stack, 'API', {
   definition
 });
 
@@ -401,7 +401,7 @@ to generate our schema.
 import * as appsync from '@aws-cdk/aws-appsync';
 import * as schema from './object-types';
 
-const api = new appsync.GraphQLApi(stack, 'Api', {
+const api = new appsync.GraphqlApi(stack, 'Api', {
   name: 'demo',
 });
 
@@ -548,6 +548,7 @@ Types will be the meat of your GraphQL Schema as they are the types defined by y
 Intermediate Types include:
 - [**Interface Types**](#Interface-Types)
 - [**Object Types**](#Object-Types)
+- [**Input Types**](#Input-Types)
 
 ##### Interface Types
 
@@ -574,7 +575,7 @@ You can create Object Types in three ways:
 
 1. Object Types can be created ***externally***.
     ```ts
-    const api = new appsync.GraphQLApi(stack, 'Api', {
+    const api = new appsync.GraphqlApi(stack, 'Api', {
       name: 'demo',
     });
     const demo = new appsync.ObjectType('Demo', {
@@ -629,7 +630,7 @@ You can create Object Types in three ways:
 
 3. Object Types can be created ***internally*** within the GraphQL API.
     ```ts
-    const api = new appsync.GraphQLApi(stack, 'Api', {
+    const api = new appsync.GraphqlApi(stack, 'Api', {
       name: 'demo',
     });
     api.addType('Demo', {
@@ -641,6 +642,32 @@ You can create Object Types in three ways:
     ```
     > This method provides easy use and is ideal for smaller projects.
 
+##### Input Types
+
+**Input Types** are special types of Intermediate Types. They give users an
+easy way to pass complex objects for top level Mutation and Queries.
+
+```gql
+input Review {
+  stars: Int!
+  commentary: String
+}
+```
+
+The above GraphQL Input Type can be expressed in CDK as the following:
+
+```ts
+const review = new appsync.InputType('Review', {
+  definition: {
+    stars: GraphqlType.int({ isRequired: true }),
+    commentary: GraphqlType.string(),
+  },
+}); 
+api.addType(review);
+```
+
+To learn more about **Input Types**, read the docs [here](https://graphql.org/learn/schema/#input-types).
+
 #### Query
 
 Every schema requires a top level Query type. By default, the schema will look

packages/@aws-cdk/aws-appsync/lib/graphqlapi.ts

@@ -206,7 +206,7 @@ export interface LogConfig {
 /**
  * Properties for an AppSync GraphQL API
  */
-export interface GraphQLApiProps {
+export interface GraphqlApiProps {
   /**
    * the name of the GraphQL API
    */
@@ -293,7 +293,7 @@ export class IamResource {
    *
    * @param api The GraphQL API to give permissions
    */
-  public resourceArns(api: GraphQLApi): string[] {
+  public resourceArns(api: GraphqlApi): string[] {
     return this.arns.map((arn) => Stack.of(api).formatArn({
       service: 'appsync',
       resource: `apis/${api.apiId}`,
@@ -325,7 +325,7 @@ export interface GraphqlApiAttributes {
  *
  * @resource AWS::AppSync::GraphQLApi
  */
-export class GraphQLApi extends GraphqlApiBase {
+export class GraphqlApi extends GraphqlApiBase {
   /**
    * Import a GraphQL API through this function
    *
@@ -362,9 +362,9 @@ export class GraphQLApi extends GraphqlApiBase {
   /**
    * the URL of the endpoint created by AppSync
    *
-   * @attribute
+   * @attribute GraphQlUrl
    */
-  public readonly graphQlUrl: string;
+  public readonly graphqlUrl: string;
 
   /**
    * the name of the API
@@ -387,7 +387,7 @@ export class GraphQLApi extends GraphqlApiBase {
   private api: CfnGraphQLApi;
   private apiKeyResource?: CfnApiKey;
 
-  constructor(scope: Construct, id: string, props: GraphQLApiProps) {
+  constructor(scope: Construct, id: string, props: GraphqlApiProps) {
     super(scope, id);
 
     const defaultMode = props.authorizationConfig?.defaultAuthorization ??
@@ -409,7 +409,7 @@ export class GraphQLApi extends GraphqlApiBase {
 
     this.apiId = this.api.attrApiId;
     this.arn = this.api.attrArn;
-    this.graphQlUrl = this.api.attrGraphQlUrl;
+    this.graphqlUrl = this.api.attrGraphQlUrl;
     this.name = this.api.name;
     this.schema = props.schema ?? new Schema();
     this.schemaResource = this.schema.bind(this);

packages/@aws-cdk/aws-appsync/lib/schema-base.ts

@@ -63,6 +63,30 @@ export interface IField {
   argsToString(): string;
 }
 
+/**
+ * The options to add a field to an Intermediate Type
+ */
+export interface AddFieldOptions {
+  /**
+   * The name of the field
+   *
+   * This option must be configured for Object, Interface,
+   * Input and Enum Types.
+   *
+   * @default - no fieldName
+   */
+  readonly fieldName?: string;
+  /**
+   * The resolvable field to add
+   *
+   * This option must be configured for Object, Interface,
+   * Input and Union Types.
+   *
+   * @default - no IField
+   */
+  readonly field?: IField;
+}
+
 /**
  * Intermediate Types are types that includes a certain set of fields
  * that define the entirety of your schema
@@ -123,10 +147,9 @@ export interface IIntermediateType {
   /**
    * Add a field to this Intermediate Type
    *
-   * @param fieldName - The name of the field
-   * @param field - the resolvable field to add
+   * @param options - the options to add a field
    */
-  addField(fieldName: string, field: IField): void;
+  addField(options: AddFieldOptions): void;
 }
 
 /**