Formatting [ci skip]

Author: vfarcic

actions/reconfigure.go

@@ -134,7 +134,7 @@ func (m *Reconfigure) reloadFromRegistry(addresses []string, instanceName, mode
 	var data map[string]interface{}
 	json.Unmarshal(body, &data)
 	count = len(data)
-	for key, _ := range data {
+	for key := range data {
 		go m.getService(addresses, key, instanceName, c)
 	}
 	logPrintf("\tFound %d services", count)

actions/reconfigure_test.go

@@ -83,7 +83,7 @@ func TestReconfigureUnitTestSuite(t *testing.T) {
 			case "/v1/catalog/services":
 				w.WriteHeader(http.StatusOK)
 				w.Header().Set("Content-Type", "application/json")
-				data := map[string][]string{"service1": []string{}, "service2": []string{}, s.ServiceName: []string{}}
+				data := map[string][]string{"service1": {}, "service2": {}, s.ServiceName: {}}
 				js, _ := json.Marshal(data)
 				w.Write(js)
 			case fmt.Sprintf("/v1/kv/%s/%s/%s", s.InstanceName, s.ServiceName, registry.PATH_KEY):
@@ -375,9 +375,9 @@ backend myService-be1234
 
 func (s ReconfigureTestSuite) Test_GetTemplates_AddsMultipleDestinations() {
 	sd := []proxy.ServiceDest{
-		proxy.ServiceDest{Port: "1111", ServicePath: []string{"path-1"}, SrcPort: 2222},
-		proxy.ServiceDest{Port: "3333", ServicePath: []string{"path-2"}, SrcPort: 4444},
-		proxy.ServiceDest{Port: "5555", ServicePath: []string{"path-3"}},
+		{Port: "1111", ServicePath: []string{"path-1"}, SrcPort: 2222},
+		{Port: "3333", ServicePath: []string{"path-2"}, SrcPort: 4444},
+		{Port: "5555", ServicePath: []string{"path-3"}},
 	}
 	expectedBack := `
 backend myService-be1111

registry/consul.go

@@ -32,15 +32,15 @@ func (m Consul) PutService(addresses []string, instanceName string, r Registry)
 	consulChannel := make(chan error)
 	type data struct{ key, value string }
 	d := []data{
-		data{COLOR_KEY, r.ServiceColor},
-		data{PATH_KEY, strings.Join(r.ServicePath, ",")},
-		data{DOMAIN_KEY, strings.Join(r.ServiceDomain, ",")},
-		data{HOSTNAME_KEY, r.OutboundHostname},
-		data{PATH_TYPE_KEY, r.PathType},
-		data{SKIP_CHECK_KEY, fmt.Sprintf("%t", r.SkipCheck)},
-		data{CONSUL_TEMPLATE_FE_PATH_KEY, r.ConsulTemplateFePath},
-		data{CONSUL_TEMPLATE_BE_PATH_KEY, r.ConsulTemplateBePath},
-		data{PORT, r.Port},
+		{COLOR_KEY, r.ServiceColor},
+		{PATH_KEY, strings.Join(r.ServicePath, ",")},
+		{DOMAIN_KEY, strings.Join(r.ServiceDomain, ",")},
+		{HOSTNAME_KEY, r.OutboundHostname},
+		{PATH_TYPE_KEY, r.PathType},
+		{SKIP_CHECK_KEY, fmt.Sprintf("%t", r.SkipCheck)},
+		{CONSUL_TEMPLATE_FE_PATH_KEY, r.ConsulTemplateFePath},
+		{CONSUL_TEMPLATE_BE_PATH_KEY, r.ConsulTemplateBePath},
+		{PORT, r.Port},
 	}
 	for _, e := range d {
 		go m.SendPutRequest(addresses, r.ServiceName, e.key, e.value, instanceName, consulChannel)

registry/consul_test.go

@@ -78,15 +78,15 @@ func (s *ConsulTestSuite) Test_PutService_PutsDataToConsul() {
 	type data struct{ key, value string }
 
 	d := []data{
-		data{"color", s.registry.ServiceColor},
-		data{"path", strings.Join(s.registry.ServicePath, ",")},
-		data{"domain", strings.Join(s.registry.ServiceDomain, ",")},
-		data{"hostname", s.registry.OutboundHostname},
-		data{"pathtype", s.registry.PathType},
-		data{"skipcheck", fmt.Sprintf("%t", s.registry.SkipCheck)},
-		data{"consultemplatefepath", s.registry.ConsulTemplateFePath},
-		data{"consultemplatebepath", s.registry.ConsulTemplateBePath},
-		data{"port", string(s.registry.Port)},
+		{"color", s.registry.ServiceColor},
+		{"path", strings.Join(s.registry.ServicePath, ",")},
+		{"domain", strings.Join(s.registry.ServiceDomain, ",")},
+		{"hostname", s.registry.OutboundHostname},
+		{"pathtype", s.registry.PathType},
+		{"skipcheck", fmt.Sprintf("%t", s.registry.SkipCheck)},
+		{"consultemplatefepath", s.registry.ConsulTemplateFePath},
+		{"consultemplatebepath", s.registry.ConsulTemplateBePath},
+		{"port", string(s.registry.Port)},
 	}
 	for _, e := range d {
 		s.Contains(actualUrl, fmt.Sprintf("/v1/kv/%s/%s/%s", instanceName, s.registry.ServiceName, e.key))

server/server_test.go

@@ -618,7 +618,7 @@ func (s *ServerTestSuite) Test_GetServiceFromUrl_ReturnsProxyService() {
 		Distribute:            true,
 		SslVerifyNone:         true,
 		ServiceDomainMatchAll: true,
-		ServiceDest:           []proxy.ServiceDest{proxy.ServiceDest{ServicePath: []string{}}},
+		ServiceDest:           []proxy.ServiceDest{{ServicePath: []string{}}},
 	}
 	addr := fmt.Sprintf(
 		"%s?serviceName=%s&aclName=%s&serviceColor=%s&serviceCert=%s&outboundHostname=%s&consulTemplateFePath=%s&consulTemplateBePath=%s&pathType=%s&reqPathSearch=%s&reqPathReplace=%s&templateFePath=%s&templateBePath=%s&timeoutServer=%s&timeoutTunnel=%s&reqMode=%s&httpsOnly=%t&xForwardedProto=%t&redirectWhenHttpProto=%t&httpsPort=%d&serviceDomain=%s&skipCheck=%t&distribute=%t&sslVerifyNone=%t&serviceDomainMatchAll=%t",

server_test.go

@@ -192,7 +192,7 @@ func (s *ServerTestSuite) Test_Execute_InvokesReconfigureExecuteForEachServiceDe
 	server.NewServer = func(listenerAddr, mode, port, serviceName, configsPath, templatesPath string, consulAddresses []string, cert server.Certer) server.Server {
 		return ServerMock{
 			GetServicesFromEnvVarsMock: func() *[]proxy.Service {
-				return &[]proxy.Service{proxy.Service{}, proxy.Service{}}
+				return &[]proxy.Service{{}, {}}
 			},
 		}
 	}