瀏覽代碼

Create service with project and service tags

Signed-off-by: Nicolas De Loof <[email protected]>
Nicolas De Loof 5 年之前
父節點
當前提交
257f829679

+ 1 - 0
ecs/pkg/amazon/client.go

@@ -9,6 +9,7 @@ import (
 const (
 const (
 	ProjectTag = "com.docker.compose.project"
 	ProjectTag = "com.docker.compose.project"
 	NetworkTag = "com.docker.compose.network"
 	NetworkTag = "com.docker.compose.network"
+	ServiceTag = "com.docker.compose.service"
 )
 )
 
 
 func NewClient(profile string, cluster string, region string) (compose.API, error) {
 func NewClient(profile string, cluster string, region string) (compose.API, error) {

+ 11 - 1
ecs/pkg/amazon/cloudformation.go

@@ -183,7 +183,17 @@ func (c client) Convert(project *compose.Project) (*cloudformation.Template, err
 			SchedulingStrategy: ecsapi.SchedulingStrategyReplica,
 			SchedulingStrategy: ecsapi.SchedulingStrategyReplica,
 			ServiceName:        service.Name,
 			ServiceName:        service.Name,
 			ServiceRegistries:  []ecs.Service_ServiceRegistry{serviceRegistry},
 			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
 	return template, nil

+ 10 - 0
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": {
         "TaskDefinition": {
           "Ref": "simpleTaskDefinition"
           "Ref": "simpleTaskDefinition"
         }
         }

+ 10 - 0
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": {
         "TaskDefinition": {
           "Ref": "simpleTaskDefinition"
           "Ref": "simpleTaskDefinition"
         }
         }