Skip to content

Commit 4285d39

Browse files
antlai-temporalantlai-temporal
authored
Versioning 3 (#740)
1 parent d201c23 commit 4285d39

12 files changed

Lines changed: 1464 additions & 13 deletions

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ require (
1616
github.com/stretchr/testify v1.10.0
1717
github.com/temporalio/ui-server/v2 v2.34.0
1818
go.temporal.io/api v1.43.0
19-
go.temporal.io/sdk v1.31.0
19+
go.temporal.io/sdk v1.32.1
2020
go.temporal.io/server v1.26.2
2121
google.golang.org/grpc v1.67.1
2222
google.golang.org/protobuf v1.35.1

‎go.sum‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -309,8 +309,6 @@ github.com/temporalio/sqlparser v0.0.0-20231115171017-f4060bcfa6cb/go.mod h1:143
309309
github.com/temporalio/tchannel-go v1.22.1-0.20220818200552-1be8d8cffa5b/go.mod h1:c+V9Z/ZgkzAdyGvHrvC5AsXgN+M9Qwey04cBdKYzV7U=
310310
github.com/temporalio/tchannel-go v1.22.1-0.20240528171429-1db37fdea938 h1:sEJGhmDo+0FaPWM6f0v8Tjia0H5pR6/Baj6+kS78B+M=
311311
github.com/temporalio/tchannel-go v1.22.1-0.20240528171429-1db37fdea938/go.mod h1:ezRQRwu9KQXy8Wuuv1aaFFxoCNz5CeNbVOOkh3xctbY=
312-
github.com/temporalio/ui-server/v2 v2.32.0 h1:mR6eet9n4eRkGgHcZqaJdXWK5sfQguN4LoWxQXsqpY0=
313-
github.com/temporalio/ui-server/v2 v2.32.0/go.mod h1:b8whRt0/lbgNDzG7alSdiDzXFO8Fk783eRMhIycWtn8=
314312
github.com/temporalio/ui-server/v2 v2.34.0 h1:KLTTMh870/h1oxYqOtGMnmQBOP0oIcwFEnP7/i0C0hA=
315313
github.com/temporalio/ui-server/v2 v2.34.0/go.mod h1:Um2G8/8bDQczAdY+21ba+y+nLXwUdL7ZLlhAAaIeVqA=
316314
github.com/twmb/murmur3 v1.1.8 h1:8Yt9taO/WN3l08xErzjeschgZU2QSrwm1kclYq+0aRg=
@@ -361,8 +359,8 @@ go.opentelemetry.io/proto/otlp v1.3.1 h1:TrMUixzpM0yuc/znrFTP9MMRh8trP93mkCiDVeX
361359
go.opentelemetry.io/proto/otlp v1.3.1/go.mod h1:0X1WI4de4ZsLrrJNLAQbFeLCm3T7yBkR0XqQ7niQU+8=
362360
go.temporal.io/api v1.43.0 h1:lBhq+u5qFJqGMXwWsmg/i8qn1UA/3LCwVc88l2xUMHg=
363361
go.temporal.io/api v1.43.0/go.mod h1:1WwYUMo6lao8yl0371xWUm13paHExN5ATYT/B7QtFis=
364-
go.temporal.io/sdk v1.31.0 h1:CLYiP0R5Sdj0gq8LyYKDDz4ccGOdJPR8wNGJU0JGwj8=
365-
go.temporal.io/sdk v1.31.0/go.mod h1:8U8H7rF9u4Hyb4Ry9yiEls5716DHPNvVITPNkgWUwE8=
362+
go.temporal.io/sdk v1.32.1 h1:slA8prhdFr4lxpsTcRusWVitD/cGjELfKUh0mBj73SU=
363+
go.temporal.io/sdk v1.32.1/go.mod h1:8U8H7rF9u4Hyb4Ry9yiEls5716DHPNvVITPNkgWUwE8=
366364
go.temporal.io/server v1.26.2 h1:vDW11lxslYPlGDbQklWi/tqbkVZ2ExtRO1jNjvZmUUI=
367365
go.temporal.io/server v1.26.2/go.mod h1:tgY+4z/PuIdqs6ouV1bT90RWSWfEioWkzmrNrLYLUrk=
368366
go.temporal.io/version v0.3.0 h1:dMrei9l9NyHt8nG6EB8vAwDLLTwx2SvRyucCSumAiig=

‎temporalcli/commands.gen.go‎

Lines changed: 207 additions & 0 deletions
Large diffs are not rendered by default.

‎temporalcli/commands.taskqueue_test.go‎

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@ package temporalcli_test
22

33
import (
44
"encoding/json"
5-
"github.com/stretchr/testify/assert"
6-
"go.temporal.io/sdk/workflow"
75
"strings"
86
"time"
97

8+
"github.com/stretchr/testify/assert"
9+
"go.temporal.io/sdk/workflow"
10+
1011
"github.com/google/uuid"
1112
"github.com/temporalio/cli/temporalcli"
1213
"go.temporal.io/api/enums/v1"
@@ -261,6 +262,10 @@ func (s *SharedServerSuite) TestTaskQueue_Describe_Simple() {
261262
)
262263
s.NoError(res.Err)
263264

265+
// TODO(antlai-temporal): Delete when a server caching bug in 1.26.2 is fixed,
266+
// see https://github.com/temporalio/temporal/pull/6978
267+
time.Sleep(1 * time.Second)
268+
264269
// Text
265270
res = s.Execute(
266271
"task-queue", "describe",
@@ -270,11 +275,14 @@ func (s *SharedServerSuite) TestTaskQueue_Describe_Simple() {
270275
"--task-queue", s.Worker().Options.TaskQueue,
271276
)
272277
s.NoError(res.Err)
273-
274278
s.ContainsOnSameLine(res.Stdout.String(), "id1", "reachable")
275279
// No pollers on id1
276280
s.NotContains(res.Stdout.String(), "now")
277281

282+
// TODO(antlai-temporal): Delete when a server caching bug in 1.26.2 is fixed,
283+
// see https://github.com/temporalio/temporal/pull/6978
284+
time.Sleep(1 * time.Second)
285+
278286
res = s.Execute(
279287
"task-queue", "describe",
280288
"--select-unversioned",
@@ -286,8 +294,12 @@ func (s *SharedServerSuite) TestTaskQueue_Describe_Simple() {
286294
s.NoError(res.Err)
287295

288296
s.ContainsOnSameLine(res.Stdout.String(), "UNVERSIONED", "unreachable")
289-
s.ContainsOnSameLine(res.Stdout.String(), "UNVERSIONED", "workflow", s.DevServer.Options.ClientOptions.Identity, "now", "100000")
290-
s.ContainsOnSameLine(res.Stdout.String(), "UNVERSIONED", "activity", s.DevServer.Options.ClientOptions.Identity, "now", "100000")
297+
s.ContainsOnSameLine(res.Stdout.String(), "UNVERSIONED", "workflow", s.DevServer.Options.ClientOptions.Identity, "2 seconds ago", "100000")
298+
s.ContainsOnSameLine(res.Stdout.String(), "UNVERSIONED", "activity", s.DevServer.Options.ClientOptions.Identity, "2 seconds ago", "100000")
299+
300+
// TODO(antlai-temporal): Delete when a server caching bug in 1.26.2 is fixed,
301+
// see https://github.com/temporalio/temporal/pull/6978
302+
time.Sleep(1 * time.Second)
291303

292304
res = s.Execute(
293305
"task-queue", "describe",
@@ -303,6 +315,10 @@ func (s *SharedServerSuite) TestTaskQueue_Describe_Simple() {
303315
// No pollers on id2
304316
s.NotContains(res.Stdout.String(), "now")
305317

318+
// TODO(antlai-temporal): Delete when a server caching bug in 1.26.2 is fixed,
319+
// see https://github.com/temporalio/temporal/pull/6978
320+
time.Sleep(1 * time.Second)
321+
306322
res = s.Execute(
307323
"task-queue", "describe",
308324
"--select-all-active",

0 commit comments

Comments
 (0)