From 55089d0ad3576b522ade30615e2e852b7f4ee3d0 Mon Sep 17 00:00:00 2001 From: Rico Huijbers Date: Mon, 12 Nov 2018 14:55:35 +0100 Subject: [PATCH 1/2] fix(aws-elasticloadbalancingv2): unhealthy threshold Fix bug where unhealthy threshold count would not be reflected in CloudFormation properties. --- .../aws-elasticloadbalancingv2/lib/shared/base-target-group.ts | 1 + .../aws-elasticloadbalancingv2/test/alb/test.listener.ts | 2 ++ 2 files changed, 3 insertions(+) diff --git a/packages/@aws-cdk/aws-elasticloadbalancingv2/lib/shared/base-target-group.ts b/packages/@aws-cdk/aws-elasticloadbalancingv2/lib/shared/base-target-group.ts index 265b65c934aa8..4037086bbdbdc 100644 --- a/packages/@aws-cdk/aws-elasticloadbalancingv2/lib/shared/base-target-group.ts +++ b/packages/@aws-cdk/aws-elasticloadbalancingv2/lib/shared/base-target-group.ts @@ -194,6 +194,7 @@ export abstract class BaseTargetGroup extends cdk.Construct implements ITargetGr healthCheckProtocol: new cdk.Token(() => this.healthCheck && this.healthCheck.protocol), healthCheckTimeoutSeconds: new cdk.Token(() => this.healthCheck && this.healthCheck.timeoutSeconds), healthyThresholdCount: new cdk.Token(() => this.healthCheck && this.healthCheck.healthyThresholdCount), + unhealthyThresholdCount: new cdk.Token(() => this.healthCheck && this.healthCheck.unhealthyThresholdCount), matcher: new cdk.Token(() => this.healthCheck && this.healthCheck.healthyHttpCodes !== undefined ? { httpCode: this.healthCheck.healthyHttpCodes } : undefined), diff --git a/packages/@aws-cdk/aws-elasticloadbalancingv2/test/alb/test.listener.ts b/packages/@aws-cdk/aws-elasticloadbalancingv2/test/alb/test.listener.ts index 84742de41559a..9b107080a9a61 100644 --- a/packages/@aws-cdk/aws-elasticloadbalancingv2/test/alb/test.listener.ts +++ b/packages/@aws-cdk/aws-elasticloadbalancingv2/test/alb/test.listener.ts @@ -287,6 +287,7 @@ export = { targets: [new FakeSelfRegisteringTarget(stack, 'Target', vpc)] }); group.configureHealthCheck({ + unhealthyThresholdCount: 3, timeoutSeconds: 3600, intervalSecs: 30, path: '/test', @@ -297,6 +298,7 @@ export = { HealthCheckIntervalSeconds: 30, HealthCheckPath: "/test", HealthCheckTimeoutSeconds: 3600, + UnhealthyThresholdCount: 3, })); test.done(); From b1e678766f256ed59784dba1e72360c8a4f27d09 Mon Sep 17 00:00:00 2001 From: Rico Huijbers Date: Mon, 12 Nov 2018 15:09:32 +0100 Subject: [PATCH 2/2] Trigger build --- .../aws-elasticloadbalancingv2/test/alb/test.listener.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/@aws-cdk/aws-elasticloadbalancingv2/test/alb/test.listener.ts b/packages/@aws-cdk/aws-elasticloadbalancingv2/test/alb/test.listener.ts index 9b107080a9a61..964221b3112aa 100644 --- a/packages/@aws-cdk/aws-elasticloadbalancingv2/test/alb/test.listener.ts +++ b/packages/@aws-cdk/aws-elasticloadbalancingv2/test/alb/test.listener.ts @@ -295,10 +295,10 @@ export = { // THEN expect(stack).to(haveResource('AWS::ElasticLoadBalancingV2::TargetGroup', { + UnhealthyThresholdCount: 3, HealthCheckIntervalSeconds: 30, HealthCheckPath: "/test", HealthCheckTimeoutSeconds: 3600, - UnhealthyThresholdCount: 3, })); test.done();