Skip to content

Commit d07305e

Browse files
janiszjanisz
authored
Update dependecies (#219)
Update Consul to [0.8.0][1] and logrus to [0.11.5][2]. Update tests to reflect changes in Consul. Refs: [1]: https://github.com/hashicorp/consul/blob/master/CHANGELOG.md#080-april-5-2017 [2]: https://github.com/sirupsen/logrus/blob/master/CHANGELOG.md#0115
1 parent 185e134 commit d07305e

File tree

1,119 files changed

+207495
-16599
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,119 files changed

+207495
-16599
lines changed

‎consul/consul.go‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ func consulServiceToService(consulService *consulapi.CatalogService) *service.Se
126126
Name: consulService.ServiceName,
127127
Tags: consulService.ServiceTags,
128128
RegisteringAgentAddress: consulService.Address,
129-
EnableTagOverride: consulService.ServiceEnableTagOverride,
129+
EnableTagOverride: consulService.ServiceEnableTagOverride,
130130
}
131131
}
132132

@@ -182,11 +182,11 @@ func (c *Consul) register(service *consulapi.AgentServiceRegistration) error {
182182
return err
183183
}
184184
fields := log.Fields{
185-
"Name": service.Name,
186-
"Id": service.ID,
187-
"Tags": service.Tags,
188-
"Address": service.Address,
189-
"Port": service.Port,
185+
"Name": service.Name,
186+
"Id": service.ID,
187+
"Tags": service.Tags,
188+
"Address": service.Address,
189+
"Port": service.Port,
190190
"EnableTagOverride": service.EnableTagOverride,
191191
}
192192
log.WithFields(fields).Info("Registering")
@@ -287,12 +287,12 @@ func (c *Consul) marathonTaskToConsulServices(task *apps.Task, app *apps.App) ([
287287
tags := append([]string{c.config.Tag}, intent.Tags...)
288288
tags = append(tags, service.MarathonTaskTag(task.ID))
289289
registrations = append(registrations, &consulapi.AgentServiceRegistration{
290-
ID: c.serviceID(task, intent.Name, intent.Port),
291-
Name: intent.Name,
292-
Port: intent.Port,
293-
Address: serviceAddress,
294-
Tags: tags,
295-
Checks: checks,
290+
ID: c.serviceID(task, intent.Name, intent.Port),
291+
Name: intent.Name,
292+
Port: intent.Port,
293+
Address: serviceAddress,
294+
Tags: tags,
295+
Checks: checks,
296296
EnableTagOverride: true,
297297
})
298298
}

‎consul/consul_test.go‎

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -87,20 +87,20 @@ func TestGetServices(t *testing.T) {
8787
server2 := CreateTestServer(t)
8888
defer server2.Stop()
8989

90-
server1.JoinWAN(server2.LANAddr)
90+
server1.JoinWAN(t, server2.LANAddr)
9191

9292
// create client
9393
consul := ClientAtServer(server1)
9494
consul.config.Tag = "marathon"
9595

9696
// given
9797
// register services in both servers
98-
server1.AddService("serviceA", "passing", []string{"public", "marathon"})
99-
server1.AddService("serviceB", "passing", []string{"marathon"})
100-
server1.AddService("serviceC", "passing", []string{"marathon"})
98+
server1.AddService(t, "serviceA", "passing", []string{"public", "marathon"})
99+
server1.AddService(t, "serviceB", "passing", []string{"marathon"})
100+
server1.AddService(t, "serviceC", "passing", []string{"marathon"})
101101

102-
server2.AddService("serviceA", "passing", []string{"private", "marathon"})
103-
server2.AddService("serviceB", "passing", []string{"zookeeper"})
102+
server2.AddService(t, "serviceA", "passing", []string{"private", "marathon"})
103+
server2.AddService(t, "serviceB", "passing", []string{"zookeeper"})
104104

105105
// when
106106
services, err := consul.GetServices("serviceA")
@@ -171,8 +171,8 @@ func TestGetServices_RemovingFailingAgentsAndRetrying(t *testing.T) {
171171
consul.config.RequestRetries = 10
172172

173173
// given
174-
server1.AddService("serviceA", "passing", []string{"public", "marathon"})
175-
server1.AddService("serviceB", "passing", []string{"marathon"})
174+
server1.AddService(t, "serviceA", "passing", []string{"public", "marathon"})
175+
server1.AddService(t, "serviceB", "passing", []string{"marathon"})
176176

177177
// add failing clients
178178
for i := uint32(2); i < consul.config.RequestRetries; i++ {
@@ -196,20 +196,20 @@ func TestGetServices_SelectOnlyTaggedServices(t *testing.T) {
196196
server2 := CreateTestServer(t)
197197
defer server2.Stop()
198198

199-
server1.JoinWAN(server2.LANAddr)
199+
server1.JoinWAN(t, server2.LANAddr)
200200

201201
// create client
202202
consul := ClientAtServer(server1)
203203
consul.config.Tag = "marathon-mycluster"
204204

205205
// given
206206
// register services in both servers
207-
server1.AddService("serviceA", "passing", []string{"public", "marathon-mycluster"})
208-
server1.AddService("serviceB", "passing", []string{"marathon"})
209-
server1.AddService("serviceC", "passing", []string{"marathon"})
207+
server1.AddService(t, "serviceA", "passing", []string{"public", "marathon-mycluster"})
208+
server1.AddService(t, "serviceB", "passing", []string{"marathon"})
209+
server1.AddService(t, "serviceC", "passing", []string{"marathon"})
210210

211-
server2.AddService("serviceA", "passing", []string{"private", "marathon"})
212-
server2.AddService("serviceB", "passing", []string{"zookeeper"})
211+
server2.AddService(t, "serviceA", "passing", []string{"private", "marathon"})
212+
server2.AddService(t, "serviceB", "passing", []string{"zookeeper"})
213213

214214
// when
215215
services, err := consul.GetServices("serviceA")
@@ -236,20 +236,20 @@ func TestGetAllServices(t *testing.T) {
236236
server2 := CreateTestServer(t)
237237
defer server2.Stop()
238238

239-
server1.JoinWAN(server2.LANAddr)
239+
server1.JoinWAN(t, server2.LANAddr)
240240

241241
// create client
242242
consul := ClientAtServer(server1)
243243
consul.config.Tag = "marathon"
244244

245245
// given
246246
// register services in both servers
247-
server1.AddService("serviceA", "passing", []string{"public", "marathon"})
248-
server1.AddService("serviceB", "passing", []string{"marathon"})
249-
server1.AddService("serviceC", "passing", []string{"zookeeper"})
247+
server1.AddService(t, "serviceA", "passing", []string{"public", "marathon"})
248+
server1.AddService(t, "serviceB", "passing", []string{"marathon"})
249+
server1.AddService(t, "serviceC", "passing", []string{"zookeeper"})
250250

251-
server2.AddService("serviceA", "passing", []string{"private", "marathon"})
252-
server2.AddService("serviceB", "passing", []string{"zookeeper"})
251+
server2.AddService(t, "serviceA", "passing", []string{"private", "marathon"})
252+
server2.AddService(t, "serviceB", "passing", []string{"zookeeper"})
253253

254254
// when
255255
services, err := consul.GetAllServices()
@@ -319,7 +319,7 @@ func TestGetAllServices_RemovingFailingAgentsAndRetrying(t *testing.T) {
319319
server2 := CreateTestServer(t)
320320
defer server2.Stop()
321321

322-
server1.JoinWAN(server2.LANAddr)
322+
server1.JoinWAN(t, server2.LANAddr)
323323

324324
// create client
325325
consul := ClientAtServer(server1)
@@ -333,12 +333,12 @@ func TestGetAllServices_RemovingFailingAgentsAndRetrying(t *testing.T) {
333333

334334
// given
335335
// register services in both servers
336-
server1.AddService("serviceA", "passing", []string{"public", "marathon"})
337-
server1.AddService("serviceB", "passing", []string{"marathon"})
338-
server1.AddService("serviceC", "passing", []string{"zookeeper"})
336+
server1.AddService(t, "serviceA", "passing", []string{"public", "marathon"})
337+
server1.AddService(t, "serviceB", "passing", []string{"marathon"})
338+
server1.AddService(t, "serviceC", "passing", []string{"zookeeper"})
339339

340-
server2.AddService("serviceA", "passing", []string{"private", "marathon"})
341-
server2.AddService("serviceB", "passing", []string{"zookeeper"})
340+
server2.AddService(t, "serviceA", "passing", []string{"private", "marathon"})
341+
server2.AddService(t, "serviceB", "passing", []string{"zookeeper"})
342342

343343
// when
344344
services, err := consul.GetAllServices()
@@ -537,8 +537,8 @@ func TestDeregisterServices(t *testing.T) {
537537
consul.config.Tag = "marathon"
538538

539539
// given
540-
server.AddService("serviceA", "passing", []string{"marathon"})
541-
server.AddService("serviceB", "passing", []string{"marathon"})
540+
server.AddService(t, "serviceA", "passing", []string{"marathon"})
541+
server.AddService(t, "serviceB", "passing", []string{"marathon"})
542542
services, _ := consul.GetAllServices()
543543
assert.Len(t, services, 2)
544544

@@ -560,7 +560,7 @@ func TestDeregisterServices_shouldReturnErrorOnFailure(t *testing.T) {
560560
consul.config.Tag = "marathon"
561561

562562
// given
563-
server.AddService("serviceA", "passing", []string{"marathon"})
563+
server.AddService(t, "serviceA", "passing", []string{"marathon"})
564564

565565
// when
566566
servicesA, _ := consul.GetServices("serviceA")
@@ -583,8 +583,8 @@ func TestDeregisterServicesByTask(t *testing.T) {
583583
app := utils.ConsulApp("serviceA", 1)
584584
task := app.Tasks[0]
585585

586-
server.AddService("serviceA", "passing", []string{"marathon", service.MarathonTaskTag(task.ID)})
587-
server.AddService("serviceB", "passing", []string{"marathon", service.MarathonTaskTag(apps.TaskID("other"))})
586+
server.AddService(t, "serviceA", "passing", []string{"marathon", service.MarathonTaskTag(task.ID)})
587+
server.AddService(t, "serviceB", "passing", []string{"marathon", service.MarathonTaskTag(apps.TaskID("other"))})
588588
services, _ := consul.GetAllServices()
589589
assert.Len(t, services, 2)
590590

@@ -608,7 +608,7 @@ func TestDeregisterServicesByTask_shouldReturnErrorOnFailure(t *testing.T) {
608608
app := utils.ConsulApp("serviceA", 1)
609609
task := app.Tasks[0]
610610

611-
server.AddService("serviceA", "passing", []string{"marathon", service.MarathonTaskTag(task.ID)})
611+
server.AddService(t, "serviceA", "passing", []string{"marathon", service.MarathonTaskTag(task.ID)})
612612

613613
// when
614614
server.Stop()
@@ -630,8 +630,8 @@ func TestDeregisterServicesByTask_shouldReturnErrorOnServiceMatchingTaskNotFound
630630
app := utils.ConsulApp("serviceA", 1)
631631
task := app.Tasks[0]
632632

633-
server.AddService("serviceA", "passing", []string{"marathon", service.MarathonTaskTag(task.ID)})
634-
server.AddService("serviceB", "passing", []string{"marathon", service.MarathonTaskTag(apps.TaskID("other"))})
633+
server.AddService(t, "serviceA", "passing", []string{"marathon", service.MarathonTaskTag(task.ID)})
634+
server.AddService(t, "serviceB", "passing", []string{"marathon", service.MarathonTaskTag(apps.TaskID("other"))})
635635
services, _ := consul.GetAllServices()
636636
assert.Len(t, services, 2)
637637

@@ -656,9 +656,9 @@ func TestDeregisterServicesByTask_shouldDeregisterAllMatchingServicesWhenMultipl
656656
app := utils.ConsulApp("serviceA", 1)
657657
task := app.Tasks[0]
658658

659-
server.AddService("serviceA", "passing", []string{"marathon", service.MarathonTaskTag(task.ID)})
660-
server.AddService("serviceA-bis", "passing", []string{"marathon", service.MarathonTaskTag(task.ID)})
661-
server.AddService("serviceB", "passing", []string{"marathon", service.MarathonTaskTag(apps.TaskID("other"))})
659+
server.AddService(t, "serviceA", "passing", []string{"marathon", service.MarathonTaskTag(task.ID)})
660+
server.AddService(t, "serviceA-bis", "passing", []string{"marathon", service.MarathonTaskTag(task.ID)})
661+
server.AddService(t, "serviceB", "passing", []string{"marathon", service.MarathonTaskTag(apps.TaskID("other"))})
662662
services, _ := consul.GetAllServices()
663663
assert.Len(t, services, 3)
664664

@@ -687,7 +687,7 @@ func TestAddAgentsFromApp(t *testing.T) {
687687
// given
688688
app := utils.ConsulApp("serviceA", 1)
689689
app.Tasks[0].Host = server.Config.Bind
690-
server.AddService("serviceA", "passing", []string{"marathon", service.MarathonTaskTag(app.Tasks[0].ID)})
690+
server.AddService(t, "serviceA", "passing", []string{"marathon", service.MarathonTaskTag(app.Tasks[0].ID)})
691691

692692
// when
693693
consul.AddAgentsFromApps([]*apps.App{app, utils.NonConsulApp("nonConsulApp", 1)})

‎consul/consul_test_server.go‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ import (
1414
func CreateTestServer(t *testing.T) *testutil.TestServer {
1515
ports, err := getPorts(6)
1616
assert.NoError(t, err)
17-
return testutil.NewTestServerConfig(t, func(c *testutil.TestServerConfig) {
17+
18+
server, err := testutil.NewTestServerConfig(func(c *testutil.TestServerConfig) {
1819
c.Datacenter = fmt.Sprint("dc-", time.Now().UnixNano())
1920
c.Ports = &testutil.TestPortConfig{
2021
DNS: ports[0],
@@ -25,6 +26,10 @@ func CreateTestServer(t *testing.T) *testutil.TestServer {
2526
Server: ports[5],
2627
}
2728
})
29+
30+
assert.NoError(t, err)
31+
32+
return server
2833
}
2934

3035
// Ask the kernel for free open ports that are ready to use

‎glide.lock‎

Lines changed: 23 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎glide.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package: github.com/allegro/marathon-consul
22
import:
33
- package: github.com/Sirupsen/logrus
4-
version: ^0.11.4
4+
version: ^0.11.5
55
- package: github.com/cyberdelia/go-metrics-graphite
66
- package: github.com/hashicorp/consul
7-
version: v0.7.5
7+
version: v0.8.0
88
subpackages:
99
- api
1010
- testutil

‎install_consul.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ hash consul 2>/dev/null || {
2020
os="windows"
2121
arch="386"
2222
fi
23-
version="0.7.5"
23+
version="0.8.0"
2424
archive="consul_${version}_${os}_${arch}.zip"
2525

2626
mkdir -p bin

‎vendor/github.com/Sirupsen/logrus/CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)