Formatting [ci skip]

Author: vfarcic

proxy/types.go

@@ -100,7 +100,6 @@ type Service struct {
 	LookupRetry         int
 	LookupRetryInterval int
 	ServiceDest         []ServiceDest
-
 }
 
 type Services []Service

server/server.go

@@ -5,11 +5,11 @@ import (
 	"../proxy"
 	"encoding/json"
 	"fmt"
+	"github.com/kelseyhightower/envconfig"
 	"net/http"
 	"os"
 	"strconv"
 	"strings"
-	"github.com/kelseyhightower/envconfig"
 )
 
 var usersBasePath string = "/run/secrets/dfp_users_%s"
@@ -257,8 +257,8 @@ func (m *Serve) getServiceFromEnvVars(prefix string) (proxy.Service, error) {
 	}
 	sd := []proxy.ServiceDest{}
 	path := []string{}
-	if len(os.Getenv(prefix + "_SERVICE_PATH")) > 0 {
-		path = strings.Split(os.Getenv(prefix + "_SERVICE_PATH"), ",")
+	if len(os.Getenv(prefix+"_SERVICE_PATH")) > 0 {
+		path = strings.Split(os.Getenv(prefix+"_SERVICE_PATH"), ",")
 	}
 	port := os.Getenv(prefix + "_PORT")
 	srcPort, _ := strconv.Atoi(os.Getenv(prefix + "_SRC_PORT"))

server/server_test.go

@@ -9,10 +9,10 @@ import (
 	"github.com/stretchr/testify/suite"
 	"net/http"
 	"net/http/httptest"
-	"strings"
-	"testing"
 	"os"
 	"strconv"
+	"strings"
+	"testing"
 )
 
 type ServerTestSuite struct {
@@ -793,29 +793,29 @@ func (s *ServerTestSuite) Test_UsersMerge_AllCases() {
 
 func (s *ServerTestSuite) Test_GetServicesFromEnvVars_ReturnsServices() {
 	service := proxy.Service{
-		AclName: "my-AclName",
-		ConsulTemplateBePath: "my-ConsulTemplateBePath",
-		ConsulTemplateFePath: "my-ConsulTemplateFePath",
-		Distribute: true,
-		HttpsOnly: true,
-		HttpsPort: 1234,
-		OutboundHostname: "my-OutboundHostname",
-		PathType: "my-PathType",
+		AclName:               "my-AclName",
+		ConsulTemplateBePath:  "my-ConsulTemplateBePath",
+		ConsulTemplateFePath:  "my-ConsulTemplateFePath",
+		Distribute:            true,
+		HttpsOnly:             true,
+		HttpsPort:             1234,
+		OutboundHostname:      "my-OutboundHostname",
+		PathType:              "my-PathType",
 		RedirectWhenHttpProto: true,
-		ReqMode: "my-ReqMode",
-		ReqPathReplace: "my-ReqPathReplace",
-		ReqPathSearch: "my-ReqPathSearch",
-		ServiceCert: "my-ServiceCert",
-		ServiceDomain: []string{"my-domain-1.com", "my-domain-2.com"},
+		ReqMode:               "my-ReqMode",
+		ReqPathReplace:        "my-ReqPathReplace",
+		ReqPathSearch:         "my-ReqPathSearch",
+		ServiceCert:           "my-ServiceCert",
+		ServiceDomain:         []string{"my-domain-1.com", "my-domain-2.com"},
 		ServiceDomainMatchAll: true,
-		ServiceName: "my-ServiceName",
-		SkipCheck: true,
-		SslVerifyNone: true,
-		TemplateBePath: "my-TemplateBePath",
-		TemplateFePath: "my-TemplateFePath",
-		TimeoutServer: "my-TimeoutServer",
-		TimeoutTunnel: "my-TimeoutTunnel",
-		XForwardedProto: true,
+		ServiceName:           "my-ServiceName",
+		SkipCheck:             true,
+		SslVerifyNone:         true,
+		TemplateBePath:        "my-TemplateBePath",
+		TemplateFePath:        "my-TemplateFePath",
+		TimeoutServer:         "my-TimeoutServer",
+		TimeoutTunnel:         "my-TimeoutTunnel",
+		XForwardedProto:       true,
 		ServiceDest: []proxy.ServiceDest{
 			{Port: "1111", ServicePath: []string{"my-path-11", "my-path-12"}, SrcPort: 1112},
 		},
@@ -1011,11 +1011,11 @@ func getRemoveMock(skipMethod string) *RemoveMock {
 }
 
 type ReconfigureMock struct {
-	ExecuteMock           		func(args []string) error
-	GetDataMock           		func() (actions.BaseReconfigure, proxy.Service)
-	ReloadServicesFromListenerMock 		func(addresses []string, instanceName, mode, listenerAddress string) error
-	GetTemplatesMock      		func(sr *proxy.Service) (front, back string, err error)
-	GetServicesFromEnvVarsMock 	func() []proxy.Service
+	ExecuteMock                    func(args []string) error
+	GetDataMock                    func() (actions.BaseReconfigure, proxy.Service)
+	ReloadServicesFromListenerMock func(addresses []string, instanceName, mode, listenerAddress string) error
+	GetTemplatesMock               func(sr *proxy.Service) (front, back string, err error)
+	GetServicesFromEnvVarsMock     func() []proxy.Service
 }
 
 func (m ReconfigureMock) Execute(args []string) error {

server/util_test.go

@@ -1,14 +1,14 @@
 package server
 
 import (
+	"fmt"
 	"github.com/stretchr/testify/suite"
-	"testing"
+	"io/ioutil"
 	"net/http"
-	"fmt"
-	"net/url"
 	"net/http/httptest"
+	"net/url"
 	"strings"
-	"io/ioutil"
+	"testing"
 )
 
 type UtilTestSuite struct {
@@ -152,4 +152,4 @@ func (s *ServerTestSuite) Test_SendDistributeRequests_ReturnsError_WhenProxyIPsA
 
 	s.Assertions.Equal(http.StatusBadRequest, actualStatus)
 	s.Assertions.Error(err)
-}
+}

server_test.go

@@ -486,11 +486,11 @@ func (m CertMock) Init() error {
 }
 
 type ServerMock struct {
-	GetServiceFromUrlMock func(req *http.Request) *proxy.Service
-	TestHandlerMock func(w http.ResponseWriter, req *http.Request)
-	ReconfigureHandlerMock func(w http.ResponseWriter, req *http.Request)
-	ReloadHandlerMock func(w http.ResponseWriter, req *http.Request)
-	RemoveHandlerMock func(w http.ResponseWriter, req *http.Request)
+	GetServiceFromUrlMock      func(req *http.Request) *proxy.Service
+	TestHandlerMock            func(w http.ResponseWriter, req *http.Request)
+	ReconfigureHandlerMock     func(w http.ResponseWriter, req *http.Request)
+	ReloadHandlerMock          func(w http.ResponseWriter, req *http.Request)
+	RemoveHandlerMock          func(w http.ResponseWriter, req *http.Request)
 	GetServicesFromEnvVarsMock func() *[]proxy.Service
 }
 
@@ -536,11 +536,11 @@ func getRunMock(skipMethod string) *RunMock {
 }
 
 type ReconfigureMock struct {
-	ExecuteMock           		func(args []string) error
-	GetDataMock           		func() (actions.BaseReconfigure, proxy.Service)
-	ReloadServicesFromListenerMock 		func(addresses []string, instanceName, mode, listenerAddress string) error
-	GetTemplatesMock      		func(sr *proxy.Service) (front, back string, err error)
-	GetServicesFromEnvVarsMock 	func() []proxy.Service
+	ExecuteMock                    func(args []string) error
+	GetDataMock                    func() (actions.BaseReconfigure, proxy.Service)
+	ReloadServicesFromListenerMock func(addresses []string, instanceName, mode, listenerAddress string) error
+	GetTemplatesMock               func(sr *proxy.Service) (front, back string, err error)
+	GetServicesFromEnvVarsMock     func() []proxy.Service
 }
 
 func (m ReconfigureMock) Execute(args []string) error {