Skip to content

Commit dc96907

Browse files
maxmoehlmaxmoehl
committed
refactor: rename PoolPutResults
1 parent 09dd5ac commit dc96907

File tree

4 files changed

+27
-27
lines changed

4 files changed

+27
-27
lines changed

‎src/code.cloudfoundry.org/gorouter/handlers/routeservice_test.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ var _ = Describe("Route Service Handler", func() {
129129
endpoint := route.NewEndpoint(&route.EndpointOpts{})
130130

131131
added := routePool.Put(endpoint)
132-
Expect(added).To(Equal(route.ADDED))
132+
Expect(added).To(Equal(route.EndpointAdded))
133133
})
134134
It("should not add route service metadata to the request for normal routes", func() {
135135
handler.ServeHTTP(resp, req)
@@ -152,7 +152,7 @@ var _ = Describe("Route Service Handler", func() {
152152
BeforeEach(func() {
153153
endpoint := route.NewEndpoint(&route.EndpointOpts{RouteServiceUrl: "route-service.com"})
154154
added := routePool.Put(endpoint)
155-
Expect(added).To(Equal(route.ADDED))
155+
Expect(added).To(Equal(route.EndpointAdded))
156156
})
157157

158158
It("returns 502 Bad Gateway", func() {
@@ -172,7 +172,7 @@ var _ = Describe("Route Service Handler", func() {
172172
BeforeEach(func() {
173173
endpoint := route.NewEndpoint(&route.EndpointOpts{})
174174
added := routePool.Put(endpoint)
175-
Expect(added).To(Equal(route.ADDED))
175+
Expect(added).To(Equal(route.EndpointAdded))
176176
})
177177
It("should not add route service metadata to the request for normal routes", func() {
178178
handler.ServeHTTP(resp, req)
@@ -211,7 +211,7 @@ var _ = Describe("Route Service Handler", func() {
211211
BeforeEach(func() {
212212
endpoint := route.NewEndpoint(&route.EndpointOpts{RouteServiceUrl: "https://route-service.com"})
213213
added := routePool.Put(endpoint)
214-
Expect(added).To(Equal(route.ADDED))
214+
Expect(added).To(Equal(route.EndpointAdded))
215215
})
216216

217217
It("sends the request to the route service with X-CF-Forwarded-Url using https scheme", func() {
@@ -699,7 +699,7 @@ var _ = Describe("Route Service Handler", func() {
699699
endpoint := route.NewEndpoint(&route.EndpointOpts{RouteServiceUrl: "https://goodrouteservice.com"})
700700

701701
added := routePool.Put(endpoint)
702-
Expect(added).To(Equal(route.ADDED))
702+
Expect(added).To(Equal(route.EndpointAdded))
703703
req.Header.Set("connection", "upgrade")
704704
req.Header.Set("upgrade", "websocket")
705705

@@ -718,7 +718,7 @@ var _ = Describe("Route Service Handler", func() {
718718
BeforeEach(func() {
719719
endpoint := route.NewEndpoint(&route.EndpointOpts{RouteServiceUrl: "https://bad%20service.com"})
720720
added := routePool.Put(endpoint)
721-
Expect(added).To(Equal(route.ADDED))
721+
Expect(added).To(Equal(route.EndpointAdded))
722722

723723
})
724724
It("returns a 500 internal server error response", func() {

‎src/code.cloudfoundry.org/gorouter/metrics/metricsreporter_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -467,18 +467,18 @@ var _ = Describe("MetricsReporter", func() {
467467

468468
It("sends number of nats messages received from each component", func() {
469469
endpoint.Tags = map[string]string{}
470-
metricReporter.CaptureRegistryMessage(endpoint, route.ADDED.String())
470+
metricReporter.CaptureRegistryMessage(endpoint, route.EndpointAdded.String())
471471

472472
Expect(batcher.BatchIncrementCounterCallCount()).To(Equal(1))
473473
Expect(batcher.BatchIncrementCounterArgsForCall(0)).To(Equal("registry_message"))
474474
})
475475

476476
It("sends number of nats messages received from each component", func() {
477477
endpoint.Tags = map[string]string{"component": "uaa"}
478-
metricReporter.CaptureRegistryMessage(endpoint, route.ADDED.String())
478+
metricReporter.CaptureRegistryMessage(endpoint, route.EndpointAdded.String())
479479

480480
endpoint.Tags = map[string]string{"component": "route-emitter"}
481-
metricReporter.CaptureRegistryMessage(endpoint, route.ADDED.String())
481+
metricReporter.CaptureRegistryMessage(endpoint, route.EndpointAdded.String())
482482

483483
Expect(batcher.BatchIncrementCounterCallCount()).To(Equal(2))
484484
Expect(batcher.BatchIncrementCounterArgsForCall(0)).To(Equal("registry_message.uaa"))

‎src/code.cloudfoundry.org/gorouter/metrics_prometheus/metrics_test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,12 @@ var _ = Describe("Metrics", func() {
3535

3636
It("sends number of nats messages received from each component", func() {
3737
endpoint.Tags = map[string]string{}
38-
m.CaptureRegistryMessage(endpoint, route.UPDATED.String())
39-
expected := fmt.Sprintf("registry_message{action=\"%s\",component=\"\"} 1", route.UPDATED.String())
38+
m.CaptureRegistryMessage(endpoint, route.EndpointUpdated.String())
39+
expected := fmt.Sprintf("registry_message{action=\"%s\",component=\"\"} 1", route.EndpointUpdated.String())
4040
Expect(getMetrics(r.Port())).To(ContainSubstring(expected))
4141

42-
m.CaptureRegistryMessage(endpoint, route.UPDATED.String())
43-
expected = fmt.Sprintf("registry_message{action=\"%s\",component=\"\"} 2", route.UPDATED.String())
42+
m.CaptureRegistryMessage(endpoint, route.EndpointUpdated.String())
43+
expected = fmt.Sprintf("registry_message{action=\"%s\",component=\"\"} 2", route.EndpointUpdated.String())
4444
Expect(getMetrics(r.Port())).To(ContainSubstring(expected))
4545
})
4646

‎src/code.cloudfoundry.org/gorouter/route/pool_test.go

+14-14
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ var _ = Describe("EndpointPool", func() {
142142
endpoint := &route.Endpoint{}
143143

144144
b := pool.Put(endpoint)
145-
Expect(b).To(Equal(route.ADDED))
145+
Expect(b).To(Equal(route.EndpointAdded))
146146
})
147147

148148
It("handles duplicate endpoints", func() {
@@ -152,7 +152,7 @@ var _ = Describe("EndpointPool", func() {
152152
pool.MarkUpdated(time.Now().Add(-(10 * time.Minute)))
153153

154154
b := pool.Put(endpoint)
155-
Expect(b).To(Equal(route.REFRESHED))
155+
Expect(b).To(Equal(route.EndpointRefreshed))
156156

157157
prunedEndpoints := pool.PruneEndpoints()
158158
Expect(prunedEndpoints).To(BeEmpty())
@@ -163,7 +163,7 @@ var _ = Describe("EndpointPool", func() {
163163
endpoint2 := route.NewEndpoint(&route.EndpointOpts{Host: "1.2.3.4", Port: 5678})
164164

165165
pool.Put(endpoint1)
166-
Expect(pool.Put(endpoint2)).To(Equal(route.REFRESHED))
166+
Expect(pool.Put(endpoint2)).To(Equal(route.EndpointRefreshed))
167167
})
168168

169169
Context("with modification tags", func() {
@@ -175,28 +175,28 @@ var _ = Describe("EndpointPool", func() {
175175
modTag2 = models.ModificationTag{Guid: "abc"}
176176
endpoint1 := route.NewEndpoint(&route.EndpointOpts{Host: "1.2.3.4", Port: 5678, ModificationTag: modTag})
177177

178-
Expect(pool.Put(endpoint1)).To(Equal(route.ADDED))
178+
Expect(pool.Put(endpoint1)).To(Equal(route.EndpointAdded))
179179
})
180180

181181
It("updates an endpoint with modification tag", func() {
182182
endpoint := route.NewEndpoint(&route.EndpointOpts{Host: "1.2.3.4", Port: 5678, ModificationTag: modTag2})
183183

184-
Expect(pool.Put(endpoint)).To(Equal(route.UPDATED))
184+
Expect(pool.Put(endpoint)).To(Equal(route.EndpointUpdated))
185185
Expect(pool.Endpoints(logger.Logger, "", false, azPreference, az).Next(0).ModificationTag).To(Equal(modTag2))
186186
})
187187

188188
Context("when modification_tag is older", func() {
189189
BeforeEach(func() {
190190
modTag2.Increment()
191191
endpoint := route.NewEndpoint(&route.EndpointOpts{Host: "1.2.3.4", Port: 5678, ModificationTag: modTag2})
192-
Expect(pool.Put(endpoint)).To(Equal(route.UPDATED))
192+
Expect(pool.Put(endpoint)).To(Equal(route.EndpointUpdated))
193193
})
194194

195195
It("doesnt update an endpoint", func() {
196196
olderModTag := models.ModificationTag{Guid: "abc"}
197197
endpoint := route.NewEndpoint(&route.EndpointOpts{Host: "1.2.3.4", Port: 5678, ModificationTag: olderModTag})
198198

199-
Expect(pool.Put(endpoint)).To(Equal(route.UNMODIFIED))
199+
Expect(pool.Put(endpoint)).To(Equal(route.EndpointUnmodified))
200200
Expect(pool.Endpoints(logger.Logger, "", false, azPreference, az).Next(0).ModificationTag).To(Equal(modTag2))
201201
})
202202
})
@@ -367,13 +367,13 @@ var _ = Describe("EndpointPool", func() {
367367
endpoint := &route.Endpoint{}
368368
endpointRS := &route.Endpoint{RouteServiceUrl: "my-url"}
369369
b := pool.Put(endpoint)
370-
Expect(b).To(Equal(route.ADDED))
370+
Expect(b).To(Equal(route.EndpointAdded))
371371

372372
url := pool.RouteServiceUrl()
373373
Expect(url).To(BeEmpty())
374374

375375
b = pool.Put(endpointRS)
376-
Expect(b).To(Equal(route.UPDATED))
376+
Expect(b).To(Equal(route.EndpointUpdated))
377377
url = pool.RouteServiceUrl()
378378
Expect(url).To(Equal("my-url"))
379379
})
@@ -391,23 +391,23 @@ var _ = Describe("EndpointPool", func() {
391391
endpointRS2 := route.NewEndpoint(&route.EndpointOpts{Host: "host-2", Port: 2234, RouteServiceUrl: "second-url"})
392392
endpointRS2Updated := route.NewEndpoint(&route.EndpointOpts{Host: "host-2", Port: 2234, RouteServiceUrl: "fourth-url"})
393393
b := pool.Put(endpointRS1)
394-
Expect(b).To(Equal(route.ADDED))
394+
Expect(b).To(Equal(route.EndpointAdded))
395395

396396
url := pool.RouteServiceUrl()
397397
Expect(url).To(Equal("first-url"))
398398

399399
b = pool.Put(endpointRS2)
400-
Expect(b).To(Equal(route.ADDED))
400+
Expect(b).To(Equal(route.EndpointAdded))
401401
url = pool.RouteServiceUrl()
402402
Expect(url).To(Equal("second-url"))
403403

404404
b = pool.Put(endpointRS1Updated)
405-
Expect(b).To(Equal(route.UPDATED))
405+
Expect(b).To(Equal(route.EndpointUpdated))
406406
url = pool.RouteServiceUrl()
407407
Expect(url).To(Equal("third-url"))
408408

409409
b = pool.Put(endpointRS2Updated)
410-
Expect(b).To(Equal(route.UPDATED))
410+
Expect(b).To(Equal(route.EndpointUpdated))
411411
url = pool.RouteServiceUrl()
412412
Expect(url).To(Equal("fourth-url"))
413413
})
@@ -514,7 +514,7 @@ var _ = Describe("EndpointPool", func() {
514514
modTag = models.ModificationTag{Guid: "abc"}
515515
endpoint1 := route.NewEndpoint(&route.EndpointOpts{Host: "1.2.3.4", Port: 5678, ModificationTag: modTag})
516516

517-
Expect(pool.Put(endpoint1)).To(Equal(route.ADDED))
517+
Expect(pool.Put(endpoint1)).To(Equal(route.EndpointAdded))
518518
})
519519

520520
It("removes an endpoint with modification tag", func() {

0 commit comments

Comments
 (0)