From aa2c48b53cbae5203b8cf81262eaccf8be353ca6 Mon Sep 17 00:00:00 2001 From: Anshul Pundir Date: Tue, 19 Sep 2017 10:18:58 -0700 Subject: [PATCH] Fix linter errors. Signed-off-by: Anshul Pundir --- ca/keyreadwriter.go | 5 +---- manager/allocator/network.go | 6 +----- manager/controlapi/network.go | 6 +----- manager/controlapi/service.go | 17 +++------------- manager/dispatcher/dispatcher.go | 5 +---- manager/logbroker/broker_test.go | 24 ++++++----------------- manager/orchestrator/update/updater.go | 5 +---- manager/scheduler/scheduler.go | 6 +----- manager/state/raft/raft.go | 10 ++-------- manager/state/raft/storage/storage.go | 5 +---- manager/state/raft/transport/transport.go | 5 +---- 11 files changed, 19 insertions(+), 75 deletions(-) diff --git a/ca/keyreadwriter.go b/ca/keyreadwriter.go index 964cb3ee84..4a7c0a0eee 100644 --- a/ca/keyreadwriter.go +++ b/ca/keyreadwriter.go @@ -187,10 +187,7 @@ func (k *KeyReadWriter) ViewAndRotateKEK(cb func(KEKData, PEMKeyHeaders) (KEKDat return err } - if err := k.writeKey(keyBlock, updatedKEK, updatedHeaderObj); err != nil { - return err - } - return nil + return k.writeKey(keyBlock, updatedKEK, updatedHeaderObj) } // ViewAndUpdateHeaders updates the header manager, and updates any headers on the existing key diff --git a/manager/allocator/network.go b/manager/allocator/network.go index 794e616c10..400c469807 100644 --- a/manager/allocator/network.go +++ b/manager/allocator/network.go @@ -172,11 +172,7 @@ func (a *Allocator) doNetworkInit(ctx context.Context) (err error) { if err := a.allocateServices(ctx, false); err != nil { return err } - if err := a.allocateTasks(ctx, false); err != nil { - return err - } - - return nil + return a.allocateTasks(ctx, false) } func (a *Allocator) doNetworkAlloc(ctx context.Context, ev events.Event) { diff --git a/manager/controlapi/network.go b/manager/controlapi/network.go index 708f36b8f6..b150de0e78 100644 --- a/manager/controlapi/network.go +++ b/manager/controlapi/network.go @@ -96,11 +96,7 @@ func validateNetworkSpec(spec *api.NetworkSpec, pg plugingetter.PluginGetter) er return err } - if err := validateIPAM(spec.IPAM, pg); err != nil { - return err - } - - return nil + return validateIPAM(spec.IPAM, pg) } // CreateNetwork creates and returns a Network based on the provided NetworkSpec. diff --git a/manager/controlapi/service.go b/manager/controlapi/service.go index 0a0a9ffa2a..951c27b01e 100644 --- a/manager/controlapi/service.go +++ b/manager/controlapi/service.go @@ -56,10 +56,7 @@ func validateResourceRequirements(r *api.ResourceRequirements) error { if err := validateResources(r.Limits); err != nil { return err } - if err := validateResources(r.Reservations); err != nil { - return err - } - return nil + return validateResources(r.Reservations) } func validateRestartPolicy(rp *api.RestartPolicy) error { @@ -161,11 +158,7 @@ func validateContainerSpec(taskSpec api.TaskSpec) error { return err } - if err := validateHealthCheck(container.Healthcheck); err != nil { - return err - } - - return nil + return validateHealthCheck(container.Healthcheck) } // validateImage validates image name in containerSpec @@ -481,11 +474,7 @@ func validateServiceSpec(spec *api.ServiceSpec) error { if err := validateEndpointSpec(spec.Endpoint); err != nil { return err } - if err := validateMode(spec); err != nil { - return err - } - - return nil + return validateMode(spec) } // checkPortConflicts does a best effort to find if the passed in spec has port diff --git a/manager/dispatcher/dispatcher.go b/manager/dispatcher/dispatcher.go index 8ad1df397f..4de6a30c4d 100644 --- a/manager/dispatcher/dispatcher.go +++ b/manager/dispatcher/dispatcher.go @@ -854,10 +854,7 @@ func (d *Dispatcher) Assignments(r *api.AssignmentsRequest, stream api.Dispatche appliesTo = msg.ResultsIn msg.Type = assignmentType - if err := stream.Send(&msg); err != nil { - return err - } - return nil + return stream.Send(&msg) } // TODO(aaronl): Also send node secrets that should be exposed to diff --git a/manager/logbroker/broker_test.go b/manager/logbroker/broker_test.go index ca825525f7..c133f0097c 100644 --- a/manager/logbroker/broker_test.go +++ b/manager/logbroker/broker_test.go @@ -402,18 +402,14 @@ func TestLogBrokerNoFollow(t *testing.T) { return err } - if err := store.CreateTask(tx, &api.Task{ + return store.CreateTask(tx, &api.Task{ ID: "task2", ServiceID: "service", Status: api.TaskStatus{ State: api.TaskStateRunning, }, NodeID: agent2Security.ServerTLSCreds.NodeID(), - }); err != nil { - return err - } - - return nil + }) })) // We need to sleep here to give ListenSubscriptions time to call @@ -524,18 +520,14 @@ func TestLogBrokerNoFollowMissingNode(t *testing.T) { return err } - if err := store.CreateTask(tx, &api.Task{ + return store.CreateTask(tx, &api.Task{ ID: "task2", ServiceID: "service", NodeID: "node-2", Status: api.TaskStatus{ State: api.TaskStateRunning, }, - }); err != nil { - return err - } - - return nil + }) })) // We need to sleep here to give ListenSubscriptions time to call @@ -655,18 +647,14 @@ func TestLogBrokerNoFollowDisconnect(t *testing.T) { return err } - if err := store.CreateTask(tx, &api.Task{ + return store.CreateTask(tx, &api.Task{ ID: "task2", ServiceID: "service", Status: api.TaskStatus{ State: api.TaskStateRunning, }, NodeID: agent2Security.ServerTLSCreds.NodeID(), - }); err != nil { - return err - } - - return nil + }) })) // We need to sleep here to give ListenSubscriptions time to call diff --git a/manager/orchestrator/update/updater.go b/manager/orchestrator/update/updater.go index 0bda96e9a6..f7e4ff52ad 100644 --- a/manager/orchestrator/update/updater.go +++ b/manager/orchestrator/update/updater.go @@ -384,10 +384,7 @@ func (u *Updater) updateTask(ctx context.Context, slot orchestrator.Slot, update return errors.New("service was deleted") } - if err := store.CreateTask(tx, updated); err != nil { - return err - } - return nil + return store.CreateTask(tx, updated) }) if err != nil { return err diff --git a/manager/scheduler/scheduler.go b/manager/scheduler/scheduler.go index 73349e391f..99685959bc 100644 --- a/manager/scheduler/scheduler.go +++ b/manager/scheduler/scheduler.go @@ -92,11 +92,7 @@ func (s *Scheduler) setupTasksList(tx store.ReadTx) error { tasksByNode[t.NodeID][t.ID] = t } - if err := s.buildNodeSet(tx, tasksByNode); err != nil { - return err - } - - return nil + return s.buildNodeSet(tx, tasksByNode) } // Run is the scheduler event loop. diff --git a/manager/state/raft/raft.go b/manager/state/raft/raft.go index cfbec992f1..ec2c9c0f5e 100644 --- a/manager/state/raft/raft.go +++ b/manager/state/raft/raft.go @@ -1283,10 +1283,7 @@ func (n *Node) reportNewAddress(ctx context.Context, id uint64) error { return err } newAddr := net.JoinHostPort(newHost, officialPort) - if err := n.transport.UpdatePeerAddr(id, newAddr); err != nil { - return err - } - return nil + return n.transport.UpdatePeerAddr(id, newAddr) } // ProcessRaftMessage calls 'Step' which advances the @@ -1848,10 +1845,7 @@ func (n *Node) applyAddNode(cc raftpb.ConfChange) error { return nil } - if err = n.registerNode(member); err != nil { - return err - } - return nil + return n.registerNode(member) } // applyUpdateNode is called when we receive a ConfChange from a member in the diff --git a/manager/state/raft/storage/storage.go b/manager/state/raft/storage/storage.go index a737aabde3..539e05d5ce 100644 --- a/manager/state/raft/storage/storage.go +++ b/manager/state/raft/storage/storage.go @@ -226,10 +226,7 @@ func (e *EncryptedRaftLogger) SaveSnapshot(snapshot raftpb.Snapshot) error { if err := snapshotter.SaveSnap(snapshot); err != nil { return err } - if err := e.wal.ReleaseLockTo(snapshot.Metadata.Index); err != nil { - return err - } - return nil + return e.wal.ReleaseLockTo(snapshot.Metadata.Index) } // GC garbage collects snapshots and wals older than the provided index and term diff --git a/manager/state/raft/transport/transport.go b/manager/state/raft/transport/transport.go index 69057f6246..b259013d8a 100644 --- a/manager/state/raft/transport/transport.go +++ b/manager/state/raft/transport/transport.go @@ -235,10 +235,7 @@ func (t *Transport) UpdatePeerAddr(id uint64, addr string) error { if !ok { return ErrIsNotFound } - if err := p.updateAddr(addr); err != nil { - return err - } - return nil + return p.updateAddr(addr) } // PeerConn returns raw grpc connection to peer.