test(autoscaling): add tests for Schedule.cron specifying with either…

… day or weekday (#27296) I was trying to fix [this bug](#27256), but [this revert PR](#27284) could cover it. So I added the test cases for the bug fix. ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
aws · Oct 18, 2023 · 7398f0c · 7398f0c
1 parent 06158f5
commit 7398f0c
Show file tree

Hide file tree

Showing 8 changed files with 280 additions and 127 deletions.
diff --git a/...s-autoscaling/test/integ.custom-scaling.js.snapshot/aws-cdk-autoscaling-integ.assets.json b/...s-autoscaling/test/integ.custom-scaling.js.snapshot/aws-cdk-autoscaling-integ.assets.json
diff --git a/...autoscaling/test/integ.custom-scaling.js.snapshot/aws-cdk-autoscaling-integ.template.json b/...autoscaling/test/integ.custom-scaling.js.snapshot/aws-cdk-autoscaling-integ.template.json
@@ -18,9 +18,6 @@
  "VPCPublicSubnet1SubnetB4246D30": {
  "Type": "AWS::EC2::Subnet",
  "Properties": {
- "VpcId": {
- "Ref": "VPCB9E5F0B4"
- },
  "AvailabilityZone": {
  "Fn::Select": [
  0,
@@ -44,21 +41,24 @@
  "Key": "Name",
  "Value": "aws-cdk-autoscaling-integ/VPC/PublicSubnet1"
  }
- ]
+ ],
+ "VpcId": {
+ "Ref": "VPCB9E5F0B4"
+ }
  }
  },
  "VPCPublicSubnet1RouteTableFEE4B781": {
  "Type": "AWS::EC2::RouteTable",
  "Properties": {
- "VpcId": {
- "Ref": "VPCB9E5F0B4"
- },
  "Tags": [
  {
  "Key": "Name",
  "Value": "aws-cdk-autoscaling-integ/VPC/PublicSubnet1"
  }
- ]
+ ],
+ "VpcId": {
+ "Ref": "VPCB9E5F0B4"
+ }
  }
  },
  "VPCPublicSubnet1RouteTableAssociation0B0896DC": {
@@ -75,12 +75,12 @@
  "VPCPublicSubnet1DefaultRoute91CEF279": {
  "Type": "AWS::EC2::Route",
  "Properties": {
- "RouteTableId": {
- "Ref": "VPCPublicSubnet1RouteTableFEE4B781"
- },
  "DestinationCidrBlock": "0.0.0.0/0",
  "GatewayId": {
  "Ref": "VPCIGWB7E252D3"
+ },
+ "RouteTableId": {
+ "Ref": "VPCPublicSubnet1RouteTableFEE4B781"
  }
  },
  "DependsOn": [
@@ -102,15 +102,15 @@
  "VPCPublicSubnet1NATGatewayE0556630": {
  "Type": "AWS::EC2::NatGateway",
  "Properties": {
- "SubnetId": {
- "Ref": "VPCPublicSubnet1SubnetB4246D30"
- },
  "AllocationId": {
  "Fn::GetAtt": [
  "VPCPublicSubnet1EIP6AD938E8",
  "AllocationId"
  ]
  },
+ "SubnetId": {
+ "Ref": "VPCPublicSubnet1SubnetB4246D30"
+ },
  "Tags": [
  {
  "Key": "Name",
@@ -126,9 +126,6 @@
  "VPCPublicSubnet2Subnet74179F39": {
  "Type": "AWS::EC2::Subnet",
  "Properties": {
- "VpcId": {
- "Ref": "VPCB9E5F0B4"
- },
  "AvailabilityZone": {
  "Fn::Select": [
  1,
@@ -152,21 +149,24 @@
  "Key": "Name",
  "Value": "aws-cdk-autoscaling-integ/VPC/PublicSubnet2"
  }
- ]
+ ],
+ "VpcId": {
+ "Ref": "VPCB9E5F0B4"
+ }
  }
  },
  "VPCPublicSubnet2RouteTable6F1A15F1": {
  "Type": "AWS::EC2::RouteTable",
  "Properties": {
- "VpcId": {
- "Ref": "VPCB9E5F0B4"
- },
  "Tags": [
  {
  "Key": "Name",
  "Value": "aws-cdk-autoscaling-integ/VPC/PublicSubnet2"
  }
- ]
+ ],
+ "VpcId": {
+ "Ref": "VPCB9E5F0B4"
+ }
  }
  },
  "VPCPublicSubnet2RouteTableAssociation5A808732": {
@@ -183,12 +183,12 @@
  "VPCPublicSubnet2DefaultRouteB7481BBA": {
  "Type": "AWS::EC2::Route",
  "Properties": {
- "RouteTableId": {
- "Ref": "VPCPublicSubnet2RouteTable6F1A15F1"
- },
  "DestinationCidrBlock": "0.0.0.0/0",
  "GatewayId": {
  "Ref": "VPCIGWB7E252D3"
+ },
+ "RouteTableId": {
+ "Ref": "VPCPublicSubnet2RouteTable6F1A15F1"
  }
  },
  "DependsOn": [
@@ -210,15 +210,15 @@
  "VPCPublicSubnet2NATGateway3C070193": {
  "Type": "AWS::EC2::NatGateway",
  "Properties": {
- "SubnetId": {
- "Ref": "VPCPublicSubnet2Subnet74179F39"
- },
  "AllocationId": {
  "Fn::GetAtt": [
  "VPCPublicSubnet2EIP4947BC00",
  "AllocationId"
  ]
  },
+ "SubnetId": {
+ "Ref": "VPCPublicSubnet2Subnet74179F39"
+ },
  "Tags": [
  {
  "Key": "Name",
@@ -234,9 +234,6 @@
  "VPCPrivateSubnet1Subnet8BCA10E0": {
  "Type": "AWS::EC2::Subnet",
  "Properties": {
- "VpcId": {
- "Ref": "VPCB9E5F0B4"
- },
  "AvailabilityZone": {
  "Fn::Select": [
  0,
@@ -260,21 +257,24 @@
  "Key": "Name",
  "Value": "aws-cdk-autoscaling-integ/VPC/PrivateSubnet1"
  }
- ]
+ ],
+ "VpcId": {
+ "Ref": "VPCB9E5F0B4"
+ }
  }
  },
  "VPCPrivateSubnet1RouteTableBE8A6027": {
  "Type": "AWS::EC2::RouteTable",
  "Properties": {
- "VpcId": {
- "Ref": "VPCB9E5F0B4"
- },
  "Tags": [
  {
  "Key": "Name",
  "Value": "aws-cdk-autoscaling-integ/VPC/PrivateSubnet1"
  }
- ]
+ ],
+ "VpcId": {
+ "Ref": "VPCB9E5F0B4"
+ }
  }
  },
  "VPCPrivateSubnet1RouteTableAssociation347902D1": {
@@ -291,21 +291,18 @@
  "VPCPrivateSubnet1DefaultRouteAE1D6490": {
  "Type": "AWS::EC2::Route",
  "Properties": {
- "RouteTableId": {
- "Ref": "VPCPrivateSubnet1RouteTableBE8A6027"
- },
  "DestinationCidrBlock": "0.0.0.0/0",
  "NatGatewayId": {
  "Ref": "VPCPublicSubnet1NATGatewayE0556630"
+ },
+ "RouteTableId": {
+ "Ref": "VPCPrivateSubnet1RouteTableBE8A6027"
  }
  }
  },
  "VPCPrivateSubnet2SubnetCFCDAA7A": {
  "Type": "AWS::EC2::Subnet",
  "Properties": {
- "VpcId": {
- "Ref": "VPCB9E5F0B4"
- },
  "AvailabilityZone": {
  "Fn::Select": [
  1,
@@ -329,21 +326,24 @@
  "Key": "Name",
  "Value": "aws-cdk-autoscaling-integ/VPC/PrivateSubnet2"
  }
- ]
+ ],
+ "VpcId": {
+ "Ref": "VPCB9E5F0B4"
+ }
  }
  },
  "VPCPrivateSubnet2RouteTable0A19E10E": {
  "Type": "AWS::EC2::RouteTable",
  "Properties": {
- "VpcId": {
- "Ref": "VPCB9E5F0B4"
- },
  "Tags": [
  {
  "Key": "Name",
  "Value": "aws-cdk-autoscaling-integ/VPC/PrivateSubnet2"
  }
- ]
+ ],
+ "VpcId": {
+ "Ref": "VPCB9E5F0B4"
+ }
  }
  },
  "VPCPrivateSubnet2RouteTableAssociation0C73D413": {
@@ -360,12 +360,12 @@
  "VPCPrivateSubnet2DefaultRouteF4F5CFD2": {
  "Type": "AWS::EC2::Route",
  "Properties": {
- "RouteTableId": {
- "Ref": "VPCPrivateSubnet2RouteTable0A19E10E"
- },
  "DestinationCidrBlock": "0.0.0.0/0",
  "NatGatewayId": {
  "Ref": "VPCPublicSubnet2NATGateway3C070193"
+ },
+ "RouteTableId": {
+ "Ref": "VPCPrivateSubnet2RouteTable0A19E10E"
  }
  }
  },
@@ -383,11 +383,11 @@
  "VPCVPCGW99B986DC": {
  "Type": "AWS::EC2::VPCGatewayAttachment",
  "Properties": {
- "VpcId": {
- "Ref": "VPCB9E5F0B4"
- },
  "InternetGatewayId": {
  "Ref": "VPCIGWB7E252D3"
+ },
+ "VpcId": {
+ "Ref": "VPCB9E5F0B4"
  }
  }
  },
@@ -516,8 +516,6 @@
  "FleetASG3971DFE5": {
  "Type": "AWS::AutoScaling::AutoScalingGroup",
  "Properties": {
- "MaxSize": "1",
- "MinSize": "1",
  "LaunchTemplate": {
  "LaunchTemplateId": {
  "Ref": "FleetLaunchTemplate3FC2FEAE"
@@ -529,6 +527,8 @@
  ]
  }
  },
+ "MaxSize": "1",
+ "MinSize": "1",
  "Tags": [
  {
  "Key": "Name",
@@ -571,6 +571,26 @@
  "Recurrence": "0 20 * * *"
  }
  },
+ "FleetScheduledActionScaleUpInTheDay57AE2B79": {
+ "Type": "AWS::AutoScaling::ScheduledAction",
+ "Properties": {
+ "AutoScalingGroupName": {
+ "Ref": "FleetASG3971DFE5"
+ },
+ "MinSize": 5,
+ "Recurrence": "0/10 * 1 * *"
+ }
+ },
+ "FleetScheduledActionScaleUpInTheWeekDay73B6B91B": {
+ "Type": "AWS::AutoScaling::ScheduledAction",
+ "Properties": {
+ "AutoScalingGroupName": {
+ "Ref": "FleetASG3971DFE5"
+ },
+ "MinSize": 5,
+ "Recurrence": "0/10 * * * MON-SUN"
+ }
+ },
  "FleetScalingPolicyKeepCPUReasonable89F05216": {
  "Type": "AWS::AutoScaling::ScalingPolicy",
  "Properties": {

diff --git a/...esting/framework-integ/test/aws-autoscaling/test/integ.custom-scaling.js.snapshot/cdk.out b/...esting/framework-integ/test/aws-autoscaling/test/integ.custom-scaling.js.snapshot/cdk.out
diff --git a/...ing/framework-integ/test/aws-autoscaling/test/integ.custom-scaling.js.snapshot/integ.json b/...ing/framework-integ/test/aws-autoscaling/test/integ.custom-scaling.js.snapshot/integ.json