From 98fce318a386838861d30e6f76e1aadda82ba6ff Mon Sep 17 00:00:00 2001 From: Michael Quigley Date: Tue, 14 Jan 2020 10:10:50 -0500 Subject: [PATCH] go fmt ./... --- controller/db/db.go | 2 +- controller/handler_ctrl/close.go | 6 +++--- controller/handler_ctrl/inspect.go | 4 ++-- controller/handler_ctrl/metrics.go | 2 +- controller/handler_mgmt/accept.go | 2 +- controller/handler_mgmt/close.go | 2 +- controller/handler_mgmt/list_sessions.go | 2 +- controller/network/circuit.go | 2 +- controller/network/circuit_test.go | 2 +- controller/network/link_controller.go | 4 ++-- controller/network/network.go | 2 +- controller/network/router_store.go | 2 +- controller/network/service.go | 2 +- controller/network/service_store.go | 2 +- controller/network/session_lifecycle.go | 2 +- controller/network/smart.go | 1 - metrics/channel_reporter.go | 2 +- metrics/config.go | 4 ++-- metrics/interval_counter_test.go | 10 +++++----- pb/mgmt_pb/decoder.go | 2 +- router/forwarder/forwarder.go | 2 +- router/forwarder/options.go | 2 +- router/handler_ctrl/toggle_pipe_traces.go | 2 +- trace/channel_peekhandler.go | 2 +- trace/controller.go | 2 +- xctrl_example/receive.go | 2 +- xgress/messages.go | 2 +- xgress/messages_test.go | 4 ++-- xgress/options.go | 2 +- xgress/request.go | 1 - xgress_proxy/connection.go | 2 +- xgress_proxy/factory.go | 1 - xgress_udp/connection.go | 2 +- 33 files changed, 40 insertions(+), 43 deletions(-) diff --git a/controller/db/db.go b/controller/db/db.go index 464e6572b..c26c62abf 100644 --- a/controller/db/db.go +++ b/controller/db/db.go @@ -67,4 +67,4 @@ func createRoots(tx *bbolt.Tx) error { } } return nil -} \ No newline at end of file +} diff --git a/controller/handler_ctrl/close.go b/controller/handler_ctrl/close.go index a8140609a..61e35d9ef 100644 --- a/controller/handler_ctrl/close.go +++ b/controller/handler_ctrl/close.go @@ -23,8 +23,8 @@ import ( ) type closeHandler struct { - r *network.Router - network *network.Network + r *network.Router + network *network.Network } func newCloseHandler(r *network.Router, network *network.Network) *closeHandler { @@ -48,4 +48,4 @@ func newXctrlCloseHandler(done chan struct{}) channel2.CloseHandler { func (h *xctrlCloseHandler) HandleClose(ch channel2.Channel) { pfxlog.ContextLogger(ch.Label()).Info("closing Xctrl instances") close(h.done) -} \ No newline at end of file +} diff --git a/controller/handler_ctrl/inspect.go b/controller/handler_ctrl/inspect.go index 20aec1600..2519cfaac 100644 --- a/controller/handler_ctrl/inspect.go +++ b/controller/handler_ctrl/inspect.go @@ -57,8 +57,8 @@ func (h *inspectHandler) HandleReceive(request *channel2.Message, ch channel2.Ch h.respond(ch, request, response) } -func (h *inspectHandler) respondWithError(ch channel2.Channel, request *channel2.Message, errs...string) { - response := &ctrl_pb.InspectResponse{Success: false, Errors: errs } +func (h *inspectHandler) respondWithError(ch channel2.Channel, request *channel2.Message, errs ...string) { + response := &ctrl_pb.InspectResponse{Success: false, Errors: errs} h.respond(ch, request, response) } diff --git a/controller/handler_ctrl/metrics.go b/controller/handler_ctrl/metrics.go index 10cdff846..1d8d06d88 100644 --- a/controller/handler_ctrl/metrics.go +++ b/controller/handler_ctrl/metrics.go @@ -44,4 +44,4 @@ func (h *metricsHandler) HandleReceive(msg *channel2.Message, ch channel2.Channe } else { pfxlog.ContextLogger(ch.Label()).Errorf("unexpected error (%s)", err) } -} \ No newline at end of file +} diff --git a/controller/handler_mgmt/accept.go b/controller/handler_mgmt/accept.go index 4aec2995b..e152c9fef 100644 --- a/controller/handler_mgmt/accept.go +++ b/controller/handler_mgmt/accept.go @@ -51,4 +51,4 @@ func (mgmtAccepter *MgmtAccepter) Run() { } } } -} \ No newline at end of file +} diff --git a/controller/handler_mgmt/close.go b/controller/handler_mgmt/close.go index 4e1a97bcd..471726cca 100644 --- a/controller/handler_mgmt/close.go +++ b/controller/handler_mgmt/close.go @@ -17,8 +17,8 @@ package handler_mgmt import ( - "github.com/netfoundry/ziti-foundation/channel2" "github.com/michaelquigley/pfxlog" + "github.com/netfoundry/ziti-foundation/channel2" ) type xmgmtCloseHandler struct { diff --git a/controller/handler_mgmt/list_sessions.go b/controller/handler_mgmt/list_sessions.go index caca93504..c475f4730 100644 --- a/controller/handler_mgmt/list_sessions.go +++ b/controller/handler_mgmt/list_sessions.go @@ -78,4 +78,4 @@ func NewCircuit(circuit *network.Circuit) *mgmt_pb.Circuit { mgmtCircuit.Links = append(mgmtCircuit.Links, l.Id.Token) } return mgmtCircuit -} \ No newline at end of file +} diff --git a/controller/network/circuit.go b/controller/network/circuit.go index aa3b3f3e0..1f84dffae 100644 --- a/controller/network/circuit.go +++ b/controller/network/circuit.go @@ -34,7 +34,7 @@ func (circuit *Circuit) String() string { if len(circuit.Path) < 1 { return "{}" } - if len(circuit.Links) != len(circuit.Path) - 1 { + if len(circuit.Links) != len(circuit.Path)-1 { return "{malformed}" } out := fmt.Sprintf("[r/%s]", circuit.Path[0].Id) diff --git a/controller/network/circuit_test.go b/controller/network/circuit_test.go index b3537ed77..732b833db 100644 --- a/controller/network/circuit_test.go +++ b/controller/network/circuit_test.go @@ -158,4 +158,4 @@ func TestTransitCircuit2(t *testing.T) { assert.Equal(t, l1.Id.Token, rm2.Forwards[0].DstAddress) assert.Equal(t, l1.Id.Token, rm2.Forwards[1].SrcAddress) assert.Equal(t, circuit.EgressId, rm2.Forwards[1].DstAddress) -} \ No newline at end of file +} diff --git a/controller/network/link_controller.go b/controller/network/link_controller.go index 6dc174995..1f6c4f6e7 100644 --- a/controller/network/link_controller.go +++ b/controller/network/link_controller.go @@ -99,12 +99,12 @@ func (linkController *linkController) leastExpensiveLink(a, b *Router) (*Link, b currentState := link.CurrentState() if currentState != nil && currentState.Mode == Connected && !link.Down { if link.Src == a && link.Dst == b { - if link.SrcLatency + link.DstLatency < cost { + if link.SrcLatency+link.DstLatency < cost { selected = link } } if link.Dst == a && link.Src == b { - if link.SrcLatency + link.DstLatency < cost { + if link.SrcLatency+link.DstLatency < cost { selected = link } } diff --git a/controller/network/network.go b/controller/network/network.go index f99a4ea17..1d4df99e6 100644 --- a/controller/network/network.go +++ b/controller/network/network.go @@ -634,4 +634,4 @@ func (network *Network) GetServiceCache() Cache { type Cache interface { RemoveFromCache(id string) -} \ No newline at end of file +} diff --git a/controller/network/router_store.go b/controller/network/router_store.go index b681e81a9..f1824307a 100644 --- a/controller/network/router_store.go +++ b/controller/network/router_store.go @@ -139,4 +139,4 @@ func (store *routerStoreImpl) all() ([]*Router, error) { return nil, err } return routers, nil -} \ No newline at end of file +} diff --git a/controller/network/service.go b/controller/network/service.go index 6f9fa3ac5..99faf88ff 100644 --- a/controller/network/service.go +++ b/controller/network/service.go @@ -88,4 +88,4 @@ func (c *serviceController) remove(id string) error { func (c *serviceController) RemoveFromCache(id string) { c.cache.Remove(id) -} \ No newline at end of file +} diff --git a/controller/network/service_store.go b/controller/network/service_store.go index feb74b632..6fc2adf50 100644 --- a/controller/network/service_store.go +++ b/controller/network/service_store.go @@ -149,4 +149,4 @@ func (store *serviceStoreImpl) all() ([]*Service, error) { return nil, err } return services, nil -} \ No newline at end of file +} diff --git a/controller/network/session_lifecycle.go b/controller/network/session_lifecycle.go index b8442ab45..1fe776d8b 100644 --- a/controller/network/session_lifecycle.go +++ b/controller/network/session_lifecycle.go @@ -162,4 +162,4 @@ func (event *sessionCircuitEvent) handle(controller *sessionLifeCycleControllerI for _, handler := range controller.listeners { go handler.CircuitUpdated(event.sessionId, event.circuit) } -} \ No newline at end of file +} diff --git a/controller/network/smart.go b/controller/network/smart.go index 29b5c37a9..cddbb417b 100644 --- a/controller/network/smart.go +++ b/controller/network/smart.go @@ -86,4 +86,3 @@ func (network *Network) smart() { } /* */ } - diff --git a/metrics/channel_reporter.go b/metrics/channel_reporter.go index 44051b69b..4bc8b2ce1 100644 --- a/metrics/channel_reporter.go +++ b/metrics/channel_reporter.go @@ -51,4 +51,4 @@ func NewChannelReporter(ch channel2.Channel) Handler { return &channelReporter{ ch: ch, } -} \ No newline at end of file +} diff --git a/metrics/config.go b/metrics/config.go index 0b61809b9..e655db97f 100644 --- a/metrics/config.go +++ b/metrics/config.go @@ -27,7 +27,7 @@ type Config struct { } func LoadConfig(srcmap map[interface{}]interface{}) (*Config, error) { - cfg := &Config{handlers: make(map[Handler]Handler)} + cfg := &Config{handlers: make(map[Handler]Handler)} for k, v := range srcmap { if name, ok := k.(string); ok { @@ -50,4 +50,4 @@ func LoadConfig(srcmap map[interface{}]interface{}) (*Config, error) { } return cfg, nil -} \ No newline at end of file +} diff --git a/metrics/interval_counter_test.go b/metrics/interval_counter_test.go index 951e72959..2ead5c039 100644 --- a/metrics/interval_counter_test.go +++ b/metrics/interval_counter_test.go @@ -146,21 +146,21 @@ func TestTrackerNonDuplicate(t *testing.T) { // interval N-3 interval = intervals[0] - assert.Equal(currentMinute.Add(time.Minute * - 3).UTC().Unix(), interval.intervalStartUTC) - assert.Equal(currentMinute.Add(time.Minute * - 2).UTC().Unix(), interval.intervalEndUTC) + assert.Equal(currentMinute.Add(time.Minute*-3).UTC().Unix(), interval.intervalStartUTC) + assert.Equal(currentMinute.Add(time.Minute*-2).UTC().Unix(), interval.intervalEndUTC) assert.Equal(1, len(interval.values)) assert.Equal(uint64(567), interval.values[intervalID2]) // interval N-2 interval = intervals[1] - assert.Equal(currentMinute.Add(time.Minute * - 2).UTC().Unix(), interval.intervalStartUTC) - assert.Equal(currentMinute.Add(time.Minute * - 1).UTC().Unix(), interval.intervalEndUTC) + assert.Equal(currentMinute.Add(time.Minute*-2).UTC().Unix(), interval.intervalStartUTC) + assert.Equal(currentMinute.Add(time.Minute*-1).UTC().Unix(), interval.intervalEndUTC) assert.Equal(1, len(interval.values)) assert.Equal(uint64(234), interval.values[intervalID1]) // interval N-1 interval = intervals[2] - assert.Equal(currentMinute.Add(time.Minute * - 1).UTC().Unix(), interval.intervalStartUTC) + assert.Equal(currentMinute.Add(time.Minute*-1).UTC().Unix(), interval.intervalStartUTC) assert.Equal(currentMinute.UTC().Unix(), interval.intervalEndUTC) assert.Equal(2, len(interval.values)) assert.Equal(uint64(200), interval.values[intervalID1]) diff --git a/pb/mgmt_pb/decoder.go b/pb/mgmt_pb/decoder.go index e239633d5..19b0019cd 100644 --- a/pb/mgmt_pb/decoder.go +++ b/pb/mgmt_pb/decoder.go @@ -320,4 +320,4 @@ func (circuit *Circuit) CalculateDisplayPath() string { } } return out -} \ No newline at end of file +} diff --git a/router/forwarder/forwarder.go b/router/forwarder/forwarder.go index 1eccb9435..71d69ca89 100644 --- a/router/forwarder/forwarder.go +++ b/router/forwarder/forwarder.go @@ -231,4 +231,4 @@ func (forwarder *Forwarder) unrouteTimeout(sessionId *identity.TokenId, ms int64 return } } -} \ No newline at end of file +} diff --git a/router/forwarder/options.go b/router/forwarder/options.go index 9756a4da1..126b7cae8 100644 --- a/router/forwarder/options.go +++ b/router/forwarder/options.go @@ -41,4 +41,4 @@ func LoadOptions(src map[interface{}]interface{}) (*Options, error) { } return options, nil -} \ No newline at end of file +} diff --git a/router/handler_ctrl/toggle_pipe_traces.go b/router/handler_ctrl/toggle_pipe_traces.go index 6607d004b..a4b2f8811 100644 --- a/router/handler_ctrl/toggle_pipe_traces.go +++ b/router/handler_ctrl/toggle_pipe_traces.go @@ -96,4 +96,4 @@ func sendResult(request *channel2.Message, ch channel2.Channel, message string, response.ReplyTo(request) ch.Send(response) log.Debug("success") -} \ No newline at end of file +} diff --git a/trace/channel_peekhandler.go b/trace/channel_peekhandler.go index be04e7d4d..e1978dcb6 100644 --- a/trace/channel_peekhandler.go +++ b/trace/channel_peekhandler.go @@ -162,4 +162,4 @@ func (sink *channelSink) Accept(event *trace_pb.ChannelMessage) { } else { log.Tracef("Reported trace to fabric controller") } -} \ No newline at end of file +} diff --git a/trace/controller.go b/trace/controller.go index 7b6c672cb..97d8ba869 100644 --- a/trace/controller.go +++ b/trace/controller.go @@ -17,8 +17,8 @@ package trace import ( - "github.com/netfoundry/ziti-foundation/trace/pb" "fmt" + "github.com/netfoundry/ziti-foundation/trace/pb" "regexp" "strings" ) diff --git a/xctrl_example/receive.go b/xctrl_example/receive.go index 1552a97b9..153de6bf7 100644 --- a/xctrl_example/receive.go +++ b/xctrl_example/receive.go @@ -45,4 +45,4 @@ func (h *receiveHandler) HandleReceive(msg *channel2.Message, ch channel2.Channe } else { pfxlog.Logger().Errorf("unexpected body length [%d]", len(msg.Body)) } -} \ No newline at end of file +} diff --git a/xgress/messages.go b/xgress/messages.go index 7fbd0c9dd..df4f23e09 100644 --- a/xgress/messages.go +++ b/xgress/messages.go @@ -246,4 +246,4 @@ func (payload *Payload) GetLoggerFields() logrus.Fields { "origin": payload.GetOriginator(), "uuid": uuidz.ToString(payload.Headers[HeaderKeyUUID]), } -} \ No newline at end of file +} diff --git a/xgress/messages_test.go b/xgress/messages_test.go index 8b7195533..6b0f7147d 100644 --- a/xgress/messages_test.go +++ b/xgress/messages_test.go @@ -92,7 +92,7 @@ func TestAcknowledgement_marshallSequence(t *testing.T) { ack := &Acknowledgement{ Sequence: tt.sequence, } - got := ack.marshallSequence(); + got := ack.marshallSequence() ack2 := &Acknowledgement{} err := ack2.unmarshallSequence(got) assert.NoError(t, err) @@ -105,4 +105,4 @@ func TestAcknowledgement_marshallSequence(t *testing.T) { } }) } -} \ No newline at end of file +} diff --git a/xgress/options.go b/xgress/options.go index c4f84ac45..f7f48db2a 100644 --- a/xgress/options.go +++ b/xgress/options.go @@ -61,4 +61,4 @@ func (options Options) String() string { return err.Error() } return string(data) -} \ No newline at end of file +} diff --git a/xgress/request.go b/xgress/request.go index 9e2c01abd..e9d26cf10 100644 --- a/xgress/request.go +++ b/xgress/request.go @@ -285,4 +285,3 @@ func UnbindService(ctrl CtrlChannel, token string, serviceId string) error { return errors.New("timeout while unbinding") } } - diff --git a/xgress_proxy/connection.go b/xgress_proxy/connection.go index ad04b1e16..70def0892 100644 --- a/xgress_proxy/connection.go +++ b/xgress_proxy/connection.go @@ -38,4 +38,4 @@ func (c *proxyXgressConnection) Write(p []byte) (n int, err error) { func (c *proxyXgressConnection) WritePayload(p []byte, headers map[uint8][]byte) (n int, err error) { return c.Writer().Write(p) -} \ No newline at end of file +} diff --git a/xgress_proxy/factory.go b/xgress_proxy/factory.go index 7fb8ed276..26337a067 100644 --- a/xgress_proxy/factory.go +++ b/xgress_proxy/factory.go @@ -46,4 +46,3 @@ type factory struct { ctrl xgress.CtrlChannel options *xgress.Options } - diff --git a/xgress_udp/connection.go b/xgress_udp/connection.go index 552ab9fb4..944d766a7 100644 --- a/xgress_udp/connection.go +++ b/xgress_udp/connection.go @@ -40,4 +40,4 @@ func (xpc *xgressPacketConn) ReadPayload() ([]byte, map[uint8][]byte, error) { func (xpc *xgressPacketConn) WritePayload(p []byte, headers map[uint8][]byte) (n int, err error) { return xpc.Write(p) -} \ No newline at end of file +}