diff --git a/fargate-v2.cfhighlander.rb b/fargate-v2.cfhighlander.rb index d12420f..77b0e00 100644 --- a/fargate-v2.cfhighlander.rb +++ b/fargate-v2.cfhighlander.rb @@ -44,7 +44,7 @@ end unless service_namespace.nil? - Component template: 'application-autoscaling@0.1.0', name: "#{component_name.gsub('-','').gsub('_','')}Scaling", render: Inline, conditional: true, enabled: false, config: @config do + Component template: 'application-autoscaling@0.1.1', name: "#{component_name.gsub('-','').gsub('_','')}Scaling", render: Inline, conditional: true, enabled: false, config: @config do parameter name: 'Service', value: Ref('EcsFargateService') end end diff --git a/spec/ecs_scaling_spec.rb b/spec/ecs_scaling_spec.rb index baec381..563b514 100644 --- a/spec/ecs_scaling_spec.rb +++ b/spec/ecs_scaling_spec.rb @@ -65,7 +65,7 @@ expect(properties).to eq({ "MaxCapacity" => {"Ref"=>"fargatev2ScalingMax"}, "MinCapacity" => {"Ref"=>"fargatev2ScalingMin"}, - "ResourceId" => {"Fn::Join"=>["", ["service/", {"Fn::Select"=>[0, {"Fn::Split"=>["/", {"Ref"=>"EcsFargateService"}]}]}, "/", {"Fn::Select"=>[1, {"Fn::Split"=>["/", {"Ref"=>"EcsFargateService"}]}]}]]}, + "ResourceId" => {"Fn::Join"=>["", ["service/", {"Fn::Select"=>[1, {"Fn::Split"=>["/", {"Ref"=>"EcsFargateService"}]}]}, "/", {"Fn::Select"=>[2, {"Fn::Split"=>["/", {"Ref"=>"EcsFargateService"}]}]}]]}, "RoleARN" => {"Fn::GetAtt"=>["ServiceECSAutoScaleRole", "Arn"]}, "ScalableDimension" => "ecs:service:DesiredCount", "ServiceNamespace" => "ecs", @@ -94,7 +94,7 @@ "AlarmActions" => [{"Ref"=>"ServiceScalingUpPolicy"}], "AlarmDescription" => {"Fn::Join"=>[" ", [{"Ref"=>"EnvironmentName"}, "autoscaling ecs scale up alarm"]]}, "ComparisonOperator" => "GreaterThanThreshold", - "Dimensions" => [{"Name"=>"ServiceName", "Value"=>{"Fn::Select"=>[1, {"Fn::Split"=>["/", {"Ref"=>"EcsFargateService"}]}]}}, {"Name"=>"ClusterName", "Value"=>{"Fn::Select"=>[0, {"Fn::Split"=>["/", {"Ref"=>"EcsFargateService"}]}]}}], + "Dimensions" => [{"Name"=>"ServiceName", "Value"=>{"Fn::Select"=>[2, {"Fn::Split"=>["/", {"Ref"=>"EcsFargateService"}]}]}}, {"Name"=>"ClusterName", "Value"=>{"Fn::Select"=>[1, {"Fn::Split"=>["/", {"Ref"=>"EcsFargateService"}]}]}}], "EvaluationPeriods" => "5", "MetricName" => "CPUUtilization", "Namespace" => "AWS/ECS", @@ -126,7 +126,7 @@ "AlarmActions" => [{"Ref"=>"ServiceScalingDownPolicy"}], "AlarmDescription" => {"Fn::Join"=>[" ", [{"Ref"=>"EnvironmentName"}, "autoscaling ecs scale down alarm"]]}, "ComparisonOperator" => "LessThanThreshold", - "Dimensions" => [{"Name"=>"ServiceName", "Value"=>{"Fn::Select"=>[1, {"Fn::Split"=>["/", {"Ref"=>"EcsFargateService"}]}]}}, {"Name"=>"ClusterName", "Value"=>{"Fn::Select"=>[0, {"Fn::Split"=>["/", {"Ref"=>"EcsFargateService"}]}]}}], + "Dimensions" => [{"Name"=>"ServiceName", "Value"=>{"Fn::Select"=>[2, {"Fn::Split"=>["/", {"Ref"=>"EcsFargateService"}]}]}}, {"Name"=>"ClusterName", "Value"=>{"Fn::Select"=>[1, {"Fn::Split"=>["/", {"Ref"=>"EcsFargateService"}]}]}}], "EvaluationPeriods" => "5", "MetricName" => "CPUUtilization", "Namespace" => "AWS/ECS",