kemko/nomad
1
0
Fork 0
mirror of https://github.com/kemko/nomad.git synced 2026-01-10 20:35:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

Don't take a reference a var in a loop

Browse Source 
Fixes #2491
This commit is contained in:
Michael Schurter
2017-03-28 10:16:27 -07:00
parent 8d5f2bb7da
commit 24d27fce83
2 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
client/driver/env/env.go vendored
View File

@@ -203,12 +203,12 @@ func (t *TaskEnvironment) Build() *TaskEnvironment {
continue
}
for _, nw := range resources.Networks {
ports := make([]*structs.Port, 0, len(nw.ReservedPorts)+len(nw.DynamicPorts))
ports := make([]structs.Port, 0, len(nw.ReservedPorts)+len(nw.DynamicPorts))
for _, port := range nw.ReservedPorts {
ports = append(ports, &port)
ports = append(ports, port)
}
for _, port := range nw.DynamicPorts {
ports = append(ports, &port)
ports = append(ports, port)
}
for _, p := range ports {
key := fmt.Sprintf("%s%s_%s", AddrPrefix, taskName, p.Label)

16
client/driver/env/env_test.go vendored
View File

@@ -139,6 +139,16 @@ func TestEnvironment_AsList(t *testing.T) {
n := mock.Node()
a := mock.Alloc()
a.TaskResources["web"].Networks[0].DynamicPorts[0].Value = 2000
a.TaskResources["ssh"] = &structs.Resources{
Networks: []*structs.NetworkResource{
{
ReservedPorts: []structs.Port{
{Label: "ssh", Value: 22},
{Label: "other", Value: 1234},
},
},
},
}
env := NewTaskEnvironment(n).
SetNetworks(networks).
SetPortMap(portMap).
@@ -165,6 +175,12 @@ func TestEnvironment_AsList(t *testing.T) {
"NOMAD_IP_web_main=192.168.0.100",
"NOMAD_IP_web_http=192.168.0.100",
"NOMAD_TASK_NAME=taskA",
"NOMAD_ADDR_ssh_other=:1234",
"NOMAD_ADDR_ssh_ssh=:22",
"NOMAD_IP_ssh_other=",
"NOMAD_IP_ssh_ssh=",
"NOMAD_PORT_ssh_other=1234",
"NOMAD_PORT_ssh_ssh=22",
}
allocID := fmt.Sprintf("NOMAD_ALLOC_ID=%s", a.ID)
exp = append(exp, allocID)