allows passing -1 as desired count to not set a value for DesiredCoun…

…t on the service
theonestack · Feb 16, 2022 · 911958d · 911958d
1 parent 65cf74d
commit 911958d
Show file tree

Hide file tree

Showing 15 changed files with 16 additions and 15 deletions.
diff --git a/ecs-service.cfndsl.rb b/ecs-service.cfndsl.rb
@@ -16,6 +16,7 @@
   tags << { Key: "EnvironmentType", Value: Ref("EnvironmentType") }
 
   Condition('IsScalingEnabled', FnEquals(Ref('EnableScaling'), 'true'))
+  Condition('NoDesiredCount', FnEquals(Ref('DesiredCount'), '-1'))
 
   log_retention = external_parameters.fetch(:log_retention, 7)
   loggroup_name = external_parameters.fetch(:loggroup_name, Ref('AWS::StackName'))
@@ -494,7 +495,7 @@
     end
     Cluster Ref("EcsCluster")
     HealthCheckGracePeriodSeconds health_check_grace_period if !health_check_grace_period.nil?
-    DesiredCount Ref('DesiredCount') if strategy != 'DAEMON'
+    DesiredCount FnIf('NoDesiredCount', Ref('AWS::NoValue'), Ref('DesiredCount')) if strategy != 'DAEMON'
     DeploymentConfiguration ({
         MinimumHealthyPercent: Ref('MinimumHealthyPercent'),
         MaximumPercent: Ref('MaximumPercent')

diff --git a/spec/extra_hosts_spec.rb b/spec/extra_hosts_spec.rb
@@ -80,7 +80,7 @@
       end
 
       it "to have property DesiredCount" do
-          expect(resource["Properties"]["DesiredCount"]).to eq({"Ref"=>"DesiredCount"})
+          expect(resource["Properties"]["DesiredCount"]).to eq({"Fn::If" => ["NoDesiredCount", {"Ref"=>"AWS::NoValue"}, {"Ref"=>"DesiredCount"}]})
       end
 
       it "to have property DeploymentConfiguration" do

diff --git a/spec/fargate_spec.rb b/spec/fargate_spec.rb
@@ -83,7 +83,7 @@
       end
 
       it "to have property DesiredCount" do
-          expect(resource["Properties"]["DesiredCount"]).to eq({"Ref"=>"DesiredCount"})
+          expect(resource["Properties"]["DesiredCount"]).to eq({"Fn::If" => ["NoDesiredCount", {"Ref"=>"AWS::NoValue"}, {"Ref"=>"DesiredCount"}]})
       end
 
       it "to have property DeploymentConfiguration" do

diff --git a/spec/linux_parameters_spec.rb b/spec/linux_parameters_spec.rb
@@ -80,7 +80,7 @@
       end
 
       it "to have property DesiredCount" do
-          expect(resource["Properties"]["DesiredCount"]).to eq({"Ref"=>"DesiredCount"})
+          expect(resource["Properties"]["DesiredCount"]).to eq({"Fn::If" => ["NoDesiredCount", {"Ref"=>"AWS::NoValue"}, {"Ref"=>"DesiredCount"}]})
       end
 
       it "to have property DeploymentConfiguration" do

diff --git a/spec/multiple_links_spec.rb b/spec/multiple_links_spec.rb
@@ -80,7 +80,7 @@
       end
 
       it "to have property DesiredCount" do
-          expect(resource["Properties"]["DesiredCount"]).to eq({"Ref"=>"DesiredCount"})
+          expect(resource["Properties"]["DesiredCount"]).to eq({"Fn::If" => ["NoDesiredCount", {"Ref"=>"AWS::NoValue"}, {"Ref"=>"DesiredCount"}]})
       end
 
       it "to have property DeploymentConfiguration" do

diff --git a/spec/multiple_scaling_policies_spec.rb b/spec/multiple_scaling_policies_spec.rb
@@ -80,7 +80,7 @@
       end
 
       it "to have property DesiredCount" do
-          expect(resource["Properties"]["DesiredCount"]).to eq({"Ref"=>"DesiredCount"})
+          expect(resource["Properties"]["DesiredCount"]).to eq({"Fn::If" => ["NoDesiredCount", {"Ref"=>"AWS::NoValue"}, {"Ref"=>"DesiredCount"}]})
       end
 
       it "to have property DeploymentConfiguration" do

diff --git a/spec/multiple_target_groups_parameter_spec.rb b/spec/multiple_target_groups_parameter_spec.rb
@@ -80,7 +80,7 @@
       end
 
       it "to have property DesiredCount" do
-          expect(resource["Properties"]["DesiredCount"]).to eq({"Ref"=>"DesiredCount"})
+          expect(resource["Properties"]["DesiredCount"]).to eq({"Fn::If" => ["NoDesiredCount", {"Ref"=>"AWS::NoValue"}, {"Ref"=>"DesiredCount"}]})
       end
 
       it "to have property DeploymentConfiguration" do

diff --git a/spec/multiple_target_groups_spec.rb b/spec/multiple_target_groups_spec.rb
@@ -196,7 +196,7 @@
       end
 
       it "to have property DesiredCount" do
-          expect(resource["Properties"]["DesiredCount"]).to eq({"Ref"=>"DesiredCount"})
+          expect(resource["Properties"]["DesiredCount"]).to eq({"Fn::If" => ["NoDesiredCount", {"Ref"=>"AWS::NoValue"}, {"Ref"=>"DesiredCount"}]})
       end
 
       it "to have property DeploymentConfiguration" do

diff --git a/spec/nginx_service_spec.rb b/spec/nginx_service_spec.rb
@@ -84,7 +84,7 @@
       end
 
       it "to have property DesiredCount" do
-          expect(resource["Properties"]["DesiredCount"]).to eq({"Ref"=>"DesiredCount"})
+          expect(resource["Properties"]["DesiredCount"]).to eq({"Fn::If" => ["NoDesiredCount", {"Ref"=>"AWS::NoValue"}, {"Ref"=>"DesiredCount"}]})
       end
 
       it "to have property DeploymentConfiguration" do

diff --git a/spec/scheduling_strategy_replica_spec.rb b/spec/scheduling_strategy_replica_spec.rb
@@ -80,7 +80,7 @@
       end
 
       it "to have property DesiredCount" do
-          expect(resource["Properties"]["DesiredCount"]).to eq({"Ref"=>"DesiredCount"})
+          expect(resource["Properties"]["DesiredCount"]).to eq({"Fn::If" => ["NoDesiredCount", {"Ref"=>"AWS::NoValue"}, {"Ref"=>"DesiredCount"}]})
       end
 
       it "to have property DeploymentConfiguration" do

diff --git a/spec/secrets_spec.rb b/spec/secrets_spec.rb
@@ -134,7 +134,7 @@
       end
 
       it "to have property DesiredCount" do
-          expect(resource["Properties"]["DesiredCount"]).to eq({"Ref"=>"DesiredCount"})
+          expect(resource["Properties"]["DesiredCount"]).to eq({"Fn::If" => ["NoDesiredCount", {"Ref"=>"AWS::NoValue"}, {"Ref"=>"DesiredCount"}]})
       end
 
       it "to have property DeploymentConfiguration" do

diff --git a/spec/security_group_spec.rb b/spec/security_group_spec.rb
@@ -104,7 +104,7 @@
       end
 
       it "to have property DesiredCount" do
-          expect(resource["Properties"]["DesiredCount"]).to eq({"Ref"=>"DesiredCount"})
+          expect(resource["Properties"]["DesiredCount"]).to eq({"Fn::If" => ["NoDesiredCount", {"Ref"=>"AWS::NoValue"}, {"Ref"=>"DesiredCount"}]})
       end
 
       it "to have property DeploymentConfiguration" do

diff --git a/spec/task_placement_constraint_spec.rb b/spec/task_placement_constraint_spec.rb
@@ -84,7 +84,7 @@
       end
 
       it "to have property DesiredCount" do
-          expect(resource["Properties"]["DesiredCount"]).to eq({"Ref"=>"DesiredCount"})
+          expect(resource["Properties"]["DesiredCount"]).to eq({"Fn::If" => ["NoDesiredCount", {"Ref"=>"AWS::NoValue"}, {"Ref"=>"DesiredCount"}]})
       end
 
       it "to have property DeploymentConfiguration" do

diff --git a/spec/user_spec.rb b/spec/user_spec.rb
@@ -80,7 +80,7 @@
       end
 
       it "to have property DesiredCount" do
-          expect(resource["Properties"]["DesiredCount"]).to eq({"Ref"=>"DesiredCount"})
+          expect(resource["Properties"]["DesiredCount"]).to eq({"Fn::If" => ["NoDesiredCount", {"Ref"=>"AWS::NoValue"}, {"Ref"=>"DesiredCount"}]})
       end
 
       it "to have property DeploymentConfiguration" do

diff --git a/spec/volumes_spec.rb b/spec/volumes_spec.rb
@@ -109,7 +109,7 @@
       end
 
       it "to have property DesiredCount" do
-          expect(resource["Properties"]["DesiredCount"]).to eq({"Ref"=>"DesiredCount"})
+          expect(resource["Properties"]["DesiredCount"]).to eq({"Fn::If" => ["NoDesiredCount", {"Ref"=>"AWS::NoValue"}, {"Ref"=>"DesiredCount"}]})
       end
 
       it "to have property DeploymentConfiguration" do