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

Fix golden files after rebase 

Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
This commit is contained in:
Nicolas De Loof 2020-05-13 22:09:20 +02:00
parent 07a57469db
commit 8cd4a6fe9b
No known key found for this signature in database
GPG Key ID: 9858809D6F8F6E7E
2 changed files with 88 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,15 +1,29 @@
{ {
"AWSTemplateFormatVersion": "2010-09-09", "AWSTemplateFormatVersion": "2010-09-09",
"Conditions": {
"CreateCluster": {
"Fn::Equals": [
"",
{
"Ref": "ParameterClusterName"
}
]
}
},
"Parameters": { "Parameters": {
"Subnet1Id": { "ParameterClusterName": {
"Description": "Name of the ECS cluster to deploy to (optional)",
"Type": "String"
},
"ParameterSubnet1Id": {
"Description": "SubnetId,for Availability Zone 1 in the region in your VPC", "Description": "SubnetId,for Availability Zone 1 in the region in your VPC",
"Type": "AWS::EC2::Subnet::Id" "Type": "AWS::EC2::Subnet::Id"
}, },
"Subnet2Id": { "ParameterSubnet2Id": {
"Description": "SubnetId,for Availability Zone 1 in the region in your VPC", "Description": "SubnetId,for Availability Zone 1 in the region in your VPC",
"Type": "AWS::EC2::Subnet::Id" "Type": "AWS::EC2::Subnet::Id"
}, },
"VPCId": { "ParameterVPCId": {
"Description": "ID of the VPC", "Description": "ID of the VPC",
"Type": "AWS::EC2::VPC::Id" "Type": "AWS::EC2::VPC::Id"
} }
@ -20,11 +34,24 @@
"Description": "Service Map for Docker Compose project TestSimpleConvert", "Description": "Service Map for Docker Compose project TestSimpleConvert",
"Name": "TestSimpleConvert.local", "Name": "TestSimpleConvert.local",
"Vpc": { "Vpc": {
"Ref": "VPCId" "Ref": "ParameterVPCId"
} }
}, },
"Type": "AWS::ServiceDiscovery::PrivateDnsNamespace" "Type": "AWS::ServiceDiscovery::PrivateDnsNamespace"
}, },
"Cluster": {
"Condition": "CreateCluster",
"Properties": {
"ClusterName": "TestSimpleConvert",
"Tags": [
{
"Key": "com.docker.compose.project",
"Value": "TestSimpleConvert"
}
]
},
"Type": "AWS::ECS::Cluster"
},
"LogGroup": { "LogGroup": {
"Properties": { "Properties": {
"LogGroupName": "/docker-compose/TestSimpleConvert" "LogGroupName": "/docker-compose/TestSimpleConvert"
@ -33,7 +60,17 @@
}, },
"simpleService": { "simpleService": {
"Properties": { "Properties": {
"Cluster": "TestCluster", "Cluster": {
"Fn::If": [
"CreateCluster",
{
"Ref": "Cluster"
},
{
"Ref": "ParameterClusterName"
}
]
},
"DesiredCount": 1, "DesiredCount": 1,
"LaunchType": "FARGATE", "LaunchType": "FARGATE",
"NetworkConfiguration": { "NetworkConfiguration": {
@ -41,10 +78,10 @@
"AssignPublicIp": "ENABLED", "AssignPublicIp": "ENABLED",
"Subnets": [ "Subnets": [
{ {
"Ref": "Subnet1Id" "Ref": "ParameterSubnet1Id"
}, },
{ {
"Ref": "Subnet2Id" "Ref": "ParameterSubnet2Id"
} }
] ]
} }

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

@ -1,15 +1,29 @@
{ {
"AWSTemplateFormatVersion": "2010-09-09", "AWSTemplateFormatVersion": "2010-09-09",
"Conditions": {
"CreateCluster": {
"Fn::Equals": [
"",
{
"Ref": "ParameterClusterName"
}
]
}
},
"Parameters": { "Parameters": {
"Subnet1Id": { "ParameterClusterName": {
"Description": "Name of the ECS cluster to deploy to (optional)",
"Type": "String"
},
"ParameterSubnet1Id": {
"Description": "SubnetId,for Availability Zone 1 in the region in your VPC", "Description": "SubnetId,for Availability Zone 1 in the region in your VPC",
"Type": "AWS::EC2::Subnet::Id" "Type": "AWS::EC2::Subnet::Id"
}, },
"Subnet2Id": { "ParameterSubnet2Id": {
"Description": "SubnetId,for Availability Zone 1 in the region in your VPC", "Description": "SubnetId,for Availability Zone 1 in the region in your VPC",
"Type": "AWS::EC2::Subnet::Id" "Type": "AWS::EC2::Subnet::Id"
}, },
"VPCId": { "ParameterVPCId": {
"Description": "ID of the VPC", "Description": "ID of the VPC",
"Type": "AWS::EC2::VPC::Id" "Type": "AWS::EC2::VPC::Id"
} }
@ -20,11 +34,24 @@
"Description": "Service Map for Docker Compose project TestSimpleWithOverrides", "Description": "Service Map for Docker Compose project TestSimpleWithOverrides",
"Name": "TestSimpleWithOverrides.local", "Name": "TestSimpleWithOverrides.local",
"Vpc": { "Vpc": {
"Ref": "VPCId" "Ref": "ParameterVPCId"
} }
}, },
"Type": "AWS::ServiceDiscovery::PrivateDnsNamespace" "Type": "AWS::ServiceDiscovery::PrivateDnsNamespace"
}, },
"Cluster": {
"Condition": "CreateCluster",
"Properties": {
"ClusterName": "TestSimpleWithOverrides",
"Tags": [
{
"Key": "com.docker.compose.project",
"Value": "TestSimpleWithOverrides"
}
]
},
"Type": "AWS::ECS::Cluster"
},
"LogGroup": { "LogGroup": {
"Properties": { "Properties": {
"LogGroupName": "/docker-compose/TestSimpleWithOverrides" "LogGroupName": "/docker-compose/TestSimpleWithOverrides"
@ -33,7 +60,17 @@
}, },
"simpleService": { "simpleService": {
"Properties": { "Properties": {
"Cluster": "TestCluster", "Cluster": {
"Fn::If": [
"CreateCluster",
{
"Ref": "Cluster"
},
{
"Ref": "ParameterClusterName"
}
]
},
"DesiredCount": 1, "DesiredCount": 1,
"LaunchType": "FARGATE", "LaunchType": "FARGATE",
"NetworkConfiguration": { "NetworkConfiguration": {
@ -41,10 +78,10 @@
"AssignPublicIp": "ENABLED", "AssignPublicIp": "ENABLED",
"Subnets": [ "Subnets": [
{ {
"Ref": "Subnet1Id" "Ref": "ParameterSubnet1Id"
}, },
{ {
"Ref": "Subnet2Id" "Ref": "ParameterSubnet2Id"
} }
] ]
} }