From 257f8296794709f33a32ac01c8359f0721c16fa4 Mon Sep 17 00:00:00 2001
From: Nicolas De Loof <nicolas.deloof@gmail.com>
Date: Wed, 27 May 2020 17:00:25 +0200
Subject: [PATCH] Create service with project and service tags

Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
---
 ecs/pkg/amazon/client.go                             |  1 +
 ecs/pkg/amazon/cloudformation.go                     | 12 +++++++++++-
 .../simple/simple-cloudformation-conversion.golden   | 10 ++++++++++
 ...e-cloudformation-with-overrides-conversion.golden | 10 ++++++++++
 4 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/ecs/pkg/amazon/client.go b/ecs/pkg/amazon/client.go
index 53b40af65..839c5118e 100644
--- a/ecs/pkg/amazon/client.go
+++ b/ecs/pkg/amazon/client.go
@@ -9,6 +9,7 @@ import (
 const (
 	ProjectTag = "com.docker.compose.project"
 	NetworkTag = "com.docker.compose.network"
+	ServiceTag = "com.docker.compose.service"
 )
 
 func NewClient(profile string, cluster string, region string) (compose.API, error) {
diff --git a/ecs/pkg/amazon/cloudformation.go b/ecs/pkg/amazon/cloudformation.go
index 48960592f..e838f14aa 100644
--- a/ecs/pkg/amazon/cloudformation.go
+++ b/ecs/pkg/amazon/cloudformation.go
@@ -183,7 +183,17 @@ func (c client) Convert(project *compose.Project) (*cloudformation.Template, err
 			SchedulingStrategy: ecsapi.SchedulingStrategyReplica,
 			ServiceName:        service.Name,
 			ServiceRegistries:  []ecs.Service_ServiceRegistry{serviceRegistry},
-			TaskDefinition:     cloudformation.Ref(taskDefinition),
+			Tags: []tags.Tag{
+				{
+					Key:   ProjectTag,
+					Value: project.Name,
+				},
+				{
+					Key:   ServiceTag,
+					Value: service.Name,
+				},
+			},
+			TaskDefinition: cloudformation.Ref(taskDefinition),
 		}
 	}
 	return template, nil
diff --git a/ecs/pkg/amazon/testdata/simple/simple-cloudformation-conversion.golden b/ecs/pkg/amazon/testdata/simple/simple-cloudformation-conversion.golden
index 868dcdd04..bbe34758d 100644
--- a/ecs/pkg/amazon/testdata/simple/simple-cloudformation-conversion.golden
+++ b/ecs/pkg/amazon/testdata/simple/simple-cloudformation-conversion.golden
@@ -123,6 +123,16 @@
             }
           }
         ],
+        "Tags": [
+          {
+            "Key": "com.docker.compose.project",
+            "Value": "TestSimpleConvert"
+          },
+          {
+            "Key": "com.docker.compose.service",
+            "Value": "simple"
+          }
+        ],
         "TaskDefinition": {
           "Ref": "simpleTaskDefinition"
         }
diff --git a/ecs/pkg/amazon/testdata/simple/simple-cloudformation-with-overrides-conversion.golden b/ecs/pkg/amazon/testdata/simple/simple-cloudformation-with-overrides-conversion.golden
index fe41a67ff..d9e57b00a 100644
--- a/ecs/pkg/amazon/testdata/simple/simple-cloudformation-with-overrides-conversion.golden
+++ b/ecs/pkg/amazon/testdata/simple/simple-cloudformation-with-overrides-conversion.golden
@@ -123,6 +123,16 @@
             }
           }
         ],
+        "Tags": [
+          {
+            "Key": "com.docker.compose.project",
+            "Value": "TestSimpleWithOverrides"
+          },
+          {
+            "Key": "com.docker.compose.service",
+            "Value": "simple"
+          }
+        ],
         "TaskDefinition": {
           "Ref": "simpleTaskDefinition"
         }