Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(autoscaling): step scaling without adjustment type fails #29158

Merged
merged 6 commits into from Feb 28, 2024
Merged

fix(autoscaling): step scaling without adjustment type fails #29158

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8b7ef73
fix(autoscaling): step scaling without adjustmentType fails
go-to-k Jan 20, 2024
5392611
Merge branch 'main' into asg-adjustment-type
go-to-k Feb 11, 2024
760520c
an integ test
go-to-k Feb 20, 2024
91918e4
Update packages/@aws-cdk-testing/framework-integ/test/aws-autoscaling…
go-to-k Feb 25, 2024
d2e0720
Merge branch 'main' into asg-adjustment-type
go-to-k Feb 25, 2024
c40ab28
Merge branch 'main' into asg-adjustment-type
mergify[bot] Feb 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/aws-cdk-lib/aws-autoscaling/lib/step-scaling-policy.ts
View file
Open in desktop
Expand Up @@ -147,7 +147,7 @@ export class StepScalingPolicy extends Construct {
const threshold = intervals[alarms.lowerAlarmIntervalIndex].upper;

this.lowerAction = new StepScalingAction(this, 'LowerPolicy', {
adjustmentType: props.adjustmentType,
adjustmentType,
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The property is defined here.

cooldown: props.cooldown,
estimatedInstanceWarmup: props.estimatedInstanceWarmup,
metricAggregationType: props.metricAggregationType ?? aggregationTypeFromMetric(props.metric),
Expand Down Expand Up @@ -179,7 +179,7 @@ export class StepScalingPolicy extends Construct {
const threshold = intervals[alarms.upperAlarmIntervalIndex].lower;

this.upperAction = new StepScalingAction(this, 'UpperPolicy', {
adjustmentType: props.adjustmentType,
adjustmentType,
cooldown: props.cooldown,
estimatedInstanceWarmup: props.estimatedInstanceWarmup,
metricAggregationType: props.metricAggregationType ?? aggregationTypeFromMetric(props.metric),
Expand Down
22 changes: 22 additions & 0 deletions packages/aws-cdk-lib/aws-autoscaling/test/scaling.test.ts
View file
Open in desktop
Expand Up @@ -294,6 +294,28 @@ test('step scaling from percentile metric', () => {
});
});

test('step scaling with adjustmentType by default', () => {
// GIVEN
const stack = new cdk.Stack();
const fixture = new ASGFixture(stack, 'Fixture');

// WHEN
fixture.asg.scaleOnMetric('Tracking', {
metric: new cloudwatch.Metric({ namespace: 'Test', metricName: 'Metric', statistic: 'p99' }),
scalingSteps: [
{ upper: 0, change: -1 },
{ lower: 100, change: +1 },
{ lower: 500, change: +5 },
],
});

// THEN
Template.fromStack(stack).hasResourceProperties('AWS::AutoScaling::ScalingPolicy', {
PolicyType: 'StepScaling',
AdjustmentType: 'ChangeInCapacity',
});
});

test('step scaling with evaluation period configured', () => {
// GIVEN
const stack = new cdk.Stack();
Expand Down