fix(apigateway): honour requestParameters passed via defaultMethodOpt…

…ions (#4249)

* fix (apigateway): Apply default request parameters to method

* Add operation name check to make sure we're validating the expected method

packages/@aws-cdk/aws-apigateway/lib/method.ts

@@ -126,7 +126,7 @@ export class Method extends Resource {
       apiKeyRequired: options.apiKeyRequired || defaultMethodOptions.apiKeyRequired,
       authorizationType: options.authorizationType || defaultMethodOptions.authorizationType || AuthorizationType.NONE,
       authorizerId: authorizer && authorizer.authorizerId,
-      requestParameters: options.requestParameters,
+      requestParameters: options.requestParameters || defaultMethodOptions.requestParameters,
       integration: this.renderIntegration(props.integration),
       methodResponses: this.renderMethodResponses(options.methodResponses),
       requestModels: this.renderRequestModels(options.requestModels),

packages/@aws-cdk/aws-apigateway/test/test.method.ts

@@ -578,5 +578,36 @@ export = {
     }));
 
     test.done();
-  }
+  },
+
+  'use default requestParameters'(test: Test) {
+    // GIVEN
+    const stack = new cdk.Stack();
+    const api = new apigateway.RestApi(stack, 'test-api', {
+      cloudWatchRole: false,
+      deploy: false,
+      defaultMethodOptions: {
+        requestParameters: {"method.request.path.proxy": true}
+      }
+    });
+
+    // WHEN
+    new apigateway.Method(stack, 'defaultRequestParameters', {
+      httpMethod: 'POST',
+      resource: api.root,
+      options: {
+        operationName: 'defaultRequestParameters'
+      }
+    });
+
+    // THEN
+    expect(stack).to(haveResource('AWS::ApiGateway::Method', {
+      OperationName: 'defaultRequestParameters',
+      RequestParameters: {
+        "method.request.path.proxy": true
+      }
+    }));
+
+    test.done();
+  },
 };