Skip to content

Commit e513494

Browse files
bergundybergundy
committed
Fix tests
1 parent 1700875 commit e513494

3 files changed

Lines changed: 63 additions & 63 deletions

File tree

‎temporalcli/commands.worker.deployment_test.go‎

Lines changed: 43 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ func (s *SharedServerSuite) TestDeployment_Set_Current_Version() {
6969
buildId := uuid.NewString()
7070
version := worker.WorkerDeploymentVersion{
7171
DeploymentName: deploymentName,
72-
BuildId: buildId,
72+
BuildID: buildId,
7373
}
7474
w := s.DevServer.StartDevWorker(s.Suite.T(), DevWorkerOptions{
7575
Worker: worker.Options{
@@ -95,15 +95,15 @@ func (s *SharedServerSuite) TestDeployment_Set_Current_Version() {
9595
res := s.Execute(
9696
"worker", "deployment", "describe-version",
9797
"--address", s.Address(),
98-
"--deployment-name", version.DeploymentName, "--build-id", version.BuildId,
98+
"--deployment-name", version.DeploymentName, "--build-id", version.BuildID,
9999
)
100100
assert.NoError(t, res.Err)
101101
}, 30*time.Second, 100*time.Millisecond)
102102

103103
res := s.Execute(
104104
"worker", "deployment", "set-current-version",
105105
"--address", s.Address(),
106-
"--deployment-name", version.DeploymentName, "--build-id", version.BuildId,
106+
"--deployment-name", version.DeploymentName, "--build-id", version.BuildID,
107107
"--yes",
108108
)
109109
s.NoError(res.Err)
@@ -117,7 +117,7 @@ func (s *SharedServerSuite) TestDeployment_Set_Current_Version() {
117117

118118
s.ContainsOnSameLine(res.Stdout.String(), "Name", deploymentName)
119119
s.ContainsOnSameLine(res.Stdout.String(), "CurrentVersionDeploymentName", version.DeploymentName)
120-
s.ContainsOnSameLine(res.Stdout.String(), "CurrentVersionBuildID", version.BuildId)
120+
s.ContainsOnSameLine(res.Stdout.String(), "CurrentVersionBuildID", version.BuildID)
121121

122122
// json
123123
res = s.Execute(
@@ -132,13 +132,13 @@ func (s *SharedServerSuite) TestDeployment_Set_Current_Version() {
132132
s.NoError(json.Unmarshal(res.Stdout.Bytes(), &jsonOut))
133133
s.Equal(deploymentName, jsonOut.Name)
134134
s.Equal(version.DeploymentName, jsonOut.RoutingConfig.CurrentVersionDeploymentName)
135-
s.Equal(version.BuildId, jsonOut.RoutingConfig.CurrentVersionBuildID)
135+
s.Equal(version.BuildID, jsonOut.RoutingConfig.CurrentVersionBuildID)
136136

137137
// set metadata
138138
res = s.Execute(
139139
"worker", "deployment", "update-metadata-version",
140140
"--address", s.Address(),
141-
"--deployment-name", version.DeploymentName, "--build-id", version.BuildId,
141+
"--deployment-name", version.DeploymentName, "--build-id", version.BuildID,
142142
"--metadata", "bar=1",
143143
"--output", "json",
144144
)
@@ -155,7 +155,7 @@ func (s *SharedServerSuite) TestDeployment_Set_Current_Version() {
155155
res = s.Execute(
156156
"worker", "deployment", "update-metadata-version",
157157
"--address", s.Address(),
158-
"--deployment-name", version.DeploymentName, "--build-id", version.BuildId,
158+
"--deployment-name", version.DeploymentName, "--build-id", version.BuildID,
159159
"--remove-entries", "bar",
160160
"--output", "json",
161161
)
@@ -164,7 +164,7 @@ func (s *SharedServerSuite) TestDeployment_Set_Current_Version() {
164164
res = s.Execute(
165165
"worker", "deployment", "describe-version",
166166
"--address", s.Address(),
167-
"--deployment-name", version.DeploymentName, "--build-id", version.BuildId,
167+
"--deployment-name", version.DeploymentName, "--build-id", version.BuildID,
168168
"--output", "json",
169169
)
170170
s.NoError(res.Err)
@@ -190,11 +190,11 @@ func (s *SharedServerSuite) TestDeployment_List() {
190190
buildId2 := uuid.NewString()
191191
version1 := worker.WorkerDeploymentVersion{
192192
DeploymentName: deploymentName1,
193-
BuildId: buildId1,
193+
BuildID: buildId1,
194194
}
195195
version2 := worker.WorkerDeploymentVersion{
196196
DeploymentName: deploymentName2,
197-
BuildId: buildId2,
197+
BuildID: buildId2,
198198
}
199199

200200
w1 := s.DevServer.StartDevWorker(s.Suite.T(), DevWorkerOptions{
@@ -233,29 +233,29 @@ func (s *SharedServerSuite) TestDeployment_List() {
233233
res := s.Execute(
234234
"worker", "deployment", "describe-version",
235235
"--address", s.Address(),
236-
"--deployment-name", version1.DeploymentName, "--build-id", version1.BuildId,
236+
"--deployment-name", version1.DeploymentName, "--build-id", version1.BuildID,
237237
)
238238
assert.NoError(t, res.Err)
239239
res = s.Execute(
240240
"worker", "deployment", "describe-version",
241241
"--address", s.Address(),
242-
"--deployment-name", version2.DeploymentName, "--build-id", version2.BuildId,
242+
"--deployment-name", version2.DeploymentName, "--build-id", version2.BuildID,
243243
)
244244
assert.NoError(t, res.Err)
245245
}, 30*time.Second, 100*time.Millisecond)
246246

247247
res := s.Execute(
248248
"worker", "deployment", "set-current-version",
249249
"--address", s.Address(),
250-
"--deployment-name", version1.DeploymentName, "--build-id", version1.BuildId,
250+
"--deployment-name", version1.DeploymentName, "--build-id", version1.BuildID,
251251
"--yes",
252252
)
253253
s.NoError(res.Err)
254254

255255
res = s.Execute(
256256
"worker", "deployment", "set-current-version",
257257
"--address", s.Address(),
258-
"--deployment-name", version2.DeploymentName, "--build-id", version2.BuildId,
258+
"--deployment-name", version2.DeploymentName, "--build-id", version2.BuildID,
259259
"--yes",
260260
)
261261
s.NoError(res.Err)
@@ -268,8 +268,8 @@ func (s *SharedServerSuite) TestDeployment_List() {
268268
s.NoError(res.Err)
269269
}, 10*time.Second, 100*time.Millisecond)
270270

271-
s.ContainsOnSameLine(res.Stdout.String(), deploymentName1, version1.BuildId)
272-
s.ContainsOnSameLine(res.Stdout.String(), deploymentName2, version2.BuildId)
271+
s.ContainsOnSameLine(res.Stdout.String(), deploymentName1, version1.BuildID)
272+
s.ContainsOnSameLine(res.Stdout.String(), deploymentName2, version2.BuildID)
273273

274274
// json
275275
res = s.Execute(
@@ -288,10 +288,10 @@ func (s *SharedServerSuite) TestDeployment_List() {
288288
s.Equal(2, len(jsonOut))
289289
s.Equal(deploymentName1, jsonOut[0].Name)
290290
s.Equal(version1.DeploymentName, jsonOut[0].RoutingConfig.CurrentVersionDeploymentName)
291-
s.Equal(version1.BuildId, jsonOut[0].RoutingConfig.CurrentVersionBuildID)
291+
s.Equal(version1.BuildID, jsonOut[0].RoutingConfig.CurrentVersionBuildID)
292292
s.Equal(deploymentName2, jsonOut[1].Name)
293293
s.Equal(version2.DeploymentName, jsonOut[1].RoutingConfig.CurrentVersionDeploymentName)
294-
s.Equal(version2.BuildId, jsonOut[1].RoutingConfig.CurrentVersionBuildID)
294+
s.Equal(version2.BuildID, jsonOut[1].RoutingConfig.CurrentVersionBuildID)
295295
}
296296

297297
func (s *SharedServerSuite) TestDeployment_Describe_Drainage() {
@@ -300,11 +300,11 @@ func (s *SharedServerSuite) TestDeployment_Describe_Drainage() {
300300
buildId2 := "b" + uuid.NewString()
301301
version1 := worker.WorkerDeploymentVersion{
302302
DeploymentName: deploymentName,
303-
BuildId: buildId1,
303+
BuildID: buildId1,
304304
}
305305
version2 := worker.WorkerDeploymentVersion{
306306
DeploymentName: deploymentName,
307-
BuildId: buildId2,
307+
BuildID: buildId2,
308308
}
309309

310310
w1 := s.DevServer.StartDevWorker(s.Suite.T(), DevWorkerOptions{
@@ -342,21 +342,21 @@ func (s *SharedServerSuite) TestDeployment_Describe_Drainage() {
342342
res := s.Execute(
343343
"worker", "deployment", "describe-version",
344344
"--address", s.Address(),
345-
"--deployment-name", version1.DeploymentName, "--build-id", version1.BuildId,
345+
"--deployment-name", version1.DeploymentName, "--build-id", version1.BuildID,
346346
)
347347
assert.NoError(t, res.Err)
348348
res = s.Execute(
349349
"worker", "deployment", "describe-version",
350350
"--address", s.Address(),
351-
"--deployment-name", version2.DeploymentName, "--build-id", version2.BuildId,
351+
"--deployment-name", version2.DeploymentName, "--build-id", version2.BuildID,
352352
)
353353
assert.NoError(t, res.Err)
354354
}, 30*time.Second, 100*time.Millisecond)
355355

356356
res := s.Execute(
357357
"worker", "deployment", "set-current-version",
358358
"--address", s.Address(),
359-
"--deployment-name", version1.DeploymentName, "--build-id", version1.BuildId,
359+
"--deployment-name", version1.DeploymentName, "--build-id", version1.BuildID,
360360
"--yes",
361361
)
362362
s.NoError(res.Err)
@@ -368,13 +368,13 @@ func (s *SharedServerSuite) TestDeployment_Describe_Drainage() {
368368
)
369369
s.NoError(res.Err)
370370
s.ContainsOnSameLine(res.Stdout.String(), "CurrentVersionDeploymentName", version1.DeploymentName)
371-
s.ContainsOnSameLine(res.Stdout.String(), "CurrentVersionBuildID", version1.BuildId)
371+
s.ContainsOnSameLine(res.Stdout.String(), "CurrentVersionBuildID", version1.BuildID)
372372

373373
fmt.Print("hello")
374374
res = s.Execute(
375375
"worker", "deployment", "set-current-version",
376376
"--address", s.Address(),
377-
"--deployment-name", version2.DeploymentName, "--build-id", version2.BuildId,
377+
"--deployment-name", version2.DeploymentName, "--build-id", version2.BuildID,
378378
"--yes",
379379
)
380380
s.NoError(res.Err)
@@ -387,7 +387,7 @@ func (s *SharedServerSuite) TestDeployment_Describe_Drainage() {
387387
s.NoError(res.Err)
388388

389389
s.ContainsOnSameLine(res.Stdout.String(), "CurrentVersionDeploymentName", version2.DeploymentName)
390-
s.ContainsOnSameLine(res.Stdout.String(), "CurrentVersionBuildID", version2.BuildId)
390+
s.ContainsOnSameLine(res.Stdout.String(), "CurrentVersionBuildID", version2.BuildID)
391391
s.ContainsOnSameLine(res.Stdout.String(), version1.DeploymentName, "draining")
392392
s.ContainsOnSameLine(res.Stdout.String(), version2.DeploymentName, "unspecified")
393393

@@ -409,9 +409,9 @@ func (s *SharedServerSuite) TestDeployment_Describe_Drainage() {
409409

410410
s.Equal(2, len(jsonOut.VersionSummaries))
411411
s.Equal("draining", jsonOut.VersionSummaries[0].DrainageStatus)
412-
s.Equal(version1.BuildId, jsonOut.VersionSummaries[0].BuildID)
412+
s.Equal(version1.BuildID, jsonOut.VersionSummaries[0].BuildID)
413413
s.Equal("unspecified", jsonOut.VersionSummaries[1].DrainageStatus)
414-
s.Equal(version2.BuildId, jsonOut.VersionSummaries[1].BuildID)
414+
s.Equal(version2.BuildID, jsonOut.VersionSummaries[1].BuildID)
415415
}
416416

417417
func (s *SharedServerSuite) TestDeployment_Ramping() {
@@ -420,11 +420,11 @@ func (s *SharedServerSuite) TestDeployment_Ramping() {
420420
buildId2 := "b" + uuid.NewString()
421421
version1 := worker.WorkerDeploymentVersion{
422422
DeploymentName: deploymentName,
423-
BuildId: buildId1,
423+
BuildID: buildId1,
424424
}
425425
version2 := worker.WorkerDeploymentVersion{
426426
DeploymentName: deploymentName,
427-
BuildId: buildId2,
427+
BuildID: buildId2,
428428
}
429429

430430
w1 := s.DevServer.StartDevWorker(s.Suite.T(), DevWorkerOptions{
@@ -462,29 +462,29 @@ func (s *SharedServerSuite) TestDeployment_Ramping() {
462462
res := s.Execute(
463463
"worker", "deployment", "describe-version",
464464
"--address", s.Address(),
465-
"--deployment-name", version1.DeploymentName, "--build-id", version1.BuildId,
465+
"--deployment-name", version1.DeploymentName, "--build-id", version1.BuildID,
466466
)
467467
assert.NoError(t, res.Err)
468468
res = s.Execute(
469469
"worker", "deployment", "describe-version",
470470
"--address", s.Address(),
471-
"--deployment-name", version2.DeploymentName, "--build-id", version2.BuildId,
471+
"--deployment-name", version2.DeploymentName, "--build-id", version2.BuildID,
472472
)
473473
assert.NoError(t, res.Err)
474474
}, 30*time.Second, 100*time.Millisecond)
475475

476476
res := s.Execute(
477477
"worker", "deployment", "set-current-version",
478478
"--address", s.Address(),
479-
"--deployment-name", version1.DeploymentName, "--build-id", version1.BuildId,
479+
"--deployment-name", version1.DeploymentName, "--build-id", version1.BuildID,
480480
"--yes",
481481
)
482482
s.NoError(res.Err)
483483

484484
res = s.Execute(
485485
"worker", "deployment", "set-ramping-version",
486486
"--address", s.Address(),
487-
"--deployment-name", version2.DeploymentName, "--build-id", version2.BuildId,
487+
"--deployment-name", version2.DeploymentName, "--build-id", version2.BuildID,
488488
"--percentage", "12.5",
489489
"--yes",
490490
)
@@ -497,16 +497,16 @@ func (s *SharedServerSuite) TestDeployment_Ramping() {
497497
)
498498
s.NoError(res.Err)
499499
s.ContainsOnSameLine(res.Stdout.String(), "CurrentVersionDeploymentName", version1.DeploymentName)
500-
s.ContainsOnSameLine(res.Stdout.String(), "CurrentVersionBuildID", version1.BuildId)
500+
s.ContainsOnSameLine(res.Stdout.String(), "CurrentVersionBuildID", version1.BuildID)
501501
s.ContainsOnSameLine(res.Stdout.String(), "RampingVersionDeploymentName", version2.DeploymentName)
502-
s.ContainsOnSameLine(res.Stdout.String(), "RampingVersionBuildID", version2.BuildId)
502+
s.ContainsOnSameLine(res.Stdout.String(), "RampingVersionBuildID", version2.BuildID)
503503
s.ContainsOnSameLine(res.Stdout.String(), "RampingVersionPercentage", "12.5")
504504

505505
// setting version2 as current also removes the ramp
506506
res = s.Execute(
507507
"worker", "deployment", "set-current-version",
508508
"--address", s.Address(),
509-
"--deployment-name", version2.DeploymentName, "--build-id", version2.BuildId,
509+
"--deployment-name", version2.DeploymentName, "--build-id", version2.BuildID,
510510
"--yes",
511511
)
512512
s.NoError(res.Err)
@@ -523,13 +523,13 @@ func (s *SharedServerSuite) TestDeployment_Ramping() {
523523
s.NoError(json.Unmarshal(res.Stdout.Bytes(), &jsonOut))
524524
s.Equal(deploymentName, jsonOut.Name)
525525
s.Empty(jsonOut.RoutingConfig.RampingVersionBuildID)
526-
s.Equal(version2.BuildId, jsonOut.RoutingConfig.CurrentVersionBuildID)
526+
s.Equal(version2.BuildID, jsonOut.RoutingConfig.CurrentVersionBuildID)
527527

528528
//same with explicit delete
529529
res = s.Execute(
530530
"worker", "deployment", "set-ramping-version",
531531
"--address", s.Address(),
532-
"--deployment-name", version1.DeploymentName, "--build-id", version1.BuildId,
532+
"--deployment-name", version1.DeploymentName, "--build-id", version1.BuildID,
533533
"--percentage", "10.1",
534534
"--yes",
535535
)
@@ -542,15 +542,15 @@ func (s *SharedServerSuite) TestDeployment_Ramping() {
542542
)
543543
s.NoError(res.Err)
544544
s.ContainsOnSameLine(res.Stdout.String(), "CurrentVersionDeploymentName", version2.DeploymentName)
545-
s.ContainsOnSameLine(res.Stdout.String(), "CurrentVersionBuildID", version2.BuildId)
545+
s.ContainsOnSameLine(res.Stdout.String(), "CurrentVersionBuildID", version2.BuildID)
546546
s.ContainsOnSameLine(res.Stdout.String(), "RampingVersionDeploymentName", version1.DeploymentName)
547-
s.ContainsOnSameLine(res.Stdout.String(), "RampingVersionBuildID", version1.BuildId)
547+
s.ContainsOnSameLine(res.Stdout.String(), "RampingVersionBuildID", version1.BuildID)
548548
s.ContainsOnSameLine(res.Stdout.String(), "RampingVersionPercentage", "10.1")
549549

550550
res = s.Execute(
551551
"worker", "deployment", "set-ramping-version",
552552
"--address", s.Address(),
553-
"--deployment-name", version1.DeploymentName, "--build-id", version1.BuildId,
553+
"--deployment-name", version1.DeploymentName, "--build-id", version1.BuildID,
554554
"--delete",
555555
"--yes",
556556
)
@@ -567,5 +567,5 @@ func (s *SharedServerSuite) TestDeployment_Ramping() {
567567
s.NoError(json.Unmarshal(res.Stdout.Bytes(), &jsonOut))
568568
s.Equal(deploymentName, jsonOut.Name)
569569
s.Equal(float32(0), jsonOut.RoutingConfig.RampingVersionPercentage)
570-
s.Equal(version2.BuildId, jsonOut.RoutingConfig.CurrentVersionBuildID)
570+
s.Equal(version2.BuildID, jsonOut.RoutingConfig.CurrentVersionBuildID)
571571
}

0 commit comments

Comments
 (0)