tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Compute resource names to avoid unsupported characters 

Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
This commit is contained in:
Nicolas De Loof 2020-05-27 16:58:58 +02:00
parent 257f829679
commit 564c369c3e
No known key found for this signature in database
GPG Key ID: 9858809D6F8F6E7E
4 changed files with 68 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ecs/pkg/amazon/cloudformation.go
View File

@ -2,6 +2,7 @@ package amazon
import (
"fmt"
"regexp"
"strings"
"github.com/sirupsen/logrus"
@ -99,7 +100,7 @@ func (c client) Convert(project *compose.Project) (*cloudformation.Template, err
return nil, err
}
taskExecutionRole := fmt.Sprintf("%sTaskExecutionRole", service.Name)
taskExecutionRole := fmt.Sprintf("%sTaskExecutionRole", normalizeResourceName(service.Name))
policy, err := c.getPolicy(definition)
if err != nil {
return nil, err
@ -114,7 +115,7 @@ func (c client) Convert(project *compose.Project) (*cloudformation.Template, err
}
definition.ExecutionRoleArn = cloudformation.Ref(taskExecutionRole)
taskDefinition := fmt.Sprintf("%sTaskDefinition", service.Name)
taskDefinition := fmt.Sprintf("%sTaskDefinition", normalizeResourceName(service.Name))
template.Resources[taskExecutionRole] = &iam.Role{
AssumeRolePolicyDocument: assumeRolePolicyDocument,
Policies: rolePolicies,
@ -130,7 +131,7 @@ func (c client) Convert(project *compose.Project) (*cloudformation.Template, err
// FIXME ECS only support HTTP(s) health checks, while Docker only support CMD
}
serviceRegistration := fmt.Sprintf("%sServiceDiscoveryEntry", service.Name)
serviceRegistration := fmt.Sprintf("%sServiceDiscoveryEntry", normalizeResourceName(service.Name))
records := []cloudmap.Service_DnsRecord{
{
TTL: 60,
@ -166,7 +167,7 @@ func (c client) Convert(project *compose.Project) (*cloudformation.Template, err
serviceSecurityGroups = append(serviceSecurityGroups, cloudformation.Ref(logicalName))
}
template.Resources[fmt.Sprintf("%sService", service.Name)] = &ecs.Service{
template.Resources[fmt.Sprintf("%sService", normalizeResourceName(service.Name))] = &ecs.Service{
Cluster: cluster,
DesiredCount: 1,
LaunchType: ecsapi.LaunchTypeFargate,
@ -193,7 +194,7 @@ func (c client) Convert(project *compose.Project) (*cloudformation.Template, err
Value: service.Name,
},
},
TaskDefinition: cloudformation.Ref(taskDefinition),
TaskDefinition: cloudformation.Ref(normalizeResourceName(taskDefinition)),
}
}
return template, nil
@ -236,7 +237,11 @@ func convertNetwork(project *compose.Project, net string, vpc string) (string, c
}
func networkResourceName(project *compose.Project, network string) string {
return fmt.Sprintf("%s%sNetwork", project.Name, strings.Title(network))
return fmt.Sprintf("%s%sNetwork", normalizeResourceName(project.Name), normalizeResourceName(network))
}
func normalizeResourceName(s string) string {
return strings.Title(regexp.MustCompile("[^a-zA-Z0-9]+").ReplaceAllString(s, ""))
}
func (c client) getPolicy(taskDef *ecs.TaskDefinition) (*PolicyDocument, error) {

2
ecs/pkg/amazon/convert.go
View File

@ -57,7 +57,7 @@ func Convert(project *compose.Project, service types.ServiceConfig) (*ecs.TaskDe
Options: map[string]string{
"awslogs-region": cloudformation.Ref("AWS::Region"),
"awslogs-group": cloudformation.Ref("LogGroup"),
"awslogs-stream-prefix": service.Name,
"awslogs-stream-prefix": project.Name,
},
},
Name: service.Name,

56
ecs/pkg/amazon/testdata/simple/simple-cloudformation-conversion.golden vendored
View File

@ -58,27 +58,7 @@
},
"Type": "AWS::Logs::LogGroup"
},
"TestSimpleConvertDefaultNetwork": {
"Properties": {
"GroupDescription": "TestSimpleConvert default Security Group",
"GroupName": "TestSimpleConvertDefaultNetwork",
"Tags": [
{
"Key": "com.docker.compose.project",
"Value": "TestSimpleConvert"
},
{
"Key": "com.docker.compose.network",
"Value": "default"
}
],
"VpcId": {
"Ref": "ParameterVPCId"
}
},
"Type": "AWS::EC2::SecurityGroup"
},
"simpleService": {
"SimpleService": {
"Properties": {
"Cluster": {
"Fn::If": [
@ -117,7 +97,7 @@
{
"RegistryArn": {
"Fn::GetAtt": [
"simpleServiceDiscoveryEntry",
"SimpleServiceDiscoveryEntry",
"Arn"
]
}
@ -134,12 +114,12 @@
}
],
"TaskDefinition": {
"Ref": "simpleTaskDefinition"
"Ref": "SimpleTaskDefinition"
}
},
"Type": "AWS::ECS::Service"
},
"simpleServiceDiscoveryEntry": {
"SimpleServiceDiscoveryEntry": {
"Properties": {
"Description": "\"simple\" service discovery entry in Cloud Map",
"DnsConfig": {
@ -158,7 +138,7 @@
},
"Type": "AWS::ServiceDiscovery::Service"
},
"simpleTaskDefinition": {
"SimpleTaskDefinition": {
"Properties": {
"ContainerDefinitions": [
{
@ -191,7 +171,7 @@
"awslogs-region": {
"Ref": "AWS::Region"
},
"awslogs-stream-prefix": "simple"
"awslogs-stream-prefix": "TestSimpleConvert"
}
},
"Name": "simple"
@ -199,7 +179,7 @@
],
"Cpu": "256",
"ExecutionRoleArn": {
"Ref": "simpleTaskExecutionRole"
"Ref": "SimpleTaskExecutionRole"
},
"Family": "TestSimpleConvert-simple",
"Memory": "512",
@ -210,7 +190,7 @@
},
"Type": "AWS::ECS::TaskDefinition"
},
"simpleTaskExecutionRole": {
"SimpleTaskExecutionRole": {
"Properties": {
"AssumeRolePolicyDocument": {
"Statement": [
@ -232,6 +212,26 @@
]
},
"Type": "AWS::IAM::Role"
},
"TestSimpleConvertDefaultNetwork": {
"Properties": {
"GroupDescription": "TestSimpleConvert default Security Group",
"GroupName": "TestSimpleConvertDefaultNetwork",
"Tags": [
{
"Key": "com.docker.compose.project",
"Value": "TestSimpleConvert"
},
{
"Key": "com.docker.compose.network",
"Value": "default"
}
],
"VpcId": {
"Ref": "ParameterVPCId"
}
},
"Type": "AWS::EC2::SecurityGroup"
}
}
}

56
ecs/pkg/amazon/testdata/simple/simple-cloudformation-with-overrides-conversion.golden vendored
View File

@ -58,27 +58,7 @@
},
"Type": "AWS::Logs::LogGroup"
},
"TestSimpleWithOverridesDefaultNetwork": {
"Properties": {
"GroupDescription": "TestSimpleWithOverrides default Security Group",
"GroupName": "TestSimpleWithOverridesDefaultNetwork",
"Tags": [
{
"Key": "com.docker.compose.project",
"Value": "TestSimpleWithOverrides"
},
{
"Key": "com.docker.compose.network",
"Value": "default"
}
],
"VpcId": {
"Ref": "ParameterVPCId"
}
},
"Type": "AWS::EC2::SecurityGroup"
},
"simpleService": {
"SimpleService": {
"Properties": {
"Cluster": {
"Fn::If": [
@ -117,7 +97,7 @@
{
"RegistryArn": {
"Fn::GetAtt": [
"simpleServiceDiscoveryEntry",
"SimpleServiceDiscoveryEntry",
"Arn"
]
}
@ -134,12 +114,12 @@
}
],
"TaskDefinition": {
"Ref": "simpleTaskDefinition"
"Ref": "SimpleTaskDefinition"
}
},
"Type": "AWS::ECS::Service"
},
"simpleServiceDiscoveryEntry": {
"SimpleServiceDiscoveryEntry": {
"Properties": {
"Description": "\"simple\" service discovery entry in Cloud Map",
"DnsConfig": {
@ -158,7 +138,7 @@
},
"Type": "AWS::ServiceDiscovery::Service"
},
"simpleTaskDefinition": {
"SimpleTaskDefinition": {
"Properties": {
"ContainerDefinitions": [
{
@ -191,7 +171,7 @@
"awslogs-region": {
"Ref": "AWS::Region"
},
"awslogs-stream-prefix": "simple"
"awslogs-stream-prefix": "TestSimpleWithOverrides"
}
},
"Name": "simple"
@ -199,7 +179,7 @@
],
"Cpu": "256",
"ExecutionRoleArn": {
"Ref": "simpleTaskExecutionRole"
"Ref": "SimpleTaskExecutionRole"
},
"Family": "TestSimpleWithOverrides-simple",
"Memory": "512",
@ -210,7 +190,7 @@
},
"Type": "AWS::ECS::TaskDefinition"
},
"simpleTaskExecutionRole": {
"SimpleTaskExecutionRole": {
"Properties": {
"AssumeRolePolicyDocument": {
"Statement": [
@ -232,6 +212,26 @@
]
},
"Type": "AWS::IAM::Role"
},
"TestSimpleWithOverridesDefaultNetwork": {
"Properties": {
"GroupDescription": "TestSimpleWithOverrides default Security Group",
"GroupName": "TestSimpleWithOverridesDefaultNetwork",
"Tags": [
{
"Key": "com.docker.compose.project",
"Value": "TestSimpleWithOverrides"
},
{
"Key": "com.docker.compose.network",
"Value": "default"
}
],
"VpcId": {
"Ref": "ParameterVPCId"
}
},
"Type": "AWS::EC2::SecurityGroup"
}
}
}