Merge branch 'templates'

# Conflicts:
#	README.md

Author: vfarcic

Dockerfile

@@ -11,6 +11,7 @@ RUN apk add --no-cache --virtual .build-deps curl unzip && \
 RUN mkdir /lib64 && ln -s /lib/libc.musl-x86_64.so.1 /lib64/ld-linux-x86-64.so.2
 RUN mkdir -p /cfg/tmpl
 RUN mkdir /consul_templates
+RUN mkdir /templates
 RUN mkdir -p /certs
 
 ENV CONSUL_ADDRESS="" \

README.md

@@ -78,14 +78,16 @@ The following query arguments can be used to send as a *reconfigure* request to
 |consulTemplateBePath|The path to the Consul Template representing a snippet of the backend configuration. If specified, the proxy template will be loaded from the specified file.|||/consul_templates/tmpl/go-demo-be.tmpl|
 |consulTemplateFePath|The path to the Consul Template representing a snippet of the frontend configuration. If specified, the proxy template will be loaded from the specified file.|||/consul_templates/tmpl/go-demo-fe.tmpl|
 |distribute   |Whether to distribute a request to all the instances of the proxy. Used only in the *swarm* mode.|No|false|true|
+|outboundHostname|The hostname where the service is running, for instance on a separate swarm. If specified, the proxy will dispatch requests to that domain.|No||machine123.internal.ecme.com|
 |pathType     |The ACL derivative. Defaults to *path_beg*. See [HAProxy path](https://cbonte.github.io/haproxy-dconv/configuration-1.5.html#7.3.6-path) for more info.|No||path_beg|
 |port         |The internal port of a service that should be reconfigured. The port is used only in the *swarm* mode|Only in *swarm* mode|||8080|
 |reqRepReplace|A regular expression to apply the modification. If specified, `reqRepSearch` needs to be set as well.|No||\1\ /demo/\2|
 |reqRepSearch |A regular expression to search the content to be replaced. If specified, `reqRepReplace` needs to be set as well.|No||^([^\ ]\*)\ /something/(.\*)|
 |serviceDomain|The domain of the service. If specified, the proxy will allow access only to requests coming to that domain. Multiple domains should be separated with comma (`,`).|No||ecme.com|
 |serviceName  |The name of the service. It must match the name of the Swarm service or the one stored in Consul.|Yes     |       |go-demo      |
 |servicePath  |The URL path of the service. Multiple values should be separated with comma (`,`).|Yes (unless consulTemplatePath is present)||/api/v1/books|
-|outboundHostname|The hostname where the service is running, for instance on a separate swarm. If specified, the proxy will dispatch requests to that domain.|No||machine123.internal.ecme.com|
+|templateBePath|The path to the template representing a snippet of the backend configuration. If specified, the backend template will be loaded from the specified file. If specified, `templateFePath` must be set as well|||/templates/go-demo-be.tmpl|
+|templateFePath|The path to the template representing a snippet of the frontend configuration. If specified, the frontend template will be loaded from the specified file. If specified, `templateBePath` must be set as well|||/templates/go-demo-fe.tmpl|
 |skipCheck    |Whether to skip adding proxy checks. This option is used only in the *default* mode.|No      |false  |true         |
 |users        |A comma-separated list of credentials(<user>:<pass>) for HTTP basic auth, which applies only to the service that will be reconfigured.|No||user1:pass1,user2:pass2|
 

TODO.md

@@ -1,6 +1,6 @@
 # TODO
 
-## Template
+## Logging
 
 [ ] Implement
 [ ] Add integration tests

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

@@ -62,7 +62,9 @@ type ServiceReconfigure struct {
 	LookupRetry          int
 	LookupRetryInterval  int
 	ReqRepSearch         string
-	ReqRepReplace		 string
+	ReqRepReplace        string
+	TemplateFePath       string
+	TemplateBePath       string
 }
 
 type BaseReconfigure struct {
@@ -283,7 +285,17 @@ func (m *Reconfigure) putToConsul(addresses []string, sr ServiceReconfigure, ins
 }
 
 func (m *Reconfigure) GetTemplates(sr ServiceReconfigure) (front, back string, err error) {
-	if len(sr.ConsulTemplateFePath) > 0 && len(sr.ConsulTemplateBePath) > 0 {
+	if len(sr.TemplateFePath) > 0 && len(sr.TemplateBePath) > 0 {
+		feTmpl, err := readTemplateFile(sr.TemplateFePath)
+		if err != nil {
+			return "", "", err
+		}
+		beTmpl, err := readTemplateFile(sr.TemplateBePath)
+		if err != nil {
+			return "", "", err
+		}
+		front, back = m.parseTemplate(string(feTmpl), string(beTmpl), sr)
+	} else if len(sr.ConsulTemplateFePath) > 0 && len(sr.ConsulTemplateBePath) > 0 { // Sunset
 		front, err = m.getConsulTemplateFromFile(sr.ConsulTemplateFePath)
 		if err != nil {
 			return "", "", err
@@ -327,10 +339,6 @@ func (m *Reconfigure) getTemplateFromGo(sr ServiceReconfigure) (frontend, backen
     use_backend {{.AclName}}-be if url_{{.ServiceName}}{{.AclCondition}}`,
 		sr.Acl,
 	)
-//	if len(sr.ReqRepSearch) > 0 && len(sr.ReqRepReplace) > 0 {
-//		srcFront += `
-//    reqrep {{.ReqRepSearch}} {{.ReqRepReplace}} if url_{{.ServiceName}}`
-//	}
 	srcBack := ""
 	if len(sr.Users) > 0 {
 		srcBack += `userlist {{.ServiceName}}Users{{range .Users}}
@@ -357,13 +365,17 @@ 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`
 	}
-	tmplFront, _ := template.New("consulTemplate").Parse(srcFront)
-	tmplBack, _ := template.New("consulTemplate").Parse(srcBack)
+	return m.parseTemplate(srcFront, srcBack, sr)
+}
+
+func (m *Reconfigure) parseTemplate(front, back string, sr ServiceReconfigure) (pFront, pBack string) {
+	tmplFront, _ := template.New("consulTemplate").Parse(front)
+	tmplBack, _ := template.New("consulTemplate").Parse(back)
 	var ctFront bytes.Buffer
 	var ctBack bytes.Buffer
 	tmplFront.Execute(&ctFront, sr)

reconfigure_test.go

@@ -66,14 +66,14 @@ func (s *ReconfigureTestSuite) SetupTest() {
 
 // GetTemplate
 
-func (s ReconfigureTestSuite) Test_GetTemplate_ReturnsFormattedContent() {
+func (s ReconfigureTestSuite) Test_GetTemplates_ReturnsFormattedContent() {
 	front, back, _ := s.reconfigure.GetTemplates(s.reconfigure.ServiceReconfigure)
 
 	s.Equal(s.ConsulTemplateFe, front)
 	s.Equal(s.ConsulTemplateBe, back)
 }
 
-func (s ReconfigureTestSuite) Test_GetTemplate_AddsHttpAuth_WhenUsersEnvIsPresent() {
+func (s ReconfigureTestSuite) Test_GetTemplates_AddsHttpAuth_WhenUsersEnvIsPresent() {
 	usersOrig := os.Getenv("USERS")
 	defer func() { os.Setenv("USERS", usersOrig) }()
 	os.Setenv("USERS", "anything")
@@ -90,10 +90,10 @@ func (s ReconfigureTestSuite) Test_GetTemplate_AddsHttpAuth_WhenUsersEnvIsPresen
 	s.Equal(expected, back)
 }
 
-func (s ReconfigureTestSuite) Test_GetTemplate_AddsHttpAuth_WhenUsersIsPresent() {
+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
@@ -112,7 +112,7 @@ backend myService-be
 	s.Equal(expected, back)
 }
 
-func (s ReconfigureTestSuite) Test_GetTemplate_ReturnsFormattedContent_WhenModeIsSwarm() {
+func (s ReconfigureTestSuite) Test_GetTemplates_ReturnsFormattedContent_WhenModeIsSwarm() {
 	modes := []string{"service", "sWARm"}
 	for _, mode := range modes {
 		s.reconfigure.ServiceReconfigure.Mode = mode
@@ -127,7 +127,7 @@ func (s ReconfigureTestSuite) Test_GetTemplate_ReturnsFormattedContent_WhenModeI
 	}
 }
 
-func (s ReconfigureTestSuite) Test_GetTemplate_AddsHttpAuth_WhenModeIsSwarmAndUsersEnvIsPresent() {
+func (s ReconfigureTestSuite) Test_GetTemplates_AddsHttpAuth_WhenModeIsSwarmAndUsersEnvIsPresent() {
 	usersOrig := os.Getenv("USERS")
 	defer func() { os.Setenv("USERS", usersOrig) }()
 	os.Setenv("USERS", "anything")
@@ -144,10 +144,10 @@ func (s ReconfigureTestSuite) Test_GetTemplate_AddsHttpAuth_WhenModeIsSwarmAndUs
 	s.Equal(expected, actual)
 }
 
-func (s ReconfigureTestSuite) Test_GetTemplate_AddsHttpAuth_WhenModeIsSwarmAndUsersIsPresent() {
+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"
@@ -166,7 +166,7 @@ backend myService-be
 	s.Equal(expected, actual)
 }
 
-func (s ReconfigureTestSuite) Test_GetTemplate_AddsHosts() {
+func (s ReconfigureTestSuite) Test_GetTemplates_AddsHosts() {
 	s.ConsulTemplateFe = `
     acl url_myService path_beg path/to/my/service/api path_beg path/to/my/other/service/api
     acl domain_myService hdr_dom(host) -i my-domain.com my-other-domain.com
@@ -177,26 +177,7 @@ func (s ReconfigureTestSuite) Test_GetTemplate_AddsHosts() {
 	s.Equal(s.ConsulTemplateFe, actual)
 }
 
-//func (s ReconfigureTestSuite) Test_GetTemplate_AddsReqRep_WhenReqRepSearchAndReqRepReplaceArePresent() {
-//	s.reconfigure.ReqRepSearch = "this"
-//	s.reconfigure.ReqRepReplace = "that"
-//	expected := fmt.Sprintf(`
-//    acl url_%s path_beg path/to/my/service/api path_beg path/to/my/other/service/api
-//    use_backend %s-be if url_myService
-//    reqrep %s %s if url_%s`,
-//		s.reconfigure.ServiceName,
-//		s.reconfigure.ServiceName,
-//		s.reconfigure.ReqRepSearch,
-//		s.reconfigure.ReqRepReplace,
-//		s.reconfigure.ServiceName,
-//	)
-//
-//	front, _, _ := s.reconfigure.GetTemplates(s.reconfigure.ServiceReconfigure)
-//
-//	s.Equal(expected, front)
-//}
-
-func (s ReconfigureTestSuite) Test_GetTemplate_AddsReqRep_WhenReqRepSearchAndReqRepReplaceArePresent() {
+func (s ReconfigureTestSuite) Test_GetTemplates_AddsReqRep_WhenReqRepSearchAndReqRepReplaceArePresent() {
 	s.reconfigure.ReqRepSearch = "this"
 	s.reconfigure.ReqRepReplace = "that"
 	expected := fmt.Sprintf(`backend myService-be
@@ -215,8 +196,7 @@ func (s ReconfigureTestSuite) Test_GetTemplate_AddsReqRep_WhenReqRepSearchAndReq
 	s.Equal(expected, backend)
 }
 
-
-func (s ReconfigureTestSuite) Test_GetTemplate_UsesAclNameForFrontEnd() {
+func (s ReconfigureTestSuite) Test_GetTemplates_UsesAclNameForFrontEnd() {
 	s.reconfigure.AclName = "my-acl"
 	s.ConsulTemplateFe = `
     acl url_myService path_beg path/to/my/service/api path_beg path/to/my/other/service/api
@@ -226,15 +206,15 @@ func (s ReconfigureTestSuite) Test_GetTemplate_UsesAclNameForFrontEnd() {
 	s.Equal(s.ConsulTemplateFe, actual)
 }
 
-func (s ReconfigureTestSuite) Test_GetTemplate_UsesPathReg() {
+func (s ReconfigureTestSuite) Test_GetTemplates_UsesPathReg() {
 	s.ConsulTemplateFe = strings.Replace(s.ConsulTemplateFe, "path_beg", "path_reg", -1)
 	s.reconfigure.PathType = "path_reg"
 	front, _, _ := s.reconfigure.GetTemplates(s.reconfigure.ServiceReconfigure)
 
 	s.Equal(s.ConsulTemplateFe, front)
 }
 
-func (s ReconfigureTestSuite) Test_GetTemplate_AddsColor() {
+func (s ReconfigureTestSuite) Test_GetTemplates_AddsColor() {
 	s.reconfigure.ServiceColor = "black"
 	expected := fmt.Sprintf(`service "%s-%s"`, s.ServiceName, s.reconfigure.ServiceColor)
 
@@ -243,15 +223,15 @@ func (s ReconfigureTestSuite) Test_GetTemplate_AddsColor() {
 	s.Contains(actual, expected)
 }
 
-func (s ReconfigureTestSuite) Test_GetTemplate_DoesNotSetCheckWhenSkipCheckIsTrue() {
+func (s ReconfigureTestSuite) Test_GetTemplates_DoesNotSetCheckWhenSkipCheckIsTrue() {
 	s.ConsulTemplateBe = strings.Replace(s.ConsulTemplateBe, " check", "", -1)
 	s.reconfigure.SkipCheck = true
 	_, actual, _ := s.reconfigure.GetTemplates(s.reconfigure.ServiceReconfigure)
 
 	s.Equal(s.ConsulTemplateBe, actual)
 }
 
-func (s ReconfigureTestSuite) Test_GetTemplate_ReturnsFileContent_WhenConsulTemplatePathIsSet() {
+func (s ReconfigureTestSuite) Test_GetTemplates_ReturnsFileContent_WhenConsulTemplatePathIsSet() {
 	expected := "This is content of a template"
 	readTemplateFileOrig := readTemplateFile
 	defer func() { readTemplateFile = readTemplateFileOrig }()
@@ -266,10 +246,71 @@ func (s ReconfigureTestSuite) Test_GetTemplate_ReturnsFileContent_WhenConsulTemp
 	s.Equal(expected, actual)
 }
 
-func (s ReconfigureTestSuite) Test_GetTemplate_ReturnsError_WhenConsulTemplateFileIsNotAvailable() {
+func (s ReconfigureTestSuite) Test_GetTemplates_ProcessesTemplateFromTemplatePath_WhenSpecified() {
+	expectedFeFile := "/path/to/my/fe/template"
+	expectedBeFile := "/path/to/my/be/template"
+	expectedFe := fmt.Sprintf("This is service %s", s.reconfigure.ServiceName)
+	expectedBe := fmt.Sprintf("This is path %s", s.reconfigure.ServicePath)
 	readTemplateFileOrig := readTemplateFile
 	defer func() { readTemplateFile = readTemplateFileOrig }()
-	readTemplateFile = func(dirname string) ([]byte, error) {
+	readTemplateFile = func(filename string) ([]byte, error) {
+		if filename == expectedFeFile {
+			return []byte("This is service {{.ServiceName}}"), nil
+		} else if filename == expectedBeFile {
+			return []byte("This is path {{.ServicePath}}"), nil
+		}
+		return []byte(""), fmt.Errorf("This is an error")
+	}
+	s.ServiceReconfigure.TemplateFePath = expectedFeFile
+	s.ServiceReconfigure.TemplateBePath = expectedBeFile
+
+	actualFe, actualBe, _ := s.reconfigure.GetTemplates(s.ServiceReconfigure)
+
+	s.Equal(expectedFe, actualFe)
+	s.Equal(expectedBe, actualBe)
+}
+
+func (s ReconfigureTestSuite) Test_GetTemplates_ReturnsError_WhenTemplateFePathIsNotPresent() {
+	testFilename := "/path/to/my/template"
+	readTemplateFileOrig := readTemplateFile
+	defer func() { readTemplateFile = readTemplateFileOrig }()
+	readTemplateFile = func(filename string) ([]byte, error) {
+		if filename == testFilename {
+			return []byte(""), fmt.Errorf("This is an error")
+		}
+		return []byte(""), nil
+	}
+	s.ServiceReconfigure.TemplateFePath = testFilename
+	s.ServiceReconfigure.TemplateBePath = "not/under/test"
+
+	_, _, err := s.reconfigure.GetTemplates(s.ServiceReconfigure)
+
+	s.Error(err)
+}
+
+func (s ReconfigureTestSuite) Test_GetTemplates_ReturnsError_WhenTemplateBePathIsNotPresent() {
+	testFilename := "/path/to/my/template"
+	readTemplateFileOrig := readTemplateFile
+	defer func() { readTemplateFile = readTemplateFileOrig }()
+	readTemplateFile = func(filename string) ([]byte, error) {
+		if filename == testFilename {
+			return []byte(""), fmt.Errorf("This is an error")
+		}
+		return []byte(""), nil
+	}
+
+	s.ServiceReconfigure.TemplateFePath = "not/under/test"
+	s.ServiceReconfigure.TemplateBePath = testFilename
+
+	_, _, err := s.reconfigure.GetTemplates(s.ServiceReconfigure)
+
+	s.Error(err)
+}
+
+func (s ReconfigureTestSuite) Test_GetTemplates_ReturnsError_WhenConsulTemplateFileIsNotAvailable() {
+	readTemplateFileOrig := readTemplateFile
+	defer func() { readTemplateFile = readTemplateFileOrig }()
+	readTemplateFile = func(filename string) ([]byte, error) {
 		return nil, fmt.Errorf("This is an error")
 	}
 	s.ServiceReconfigure.ConsulTemplateFePath = "/path/to/my/consul/fe/template"
@@ -631,31 +672,6 @@ func (s *ReconfigureTestSuite) Test_ReloadAllServices_ReturnsError_WhenFail() {
 	s.Error(err)
 }
 
-// TODO: Remove
-//func (s *ReconfigureTestSuite) Test_ReloadAllServices_WritesTemplateToFile() {
-//	mockObj := getRegistrarableMock("")
-//	registryInstanceOrig := registryInstance
-//	defer func() { registryInstance = registryInstanceOrig }()
-//	registryInstance = mockObj
-//	s.ConsulTemplateBe = `backend myService-be
-//    mode http
-//    {{range $i, $e := service "myService-orange" "any"}}
-//    server {{$e.Node}}_{{$i}}_{{$e.Port}} {{$e.Address}}:{{$e.Port}} check
-//    {{end}}`
-//
-//	expectedArgs := registry.CreateConfigsArgs{
-//		Addresses:     []string{s.Server.URL},
-//		TemplatesPath: s.TemplatesPath,
-//		FeFile:        ServiceTemplateFeFilename,
-//		FeTemplate:    s.ConsulTemplateFe,
-//		BeFile:        ServiceTemplateBeFilename,
-//		BeTemplate:    s.ConsulTemplateBe,
-//		ServiceName:   s.ServiceName,
-//	}
-//
-//	mockObj.AssertCalled(s.T(), "CreateConfigs", &expectedArgs)
-//}
-
 func (s *ReconfigureTestSuite) Test_ReloadAllServices_InvokesProxyCreateConfigFromTemplates() {
 	mockObj := getProxyMock("")
 	proxyOrig := haproxy.Instance

server.go

@@ -52,7 +52,9 @@ type Response struct {
 	Distribute           bool
 	Users                []User
 	ReqRepSearch         string
-	ReqRepReplace		 string
+	ReqRepReplace        string
+	TemplateFePath       string
+	TemplateBePath       string
 }
 
 func (m *Serve) Execute(args []string) error {
@@ -137,6 +139,8 @@ func (m *Serve) reconfigure(w http.ResponseWriter, req *http.Request) {
 		Mode:                 m.Mode,
 		ReqRepSearch:         req.URL.Query().Get("reqRepSearch"),
 		ReqRepReplace:        req.URL.Query().Get("reqRepReplace"),
+		TemplateFePath:       req.URL.Query().Get("templateFePath"),
+		TemplateBePath:       req.URL.Query().Get("templateBePath"),
 	}
 	if len(req.URL.Query().Get("servicePath")) > 0 {
 		sr.ServicePath = strings.Split(req.URL.Query().Get("servicePath"), ",")
@@ -176,6 +180,8 @@ func (m *Serve) reconfigure(w http.ResponseWriter, req *http.Request) {
 		Users:                sr.Users,
 		ReqRepSearch:         sr.ReqRepSearch,
 		ReqRepReplace:        sr.ReqRepReplace,
+		TemplateFePath:       sr.TemplateFePath,
+		TemplateBePath:       sr.TemplateBePath,
 	}
 	if m.isValidReconf(sr.ServiceName, sr.ServicePath, sr.ServiceDomain, sr.ConsulTemplateFePath) {
 		if (strings.EqualFold("service", m.Mode) || strings.EqualFold("swarm", m.Mode)) && len(sr.Port) == 0 {