From 634f8094d74f646960cecb5412bd1e6f2f58cb00 Mon Sep 17 00:00:00 2001 From: peterwoodworth Date: Fri, 12 Aug 2022 14:39:53 -0700 Subject: [PATCH 1/2] fix: duration renders incorrectly in alb service base --- .../lib/base/application-load-balanced-service-base.ts | 3 ++- packages/@aws-cdk/aws-ecs-patterns/test/ec2/l3s.test.ts | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/@aws-cdk/aws-ecs-patterns/lib/base/application-load-balanced-service-base.ts b/packages/@aws-cdk/aws-ecs-patterns/lib/base/application-load-balanced-service-base.ts index 4fc6a98ec72ec..953a8b1a474ac 100644 --- a/packages/@aws-cdk/aws-ecs-patterns/lib/base/application-load-balanced-service-base.ts +++ b/packages/@aws-cdk/aws-ecs-patterns/lib/base/application-load-balanced-service-base.ts @@ -443,7 +443,8 @@ export abstract class ApplicationLoadBalancedServiceBase extends Construct { const internetFacing = props.publicLoadBalancer ?? true; if (props.idleTimeout) { - if (props.idleTimeout > Duration.seconds(4000) || props.idleTimeout < Duration.seconds(1)) { + const idleTimeout = props.idleTimeout.toSeconds(); + if (idleTimeout > Duration.seconds(4000).toSeconds() || idleTimeout < Duration.seconds(1).toSeconds()) { throw new Error('Load balancer idle timeout must be between 1 and 4000 seconds.'); } } diff --git a/packages/@aws-cdk/aws-ecs-patterns/test/ec2/l3s.test.ts b/packages/@aws-cdk/aws-ecs-patterns/test/ec2/l3s.test.ts index 1766e008eae3f..82086081b299e 100644 --- a/packages/@aws-cdk/aws-ecs-patterns/test/ec2/l3s.test.ts +++ b/packages/@aws-cdk/aws-ecs-patterns/test/ec2/l3s.test.ts @@ -880,7 +880,7 @@ test('passes when idleTimeout is between 1 and 4000 seconds', () => { streamPrefix: 'TestStream', }), }, - idleTimeout: Duration.seconds(120), + idleTimeout: Duration.seconds(4000), desiredCount: 2, }); }).toBeTruthy(); From c4157e1a84128b41007327f5335dec2834ad84d0 Mon Sep 17 00:00:00 2001 From: peterwoodworth Date: Fri, 12 Aug 2022 14:43:25 -0700 Subject: [PATCH 2/2] fix: duration renders incorrectly in alb service base --- .../lib/base/application-load-balanced-service-base.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/@aws-cdk/aws-ecs-patterns/lib/base/application-load-balanced-service-base.ts b/packages/@aws-cdk/aws-ecs-patterns/lib/base/application-load-balanced-service-base.ts index 953a8b1a474ac..049dcbd4c00bf 100644 --- a/packages/@aws-cdk/aws-ecs-patterns/lib/base/application-load-balanced-service-base.ts +++ b/packages/@aws-cdk/aws-ecs-patterns/lib/base/application-load-balanced-service-base.ts @@ -272,7 +272,7 @@ export interface ApplicationLoadBalancedServiceBaseProps { readonly enableExecuteCommand?: boolean; /** - * The load balancer idle timeout, in seconds + * The load balancer idle timeout, in seconds. Can be between 1 and 4000 seconds * * @default - CloudFormation sets idle timeout to 60 seconds */