Merge branch 'main' into feat/add-deny-list-to-origin-request-policy-behaviors

mergify[bot] · web-flow · commit 6e2437beffca · 2023-07-07T13:10:39.000Z
diff --git a/packages/aws-cdk-lib/aws-apigateway/lib/method.ts b/packages/aws-cdk-lib/aws-apigateway/lib/method.ts
@@ -203,7 +203,7 @@ export class Method extends Resource {
       authorizer._attachToApi(this.api);
     }
 
-    this.methodResponses = options.methodResponses ?? [];
+    this.methodResponses = options.methodResponses ?? defaultMethodOptions.methodResponses ?? [];
 
     const integration = props.integration ?? this.resource.defaultIntegration ?? new MockIntegration();
     const bindResult = integration.bind(this);
diff --git a/packages/aws-cdk-lib/aws-apigateway/test/method.test.ts b/packages/aws-cdk-lib/aws-apigateway/test/method.test.ts
@@ -909,6 +909,38 @@ describe('method', () => {
 
   });
 
+  test('methodResponse should be passed from defaultMethodOptions', () => {
+    // GIVEN
+    const stack = new cdk.Stack();
+    const api = new apigw.RestApi(stack, 'test-api', {
+      cloudWatchRole: false,
+      deploy: false,
+      defaultMethodOptions: {
+        requestParameters: { 'method.request.path.proxy': true },
+        methodResponses: [
+          {
+            statusCode: '200',
+          },
+        ],
+      },
+    });
+
+    // WHEN
+    new apigw.Method(stack, 'method-man', {
+      httpMethod: 'GET',
+      resource: api.root,
+    });
+
+    // THEN
+    Template.fromStack(stack).hasResourceProperties('AWS::ApiGateway::Method', {
+      HttpMethod: 'GET',
+      MethodResponses: [{
+        StatusCode: '200',
+      }],
+    });
+
+  });
+
   describe('Metrics', () => {
     test('metric', () => {
       // GIVEN

Original file line number	Diff line number	Diff line change
`@@ -203,7 +203,7 @@ export class Method extends Resource {`
`203`	`203`	`authorizer._attachToApi(this.api);`
`204`	`204`	`}`
`205`	`205`
`206`		`- this.methodResponses = options.methodResponses ?? [];`
	`206`	`+ this.methodResponses = options.methodResponses ?? defaultMethodOptions.methodResponses ?? [];`
`207`	`207`
`208`	`208`	`const integration = props.integration ?? this.resource.defaultIntegration ?? new MockIntegration();`
`209`	`209`	`const bindResult = integration.bind(this);`