From 1ae1d8cda28fea6d0f253a0c106c91dc9c7e7f73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carl=20F=C3=BCrstenberg?= Date: Sat, 17 Dec 2022 10:28:10 +0100 Subject: [PATCH] Properly name variable for checking if scale on request has been called The naming and information didn't fully match eachother. --- .../@aws-cdk/aws-autoscaling/lib/auto-scaling-group.ts | 8 ++++---- .../aws-autoscaling/test/auto-scaling-group.test.ts | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/@aws-cdk/aws-autoscaling/lib/auto-scaling-group.ts b/packages/@aws-cdk/aws-autoscaling/lib/auto-scaling-group.ts index 90cac9e401f1d..9226cd703f6bf 100644 --- a/packages/@aws-cdk/aws-autoscaling/lib/auto-scaling-group.ts +++ b/packages/@aws-cdk/aws-autoscaling/lib/auto-scaling-group.ts @@ -985,7 +985,7 @@ abstract class AutoScalingGroupBase extends Resource implements IAutoScalingGrou public abstract readonly osType: ec2.OperatingSystemType; protected albTargetGroup?: elbv2.ApplicationTargetGroup; public readonly grantPrincipal: iam.IPrincipal = new iam.UnknownPrincipal({ resource: this }); - protected hasSetScaleOnRequest: boolean = false; + protected hasCalledScaleOnRequestCount: boolean = false; /** * Send a message to either an SQS queue or SNS topic when instances launch or terminate @@ -1089,7 +1089,7 @@ abstract class AutoScalingGroupBase extends Resource implements IAutoScalingGrou }); policy.node.addDependency(this.albTargetGroup.loadBalancerAttached); - this.hasSetScaleOnRequest = true; + this.hasCalledScaleOnRequestCount = true; return policy; } @@ -1769,8 +1769,8 @@ export class AutoScalingGroup extends AutoScalingGroupBase implements private validateTargetGroup(): string[] { const errors = new Array(); - if (this.hasSetScaleOnRequest && this.targetGroupArns.length > 1) { - errors.push('Cannon use multiple target groups if `setScaleOnRequest()` is being used.'); + if (this.hasCalledScaleOnRequestCount && this.targetGroupArns.length > 1) { + errors.push('Cannon use multiple target groups if `scaleOnRequestCount()` is being used.'); } return errors; diff --git a/packages/@aws-cdk/aws-autoscaling/test/auto-scaling-group.test.ts b/packages/@aws-cdk/aws-autoscaling/test/auto-scaling-group.test.ts index 30dc30832c2bf..d58e8f7faba32 100644 --- a/packages/@aws-cdk/aws-autoscaling/test/auto-scaling-group.test.ts +++ b/packages/@aws-cdk/aws-autoscaling/test/auto-scaling-group.test.ts @@ -1866,7 +1866,7 @@ describe('auto scaling group', () => { }); - test('Should validate multiple target groups i conjunction with `setScaleOnRequest()`', () => { + test('Should validate multiple target groups i conjunction with `scaleOnRequestCount()`', () => { const stack = new cdk.Stack(undefined, 'MyStack', { env: { region: 'us-east-1', account: '1234' } }); const vpc = mockVpc(stack); const alb = new ApplicationLoadBalancer(stack, 'alb', { @@ -1896,7 +1896,7 @@ describe('auto scaling group', () => { asg.scaleOnRequestCount('requests-per-minute', { targetRequestsPerMinute: 60 }); - expect(asg.node.validate()).toContainEqual('Cannon use multiple target groups if `setScaleOnRequest()` is being used.'); + expect(asg.node.validate()).toContainEqual('Cannon use multiple target groups if `scaleOnRequestCount()` is being used.'); }); });