Versioning 3 (#740)

temporalio · Jan 15, 2025 · 4285d39 · 4285d39
1 parent d201c23
commit 4285d39
Show file tree

Hide file tree

Showing 12 changed files with 1,464 additions and 13 deletions.
diff --git a/go.mod b/go.mod
@@ -16,7 +16,7 @@ require (
 	github.com/stretchr/testify v1.10.0
 	github.com/temporalio/ui-server/v2 v2.34.0
 	go.temporal.io/api v1.43.0
-	go.temporal.io/sdk v1.31.0
+	go.temporal.io/sdk v1.32.1
 	go.temporal.io/server v1.26.2
 	google.golang.org/grpc v1.67.1
 	google.golang.org/protobuf v1.35.1

diff --git a/go.sum b/go.sum
@@ -309,8 +309,6 @@ github.com/temporalio/sqlparser v0.0.0-20231115171017-f4060bcfa6cb/go.mod h1:143
 github.com/temporalio/tchannel-go v1.22.1-0.20220818200552-1be8d8cffa5b/go.mod h1:c+V9Z/ZgkzAdyGvHrvC5AsXgN+M9Qwey04cBdKYzV7U=
 github.com/temporalio/tchannel-go v1.22.1-0.20240528171429-1db37fdea938 h1:sEJGhmDo+0FaPWM6f0v8Tjia0H5pR6/Baj6+kS78B+M=
 github.com/temporalio/tchannel-go v1.22.1-0.20240528171429-1db37fdea938/go.mod h1:ezRQRwu9KQXy8Wuuv1aaFFxoCNz5CeNbVOOkh3xctbY=
-github.com/temporalio/ui-server/v2 v2.32.0 h1:mR6eet9n4eRkGgHcZqaJdXWK5sfQguN4LoWxQXsqpY0=
-github.com/temporalio/ui-server/v2 v2.32.0/go.mod h1:b8whRt0/lbgNDzG7alSdiDzXFO8Fk783eRMhIycWtn8=
 github.com/temporalio/ui-server/v2 v2.34.0 h1:KLTTMh870/h1oxYqOtGMnmQBOP0oIcwFEnP7/i0C0hA=
 github.com/temporalio/ui-server/v2 v2.34.0/go.mod h1:Um2G8/8bDQczAdY+21ba+y+nLXwUdL7ZLlhAAaIeVqA=
 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
 go.opentelemetry.io/proto/otlp v1.3.1/go.mod h1:0X1WI4de4ZsLrrJNLAQbFeLCm3T7yBkR0XqQ7niQU+8=
 go.temporal.io/api v1.43.0 h1:lBhq+u5qFJqGMXwWsmg/i8qn1UA/3LCwVc88l2xUMHg=
 go.temporal.io/api v1.43.0/go.mod h1:1WwYUMo6lao8yl0371xWUm13paHExN5ATYT/B7QtFis=
-go.temporal.io/sdk v1.31.0 h1:CLYiP0R5Sdj0gq8LyYKDDz4ccGOdJPR8wNGJU0JGwj8=
-go.temporal.io/sdk v1.31.0/go.mod h1:8U8H7rF9u4Hyb4Ry9yiEls5716DHPNvVITPNkgWUwE8=
+go.temporal.io/sdk v1.32.1 h1:slA8prhdFr4lxpsTcRusWVitD/cGjELfKUh0mBj73SU=
+go.temporal.io/sdk v1.32.1/go.mod h1:8U8H7rF9u4Hyb4Ry9yiEls5716DHPNvVITPNkgWUwE8=
 go.temporal.io/server v1.26.2 h1:vDW11lxslYPlGDbQklWi/tqbkVZ2ExtRO1jNjvZmUUI=
 go.temporal.io/server v1.26.2/go.mod h1:tgY+4z/PuIdqs6ouV1bT90RWSWfEioWkzmrNrLYLUrk=
 go.temporal.io/version v0.3.0 h1:dMrei9l9NyHt8nG6EB8vAwDLLTwx2SvRyucCSumAiig=

diff --git a/temporalcli/commands.gen.go b/temporalcli/commands.gen.go
diff --git a/temporalcli/commands.taskqueue_test.go b/temporalcli/commands.taskqueue_test.go
@@ -2,11 +2,12 @@ package temporalcli_test
 
 import (
 	"encoding/json"
-	"github.com/stretchr/testify/assert"
-	"go.temporal.io/sdk/workflow"
 	"strings"
 	"time"
 
+	"github.com/stretchr/testify/assert"
+	"go.temporal.io/sdk/workflow"
+
 	"github.com/google/uuid"
 	"github.com/temporalio/cli/temporalcli"
 	"go.temporal.io/api/enums/v1"
@@ -261,6 +262,10 @@ func (s *SharedServerSuite) TestTaskQueue_Describe_Simple() {
 	)
 	s.NoError(res.Err)
 
+	// TODO(antlai-temporal): Delete when a server caching bug in 1.26.2 is fixed,
+	// see https://github.com/temporalio/temporal/pull/6978
+	time.Sleep(1 * time.Second)
+
 	// Text
 	res = s.Execute(
 		"task-queue", "describe",
@@ -270,11 +275,14 @@ func (s *SharedServerSuite) TestTaskQueue_Describe_Simple() {
 		"--task-queue", s.Worker().Options.TaskQueue,
 	)
 	s.NoError(res.Err)
-
 	s.ContainsOnSameLine(res.Stdout.String(), "id1", "reachable")
 	// No pollers on id1
 	s.NotContains(res.Stdout.String(), "now")
 
+	// TODO(antlai-temporal): Delete when a server caching bug in 1.26.2 is fixed,
+	// see https://github.com/temporalio/temporal/pull/6978
+	time.Sleep(1 * time.Second)
+
 	res = s.Execute(
 		"task-queue", "describe",
 		"--select-unversioned",
@@ -286,8 +294,12 @@ func (s *SharedServerSuite) TestTaskQueue_Describe_Simple() {
 	s.NoError(res.Err)
 
 	s.ContainsOnSameLine(res.Stdout.String(), "UNVERSIONED", "unreachable")
-	s.ContainsOnSameLine(res.Stdout.String(), "UNVERSIONED", "workflow", s.DevServer.Options.ClientOptions.Identity, "now", "100000")
-	s.ContainsOnSameLine(res.Stdout.String(), "UNVERSIONED", "activity", s.DevServer.Options.ClientOptions.Identity, "now", "100000")
+	s.ContainsOnSameLine(res.Stdout.String(), "UNVERSIONED", "workflow", s.DevServer.Options.ClientOptions.Identity, "2 seconds ago", "100000")
+	s.ContainsOnSameLine(res.Stdout.String(), "UNVERSIONED", "activity", s.DevServer.Options.ClientOptions.Identity, "2 seconds ago", "100000")
+
+	// TODO(antlai-temporal): Delete when a server caching bug in 1.26.2 is fixed,
+	// see https://github.com/temporalio/temporal/pull/6978
+	time.Sleep(1 * time.Second)
 
 	res = s.Execute(
 		"task-queue", "describe",
@@ -303,6 +315,10 @@ func (s *SharedServerSuite) TestTaskQueue_Describe_Simple() {
 	// No pollers on id2
 	s.NotContains(res.Stdout.String(), "now")
 
+	// TODO(antlai-temporal): Delete when a server caching bug in 1.26.2 is fixed,
+	// see https://github.com/temporalio/temporal/pull/6978
+	time.Sleep(1 * time.Second)
+
 	res = s.Execute(
 		"task-queue", "describe",
 		"--select-all-active",