feat(templates): enable deployment circuit breaker for services

internal/pkg/template/workload.go

@@ -14,8 +14,8 @@ import (
 
 // Paths of workload cloudformation templates under templates/workloads/.
 const (
-	fmtWkldCFTemplatePath       = "workloads/%s/%s/cf.yml"
-	fmtWkldCommonCFTemplatePath = "workloads/common/cf/%s.yml"
+	fmtWkldCFTemplatePath         = "workloads/%s/%s/cf.yml"
+	fmtWkldPartialsCFTemplatePath = "workloads/partials/cf/%s.yml"
 )
 
 const (
@@ -24,8 +24,8 @@ const (
 )
 
 var (
-	// Template names under "workloads/common/cf/".
-	commonWorkloadCFTemplateNames = []string{
+	// Template names under "workloads/partials/cf/".
+	partialsWorkloadCFTemplateNames = []string{
 		"loggroup",
 		"envvars",
 		"secrets",
@@ -161,8 +161,8 @@ func (t *Template) parseWkld(name, wkldDirName string, data interface{}, options
 	if err != nil {
 		return nil, err
 	}
-	for _, templateName := range commonWorkloadCFTemplateNames {
-		nestedTpl, err := t.parse(templateName, fmt.Sprintf(fmtWkldCommonCFTemplatePath, templateName), options...)
+	for _, templateName := range partialsWorkloadCFTemplateNames {
+		nestedTpl, err := t.parse(templateName, fmt.Sprintf(fmtWkldPartialsCFTemplatePath, templateName), options...)
 		if err != nil {
 			return nil, err
 		}

internal/pkg/template/workload_test.go

@@ -24,26 +24,26 @@ func TestTemplate_ParseSvc(t *testing.T) {
 			mockDependencies: func(t *Template) {
 				mockBox := packd.NewMemoryBox()
 				var baseContent string
-				for _, name := range commonWorkloadCFTemplateNames {
+				for _, name := range partialsWorkloadCFTemplateNames {
 					baseContent += fmt.Sprintf(`{{include "%s" . | indent 2}}`+"\n", name)
 				}
 				mockBox.AddString("workloads/services/backend/cf.yml", baseContent)
-				mockBox.AddString("workloads/common/cf/loggroup.yml", "loggroup")
-				mockBox.AddString("workloads/common/cf/envvars.yml", "envvars")
-				mockBox.AddString("workloads/common/cf/secrets.yml", "secrets")
-				mockBox.AddString("workloads/common/cf/executionrole.yml", "executionrole")
-				mockBox.AddString("workloads/common/cf/taskrole.yml", "taskrole")
-				mockBox.AddString("workloads/common/cf/fargate-taskdef-base-properties.yml", "fargate-taskdef-base-properties")
-				mockBox.AddString("workloads/common/cf/service-base-properties.yml", "service-base-properties")
-				mockBox.AddString("workloads/common/cf/servicediscovery.yml", "servicediscovery")
-				mockBox.AddString("workloads/common/cf/addons.yml", "addons")
-				mockBox.AddString("workloads/common/cf/sidecars.yml", "sidecars")
-				mockBox.AddString("workloads/common/cf/logconfig.yml", "logconfig")
-				mockBox.AddString("workloads/common/cf/autoscaling.yml", "autoscaling")
-				mockBox.AddString("workloads/common/cf/state-machine-definition.json.yml", "state-machine-definition")
-				mockBox.AddString("workloads/common/cf/eventrule.yml", "eventrule")
-				mockBox.AddString("workloads/common/cf/state-machine.yml", "state-machine")
-				mockBox.AddString("workloads/common/cf/env-controller.yml", "env-controller")
+				mockBox.AddString("workloads/partials/cf/loggroup.yml", "loggroup")
+				mockBox.AddString("workloads/partials/cf/envvars.yml", "envvars")
+				mockBox.AddString("workloads/partials/cf/secrets.yml", "secrets")
+				mockBox.AddString("workloads/partials/cf/executionrole.yml", "executionrole")
+				mockBox.AddString("workloads/partials/cf/taskrole.yml", "taskrole")
+				mockBox.AddString("workloads/partials/cf/fargate-taskdef-base-properties.yml", "fargate-taskdef-base-properties")
+				mockBox.AddString("workloads/partials/cf/service-base-properties.yml", "service-base-properties")
+				mockBox.AddString("workloads/partials/cf/servicediscovery.yml", "servicediscovery")
+				mockBox.AddString("workloads/partials/cf/addons.yml", "addons")
+				mockBox.AddString("workloads/partials/cf/sidecars.yml", "sidecars")
+				mockBox.AddString("workloads/partials/cf/logconfig.yml", "logconfig")
+				mockBox.AddString("workloads/partials/cf/autoscaling.yml", "autoscaling")
+				mockBox.AddString("workloads/partials/cf/state-machine-definition.json.yml", "state-machine-definition")
+				mockBox.AddString("workloads/partials/cf/eventrule.yml", "eventrule")
+				mockBox.AddString("workloads/partials/cf/state-machine.yml", "state-machine")
+				mockBox.AddString("workloads/partials/cf/env-controller.yml", "env-controller")
 
 				t.box = mockBox
 			},

templates/workloads/common/cf/service-base-properties.yml → templates/workloads/partials/cf/service-base-properties.yml

@@ -7,6 +7,12 @@ DesiredCount: !GetAtt DynamicDesiredCountAction.DesiredCount
 {{- else }}
 DesiredCount: !Ref TaskCount
 {{- end}}
+DeploymentConfiguration:
+  DeploymentCircuitBreaker:
+    Enable: true
+    Rollback: true
+  MinimumHealthyPercent: 100
+  MaximumPercent: 200
 PropagateTags: SERVICE
 LaunchType: FARGATE
 NetworkConfiguration:

templates/workloads/services/backend/cf.yml

@@ -111,9 +111,6 @@ Resources:
     Type: AWS::ECS::Service
     Properties:
 {{include "service-base-properties" . | indent 6}}
-      DeploymentConfiguration:
-        MinimumHealthyPercent: 100
-        MaximumPercent: 200
       ServiceRegistries: !If [ExposePort, [{RegistryArn: !GetAtt DiscoveryService.Arn, Port: !Ref ContainerPort}], !Ref "AWS::NoValue"]
 
 {{include "addons" . | indent 2}}

templates/workloads/services/lb-web/cf.yml

@@ -124,9 +124,6 @@ Resources:
     DependsOn: WaitUntilListenerRuleIsCreated
     Properties:
 {{include "service-base-properties" . | indent 6}}
-      DeploymentConfiguration:
-        MinimumHealthyPercent: 100
-        MaximumPercent: 200
       # This may need to be adjusted if the container takes a while to start up
       HealthCheckGracePeriodSeconds: 60
       LoadBalancers: