homelab/traefik
1
0
Fork 0
Code Activity

Allow binding ECS container port

Browse source
This commit is contained in:
Andrew Stucki 2018-07-04 08:08:03 -05:00 • committed by Traefiker Bot
parent 12c713b187
commit 0d262561d1
5 changed files with 89 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

55
provider/ecs/config_test.go
View file

@ -32,7 +32,7 @@ func TestBuildConfiguration(t *testing.T) {
machine: &machine{
state: ec2.InstanceStateNameRunning,
privateIP: "10.0.0.1",
port: 1337,
ports: []portMapping{{hostPort: 1337}},
},
},
},
@ -75,7 +75,7 @@ func TestBuildConfiguration(t *testing.T) {
machine: &machine{
state: ec2.InstanceStateNameRunning,
privateIP: "10.0.0.1",
port: 1337,
ports: []portMapping{{hostPort: 1337}},
},
},
},
@ -195,7 +195,7 @@ func TestBuildConfiguration(t *testing.T) {
machine: &machine{
state: ec2.InstanceStateNameRunning,
privateIP: "10.0.0.1",
port: 1337,
ports: []portMapping{{hostPort: 1337}},
},
},
},
@ -435,7 +435,7 @@ func TestBuildConfiguration(t *testing.T) {
machine: &machine{
state: ec2.InstanceStateNameRunning,
privateIP: "10.0.0.1",
port: 1337,
ports: []portMapping{{hostPort: 1337}},
},
},
{
@ -522,7 +522,7 @@ func TestBuildConfiguration(t *testing.T) {
machine: &machine{
state: ec2.InstanceStateNameRunning,
privateIP: "10.2.2.1",
port: 1337,
ports: []portMapping{{hostPort: 1337}},
},
},
},
@ -876,6 +876,27 @@ func TestGetPort(t *testing.T) {
label.TraefikPort: aws.String("80"),
}),
},
{
desc: "Container label should provide exposed port",
expected: "6536",
instanceInfo: simpleEcsInstanceDynamicPorts(map[string]*string{
label.TraefikPort: aws.String("8080"),
}),
},
{
desc: "Wrong port container label should provide default exposed port",
expected: "9000",
instanceInfo: simpleEcsInstanceDynamicPorts(map[string]*string{
label.TraefikPort: aws.String("9000"),
}),
},
{
desc: "Invalid port container label should provide default exposed port",
expected: "6535",
instanceInfo: simpleEcsInstanceDynamicPorts(map[string]*string{
label.TraefikPort: aws.String("foo"),
}),
},
}
for _, test := range testCases {
@ -987,7 +1008,7 @@ func makeEcsInstance(containerDef *ecs.ContainerDefinition) ecsInstance {
machine: &machine{
state: ec2.InstanceStateNameRunning,
privateIP: "10.0.0.0",
port: 1337,
ports: []portMapping{{hostPort: 1337}},
},
}
@ -1003,7 +1024,7 @@ func simpleEcsInstance(labels map[string]*string) ecsInstance {
Name: aws.String("http"),
DockerLabels: labels,
})
instance.machine.port = 80
instance.machine.ports = []portMapping{{hostPort: 80}}
return instance
}
@ -1012,7 +1033,25 @@ func simpleEcsInstanceNoNetwork(labels map[string]*string) ecsInstance {
Name: aws.String("http"),
DockerLabels: labels,
})
instance.machine.port = 0
instance.machine.ports = []portMapping{}
return instance
}
func simpleEcsInstanceDynamicPorts(labels map[string]*string) ecsInstance {
instance := makeEcsInstance(&ecs.ContainerDefinition{
Name: aws.String("http"),
DockerLabels: labels,
})
instance.machine.ports = []portMapping{
{
containerPort: 80,
hostPort: 6535,
},
{
containerPort: 8080,
hostPort: 6536,
},
}
return instance
}