Skip to content

Commit eb2b569

Browse files
ebrobersonebroberson
committed
Convert to use new backwards-compatible protobufs
1 parent aea6ad3 commit eb2b569

17 files changed

Lines changed: 1474 additions & 469 deletions

‎cmd/locket/main_test.go‎

Lines changed: 87 additions & 62 deletions
Large diffs are not rendered by default.

‎db/lock_db_test.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ var _ = Describe("Lock", func() {
9090
Value: resource.Value,
9191
//lint:ignore SA1019 - testing deprecated functionality
9292
Type: resource.Type,
93-
TypeCode: models.TypeCode_LOCK,
93+
TypeCode: models.LOCK,
9494
}
9595

9696
fakeGUIDProvider.NextGUIDReturns("new-guid", nil)
@@ -105,7 +105,7 @@ var _ = Describe("Lock", func() {
105105
Key: "quack",
106106
Owner: "iamthelizardking",
107107
Value: "i can do anything",
108-
TypeCode: models.TypeCode_LOCK,
108+
TypeCode: models.LOCK,
109109
}
110110
lock, err := sqlDB.Lock(ctx, logger, typeCodeResource, 10)
111111
Expect(err).NotTo(HaveOccurred())
@@ -333,7 +333,7 @@ var _ = Describe("Lock", func() {
333333
Type: "lock",
334334
}
335335
expectedLock = lock
336-
expectedLock.TypeCode = models.TypeCode_LOCK
336+
expectedLock.TypeCode = models.LOCK
337337
})
338338

339339
It("returns the lock from the database", func() {
@@ -357,7 +357,7 @@ var _ = Describe("Lock", func() {
357357
Type: "presence",
358358
}
359359
expectedLock = lock
360-
expectedLock.TypeCode = models.TypeCode_PRESENCE
360+
expectedLock.TypeCode = models.PRESENCE
361361
})
362362

363363
It("returns the lock from the database", func() {
@@ -378,7 +378,7 @@ var _ = Describe("Lock", func() {
378378
Key: "test",
379379
Owner: "jim",
380380
Value: "locks stuff for days",
381-
TypeCode: models.TypeCode_LOCK,
381+
TypeCode: models.LOCK,
382382
}
383383
expectedLock = lock
384384
//lint:ignore SA1019 - testing deprecated functionality
@@ -403,7 +403,7 @@ var _ = Describe("Lock", func() {
403403
Key: "test",
404404
Owner: "jim",
405405
Value: "locks stuff for days",
406-
TypeCode: models.TypeCode_PRESENCE,
406+
TypeCode: models.PRESENCE,
407407
}
408408
expectedLock = lock
409409
//lint:ignore SA1019 - testing deprecated functionality
@@ -505,7 +505,7 @@ var _ = Describe("Lock", func() {
505505
Owner: "finn",
506506
Value: "thehuman",
507507
Type: "presence",
508-
TypeCode: models.TypeCode_PRESENCE,
508+
TypeCode: models.PRESENCE,
509509
},
510510
ModifiedIndex: 10,
511511
ModifiedId: "hello",

‎expiration/burglar_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ var _ = Describe("Burglar", func() {
4646
Owner: "town",
4747
Value: "won't you take me to",
4848
Type: "lock",
49-
TypeCode: models.TypeCode_LOCK,
49+
TypeCode: models.LOCK,
5050
},
5151
TtlInSeconds: 25,
5252
ModifiedIndex: 3587584357348,
@@ -58,7 +58,7 @@ var _ = Describe("Burglar", func() {
5858
Owner: "bar",
5959
Value: "chocolate chip",
6060
Type: "presence",
61-
TypeCode: models.TypeCode_PRESENCE,
61+
TypeCode: models.PRESENCE,
6262
},
6363
TtlInSeconds: 437,
6464
ModifiedIndex: 2346,

‎grpcserver/server_test.go‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -69,16 +69,16 @@ var _ = Describe("GRPCServer", func() {
6969
Expect(err).NotTo(HaveOccurred())
7070

7171
locketClient := models.NewLocketClient(conn)
72-
_, err = locketClient.Lock(context.Background(), &models.LockRequest{})
72+
_, err = locketClient.Lock(context.Background(), &models.ProtoLockRequest{})
7373
Expect(err).NotTo(HaveOccurred())
7474

75-
_, err = locketClient.Release(context.Background(), &models.ReleaseRequest{})
75+
_, err = locketClient.Release(context.Background(), &models.ProtoReleaseRequest{})
7676
Expect(err).NotTo(HaveOccurred())
7777

78-
_, err = locketClient.Fetch(context.Background(), &models.FetchRequest{})
78+
_, err = locketClient.Fetch(context.Background(), &models.ProtoFetchRequest{})
7979
Expect(err).NotTo(HaveOccurred())
8080

81-
_, err = locketClient.FetchAll(context.Background(), &models.FetchAllRequest{})
81+
_, err = locketClient.FetchAll(context.Background(), &models.ProtoFetchAllRequest{})
8282
Expect(err).NotTo(HaveOccurred())
8383
})
8484

@@ -102,15 +102,15 @@ type testHandler struct {
102102
models.UnimplementedLocketServer
103103
}
104104

105-
func (h *testHandler) Lock(ctx context.Context, req *models.LockRequest) (*models.LockResponse, error) {
106-
return &models.LockResponse{}, nil
105+
func (h *testHandler) Lock(ctx context.Context, req *models.ProtoLockRequest) (*models.ProtoLockResponse, error) {
106+
return &models.ProtoLockResponse{}, nil
107107
}
108-
func (h *testHandler) Release(ctx context.Context, req *models.ReleaseRequest) (*models.ReleaseResponse, error) {
109-
return &models.ReleaseResponse{}, nil
108+
func (h *testHandler) Release(ctx context.Context, req *models.ProtoReleaseRequest) (*models.ProtoReleaseResponse, error) {
109+
return &models.ProtoReleaseResponse{}, nil
110110
}
111-
func (h *testHandler) Fetch(ctx context.Context, req *models.FetchRequest) (*models.FetchResponse, error) {
112-
return &models.FetchResponse{}, nil
111+
func (h *testHandler) Fetch(ctx context.Context, req *models.ProtoFetchRequest) (*models.ProtoFetchResponse, error) {
112+
return &models.ProtoFetchResponse{}, nil
113113
}
114-
func (h *testHandler) FetchAll(ctx context.Context, req *models.FetchAllRequest) (*models.FetchAllResponse, error) {
115-
return &models.FetchAllResponse{}, nil
114+
func (h *testHandler) FetchAll(ctx context.Context, req *models.ProtoFetchAllRequest) (*models.ProtoFetchAllResponse, error) {
115+
return &models.ProtoFetchAllResponse{}, nil
116116
}

‎handlers/context_test.go‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ var _ = Describe("LocketHandler", func() {
6969
Key: "test",
7070
Value: "test-value",
7171
Owner: "myself",
72-
TypeCode: models.TypeCode_LOCK,
72+
TypeCode: models.LOCK,
7373
}
7474

7575
locketHandler = handlers.NewLocketHandler(
@@ -122,10 +122,11 @@ var _ = Describe("LocketHandler", func() {
122122
finishedRequest := make(chan struct{}, 1)
123123
go func() {
124124
defer GinkgoRecover()
125-
_, err := locketHandler.Lock(ctxWithCancel, &models.LockRequest{
125+
lockRequest := &models.LockRequest{
126126
Resource: resource,
127127
TtlInSeconds: 10,
128-
})
128+
}
129+
_, err := locketHandler.Lock(ctxWithCancel, lockRequest.ToProto())
129130
Expect(err).To(HaveOccurred())
130131
Expect(err).To(MatchError(context.Canceled))
131132
close(finishedRequest)

‎handlers/handler.go‎

Lines changed: 24 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,9 @@ func (h *locketHandler) monitorRequest(requestType string, ctx context.Context,
8484
return err
8585
}
8686

87-
func (h *locketHandler) Lock(ctx context.Context, req *models.LockRequest) (*models.LockResponse, error) {
87+
func (h *locketHandler) Lock(ctx context.Context, req *models.ProtoLockRequest) (*models.ProtoLockResponse, error) {
8888
var (
89-
response *models.LockResponse
89+
response *models.ProtoLockResponse
9090
err error
9191
)
9292

@@ -98,9 +98,9 @@ func (h *locketHandler) Lock(ctx context.Context, req *models.LockRequest) (*mod
9898
return response, err
9999
}
100100

101-
func (h *locketHandler) Release(ctx context.Context, req *models.ReleaseRequest) (*models.ReleaseResponse, error) {
101+
func (h *locketHandler) Release(ctx context.Context, req *models.ProtoReleaseRequest) (*models.ProtoReleaseResponse, error) {
102102
var (
103-
response *models.ReleaseResponse
103+
response *models.ProtoReleaseResponse
104104
err error
105105
)
106106

@@ -112,9 +112,9 @@ func (h *locketHandler) Release(ctx context.Context, req *models.ReleaseRequest)
112112
return response, err
113113
}
114114

115-
func (h *locketHandler) Fetch(ctx context.Context, req *models.FetchRequest) (*models.FetchResponse, error) {
115+
func (h *locketHandler) Fetch(ctx context.Context, req *models.ProtoFetchRequest) (*models.ProtoFetchResponse, error) {
116116
var (
117-
response *models.FetchResponse
117+
response *models.ProtoFetchResponse
118118
err error
119119
)
120120

@@ -126,9 +126,9 @@ func (h *locketHandler) Fetch(ctx context.Context, req *models.FetchRequest) (*m
126126
return response, err
127127
}
128128

129-
func (h *locketHandler) FetchAll(ctx context.Context, req *models.FetchAllRequest) (*models.FetchAllResponse, error) {
129+
func (h *locketHandler) FetchAll(ctx context.Context, req *models.ProtoFetchAllRequest) (*models.ProtoFetchAllResponse, error) {
130130
var (
131-
response *models.FetchAllResponse
131+
response *models.ProtoFetchAllResponse
132132
err error
133133
)
134134

@@ -140,7 +140,7 @@ func (h *locketHandler) FetchAll(ctx context.Context, req *models.FetchAllReques
140140
return response, err
141141
}
142142

143-
func (h *locketHandler) lock(ctx context.Context, req *models.LockRequest) (*models.LockResponse, error) {
143+
func (h *locketHandler) lock(ctx context.Context, req *models.ProtoLockRequest) (*models.ProtoLockResponse, error) {
144144
logger := h.logger.Session("lock")
145145
logger.Debug("started")
146146
defer logger.Debug("complete")
@@ -174,7 +174,7 @@ func (h *locketHandler) lock(ctx context.Context, req *models.LockRequest) (*mod
174174
logger = logger.WithData(lager.Data{"request-uuid": requestUUID[0]})
175175
}
176176

177-
lock, err := h.db.Lock(ctx, logger, req.Resource, req.TtlInSeconds)
177+
lock, err := h.db.Lock(ctx, logger, req.Resource.FromProto(), req.TtlInSeconds)
178178
if err != nil {
179179
if err != models.ErrLockCollision {
180180
logger.Error("failed-locking-lock", err, lager.Data{
@@ -187,23 +187,23 @@ func (h *locketHandler) lock(ctx context.Context, req *models.LockRequest) (*mod
187187

188188
h.lockPick.RegisterTTL(logger, lock)
189189

190-
return &models.LockResponse{}, nil
190+
return &models.ProtoLockResponse{}, nil
191191
}
192192

193-
func (h *locketHandler) release(ctx context.Context, req *models.ReleaseRequest) (*models.ReleaseResponse, error) {
193+
func (h *locketHandler) release(ctx context.Context, req *models.ProtoReleaseRequest) (*models.ProtoReleaseResponse, error) {
194194
logger := h.logger.Session("release")
195195
logger.Debug("started")
196196
defer logger.Debug("complete")
197197

198-
err := h.db.Release(ctx, logger, req.Resource)
198+
err := h.db.Release(ctx, logger, req.Resource.FromProto())
199199
if err != nil {
200200
return nil, err
201201
}
202202

203-
return &models.ReleaseResponse{}, nil
203+
return &models.ProtoReleaseResponse{}, nil
204204
}
205205

206-
func (h *locketHandler) fetch(ctx context.Context, req *models.FetchRequest) (*models.FetchResponse, error) {
206+
func (h *locketHandler) fetch(ctx context.Context, req *models.ProtoFetchRequest) (*models.ProtoFetchResponse, error) {
207207
logger := h.logger.Session("fetch")
208208
logger.Debug("started")
209209
defer logger.Debug("complete")
@@ -213,12 +213,12 @@ func (h *locketHandler) fetch(ctx context.Context, req *models.FetchRequest) (*m
213213
return nil, err
214214
}
215215

216-
return &models.FetchResponse{
217-
Resource: lock.Resource,
216+
return &models.ProtoFetchResponse{
217+
Resource: lock.Resource.ToProto(),
218218
}, nil
219219
}
220220

221-
func (h *locketHandler) fetchAll(ctx context.Context, req *models.FetchAllRequest) (*models.FetchAllResponse, error) {
221+
func (h *locketHandler) fetchAll(ctx context.Context, req *models.ProtoFetchAllRequest) (*models.ProtoFetchAllResponse, error) {
222222
logger := h.logger.Session("fetch-all")
223223
logger.Debug("started")
224224
defer logger.Debug("complete")
@@ -229,7 +229,8 @@ func (h *locketHandler) fetchAll(ctx context.Context, req *models.FetchAllReques
229229
return nil, err
230230
}
231231

232-
locks, err := h.db.FetchAll(ctx, logger, models.GetType(&models.Resource{TypeCode: req.TypeCode}))
232+
resource := &models.ProtoResource{TypeCode: req.TypeCode}
233+
locks, err := h.db.FetchAll(ctx, logger, models.GetType(resource.FromProto()))
233234
if err != nil {
234235
return nil, err
235236
}
@@ -239,9 +240,10 @@ func (h *locketHandler) fetchAll(ctx context.Context, req *models.FetchAllReques
239240
responses = append(responses, lock.Resource)
240241
}
241242

242-
return &models.FetchAllResponse{
243+
response := &models.FetchAllResponse{
243244
Resources: responses,
244-
}, nil
245+
}
246+
return response.ToProto(), nil
245247
}
246248

247249
func validate(req interface{}) error {
@@ -260,7 +262,7 @@ func validate(req interface{}) error {
260262
return models.ErrInvalidType
261263
}
262264

263-
if reqTypeCode == models.TypeCode_UNKNOWN {
265+
if reqTypeCode == models.UNKNOWN {
264266
return models.ErrInvalidType
265267
}
266268

0 commit comments

Comments
 (0)