fixed method responses duplication issue

aws · Aug 11, 2023 · 5f8c797 · 5f8c797
1 parent 870a143
commit 5f8c797
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/packages/aws-cdk-lib/aws-apigateway/lib/integrations/stepfunctions.ts b/packages/aws-cdk-lib/aws-apigateway/lib/integrations/stepfunctions.ts
@@ -157,9 +157,7 @@ class StepFunctionsExecutionIntegration extends AwsIntegration {
       deploymentToken = JSON.stringify({ stateMachineName });
     }
 
-    for (const methodResponse of METHOD_RESPONSES) {
-      method.addMethodResponse(methodResponse);
-    }
+    method.addMethodResponses(...METHOD_RESPONSES);
 
     return {
       ...bindResult,

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 ?? defaultMethodOptions.methodResponses ?? [];
+    this.methodResponses = options.methodResponses ? [...options.methodResponses] : defaultMethodOptions.methodResponses ?? [];
 
     const integration = props.integration ?? this.resource.defaultIntegration ?? new MockIntegration();
     const bindResult = integration.bind(this);
@@ -293,10 +293,12 @@ export class Method extends Resource {
   }
 
   /**
-   * Add a method response to this method
+   * Add method responses to this method if not already specified via options or by default
    */
-  public addMethodResponse(methodResponse: MethodResponse): void {
-    this.methodResponses.push(methodResponse);
+  public addMethodResponses(...methodResponse: MethodResponse[]): void {
+    if (this.methodResponses.length === 0) {
+      this.methodResponses.push(...methodResponse);
+    }
   }
 
   private renderIntegration(bindResult: IntegrationConfig): CfnMethod.IntegrationProperty {

diff --git a/packages/aws-cdk-lib/aws-apigateway/test/integrations/stepfunctions.test.ts b/packages/aws-cdk-lib/aws-apigateway/test/integrations/stepfunctions.test.ts
@@ -402,7 +402,7 @@ describe('StepFunctionsIntegration', () => {
 
     const integ = apigw.StepFunctionsIntegration.startExecution(stateMachine, integrationOptions);
     api.root.addMethod('GET', integ, methodOptions);
-    // api.root.addMethod('POST', integ, methodOptions);
+    api.root.addMethod('POST', integ, methodOptions);
 
     //THEN
     Template.fromStack(stack).resourceCountIs('AWS::ApiGateway::Method', 2);