Formatting

Author: vfarcic

integration_tests/integration_test.go

@@ -43,11 +43,11 @@ import (
 	"io/ioutil"
 	"log"
 	"net/http"
+	"net/url"
 	"os"
 	"os/exec"
 	"strings"
 	"testing"
-	"net/url"
 )
 
 type IntegrationTestSuite struct {

proxy/ha_proxy_test.go

@@ -177,7 +177,7 @@ func (s HaProxyTestSuite) Test_CreateConfigFromTemplates_AddsDebug() {
 	os.Setenv("DEBUG", "true")
 	var actualData string
 	tmpl := strings.Replace(s.TemplateContent, "tune.ssl.default-dh-param 2048", "tune.ssl.default-dh-param 2048\n    debug", -1)
-	tmpl = strings.Replace(tmpl,"    option  dontlognull\n    option  dontlog-normal\n", "", -1)
+	tmpl = strings.Replace(tmpl, "    option  dontlognull\n    option  dontlog-normal\n", "", -1)
 	expectedData := fmt.Sprintf(
 		"%s%s",
 		tmpl,

reconfigure.go

@@ -58,7 +58,7 @@ type ServiceReconfigure struct {
 	LookupRetry          int
 	LookupRetryInterval  int
 	ReqRepSearch         string
-	ReqRepReplace		 string
+	ReqRepReplace        string
 	TemplateFePath       string
 	TemplateBePath       string
 }
@@ -283,7 +283,7 @@ func (m *Reconfigure) GetTemplates(sr ServiceReconfigure) (front, back string, e
 			return "", "", err
 		}
 		front, back = m.parseTemplate(string(feTmpl), string(beTmpl), sr)
-	} else if len(sr.ConsulTemplateFePath) > 0 && len(sr.ConsulTemplateBePath) > 0 {
+	} else if len(sr.ConsulTemplateFePath) > 0 && len(sr.ConsulTemplateBePath) > 0 { // Sunset
 		front, err = m.getConsulTemplateFromFile(sr.ConsulTemplateFePath)
 		if err != nil {
 			return "", "", err
@@ -349,7 +349,7 @@ func (m *Reconfigure) getTemplateFromGo(sr ServiceReconfigure) (frontend, backen
 		srcBack += `
     acl {{.ServiceName}}UsersAcl http_auth({{.ServiceName}}Users)
     http-request auth realm {{.ServiceName}}Realm if !{{.ServiceName}}UsersAcl`
-	} else 	if len(os.Getenv("USERS")) > 0 {
+	} else if len(os.Getenv("USERS")) > 0 {
 		srcBack += `
     acl defaultUsersAcl http_auth(defaultUsers)
     http-request auth realm defaultRealm if !defaultUsersAcl`

reconfigure_test.go

@@ -92,8 +92,8 @@ func (s ReconfigureTestSuite) Test_GetTemplates_AddsHttpAuth_WhenUsersEnvIsPrese
 
 func (s ReconfigureTestSuite) Test_GetTemplates_AddsHttpAuth_WhenUsersIsPresent() {
 	s.reconfigure.Users = []User{
-		{ Username: "user-1", Password: "pass-1" },
-		{ Username: "user-2", Password: "pass-2" },
+		{Username: "user-1", Password: "pass-1"},
+		{Username: "user-2", Password: "pass-2"},
 	}
 	expected := `userlist myServiceUsers
     user user-1 insecure-password pass-1
@@ -146,8 +146,8 @@ func (s ReconfigureTestSuite) Test_GetTemplates_AddsHttpAuth_WhenModeIsSwarmAndU
 
 func (s ReconfigureTestSuite) Test_GetTemplates_AddsHttpAuth_WhenModeIsSwarmAndUsersIsPresent() {
 	s.reconfigure.Users = []User{
-		{ Username: "user-1", Password: "pass-1" },
-		{ Username: "user-2", Password: "pass-2" },
+		{Username: "user-1", Password: "pass-1"},
+		{Username: "user-2", Password: "pass-2"},
 	}
 	s.reconfigure.ServiceReconfigure.Mode = "swarm"
 	s.reconfigure.ServiceReconfigure.Port = "1234"
@@ -196,7 +196,6 @@ func (s ReconfigureTestSuite) Test_GetTemplates_AddsReqRep_WhenReqRepSearchAndRe
 	s.Equal(expected, backend)
 }
 
-
 func (s ReconfigureTestSuite) Test_GetTemplates_UsesAclNameForFrontEnd() {
 	s.reconfigure.AclName = "my-acl"
 	s.ConsulTemplateFe = `

server.go

@@ -49,8 +49,8 @@ type Response struct {
 	Distribute           bool
 	Users                []User
 	ReqRepSearch         string
-	ReqRepReplace		 string
-	TemplateFePath		 string
+	ReqRepReplace        string
+	TemplateFePath       string
 	TemplateBePath       string
 }
 

server_test.go

@@ -419,7 +419,7 @@ func (s *ServerTestSuite) Test_ServeHTTP_ReturnsJsonWithReqRep_WhenPresent() {
 	search := "search"
 	replace := "replace"
 	url := fmt.Sprintf(
-		s.ReconfigureUrl+"&reqRepSearch="+search+"&reqRepReplace="+replace,
+		s.ReconfigureUrl + "&reqRepSearch=" + search + "&reqRepReplace=" + replace,
 	)
 	req, _ := http.NewRequest("GET", url, nil)
 	expected, _ := json.Marshal(Response{
@@ -449,7 +449,7 @@ func (s *ServerTestSuite) Test_ServeHTTP_ReturnsJsonWithTemplatePaths_WhenPresen
 	)
 	req, _ := http.NewRequest("GET", url, nil)
 	expected, _ := json.Marshal(Response{
-		Status:        "OK",
+		Status:         "OK",
 		ServiceName:    s.ServiceName,
 		ServiceColor:   s.ServiceColor,
 		ServicePath:    s.ServicePath,
@@ -465,9 +465,9 @@ func (s *ServerTestSuite) Test_ServeHTTP_ReturnsJsonWithTemplatePaths_WhenPresen
 }
 
 func (s *ServerTestSuite) Test_ServeHTTP_ReturnsJsonWithUsers_WhenPresent() {
-	users := []User {
-		{ Username: "user1", Password: "pass1" },
-		{ Username: "user2", Password: "pass2" },
+	users := []User{
+		{Username: "user1", Password: "pass1"},
+		{Username: "user2", Password: "pass2"},
 	}
 	req, _ := http.NewRequest("GET", s.ReconfigureUrl+"&users=user1:pass1,user2:pass2", nil)
 	expected, _ := json.Marshal(Response{