From bfe78419139b422adfee472bd4c47a66a37fe5b3 Mon Sep 17 00:00:00 2001 From: Nick Ethier Date: Wed, 8 May 2019 13:56:15 -0400 Subject: [PATCH] agent: simplify if block --- command/agent/job_endpoint.go | 47 ++++++++++++++++++----------------- 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/command/agent/job_endpoint.go b/command/agent/job_endpoint.go index ceb14fb5d..afe4cbb98 100644 --- a/command/agent/job_endpoint.go +++ b/command/agent/job_endpoint.go @@ -908,33 +908,34 @@ func ApiResourcesToStructs(in *api.Resources) *structs.Resources { func ApiNetworkResourceToStructs(in []*api.NetworkResource) []*structs.NetworkResource { var out []*structs.NetworkResource - if l := len(in); l != 0 { - out = make([]*structs.NetworkResource, l) - for i, nw := range in { - out[i] = &structs.NetworkResource{ - Mode: nw.Mode, - CIDR: nw.CIDR, - IP: nw.IP, - MBits: *nw.MBits, - } + if len(in) == 0 { + return out + } + out = make([]*structs.NetworkResource, len(in)) + for i, nw := range in { + out[i] = &structs.NetworkResource{ + Mode: nw.Mode, + CIDR: nw.CIDR, + IP: nw.IP, + MBits: *nw.MBits, + } - if l := len(nw.DynamicPorts); l != 0 { - out[i].DynamicPorts = make([]structs.Port, l) - for j, dp := range nw.DynamicPorts { - out[i].DynamicPorts[j] = structs.Port{ - Label: dp.Label, - Value: dp.Value, - } + if l := len(nw.DynamicPorts); l != 0 { + out[i].DynamicPorts = make([]structs.Port, l) + for j, dp := range nw.DynamicPorts { + out[i].DynamicPorts[j] = structs.Port{ + Label: dp.Label, + Value: dp.Value, } } + } - if l := len(nw.ReservedPorts); l != 0 { - out[i].ReservedPorts = make([]structs.Port, l) - for j, rp := range nw.ReservedPorts { - out[i].ReservedPorts[j] = structs.Port{ - Label: rp.Label, - Value: rp.Value, - } + if l := len(nw.ReservedPorts); l != 0 { + out[i].ReservedPorts = make([]structs.Port, l) + for j, rp := range nw.ReservedPorts { + out[i].ReservedPorts[j] = structs.Port{ + Label: rp.Label, + Value: rp.Value, } } }