From f73889c37f8771d3ebc75bfad6abd0735d1cbd3f Mon Sep 17 00:00:00 2001 From: Alex Shtin Date: Sat, 27 Jun 2020 21:51:45 -0700 Subject: [PATCH] Update dependencies for 0.26.0 release (#484) * Update dependencies for 0.26.0 release. * Fix build. * Fix unit tests. --- canary/client.go | 4 +-- docker/docker-compose-cockroach.yml | 4 +-- docker/docker-compose-es.yml | 6 ++-- docker/docker-compose-mysql.yml | 4 +-- docker/docker-compose-postgres.yml | 4 +-- docker/docker-compose.yml | 4 +-- go.mod | 8 ++---- go.sum | 8 +++--- service/worker/archiver/client.go | 2 +- .../archival_workflow_history_v1.json | 28 +++++++++---------- service/worker/archiver/workflow_test.go | 4 +-- service/worker/parentclosepolicy/client.go | 3 +- service/worker/scanner/workflow.go | 15 +++++----- tools/cli/app.go | 2 +- 14 files changed, 46 insertions(+), 50 deletions(-) diff --git a/canary/client.go b/canary/client.go index 6fddcc107e4..7e547abec02 100644 --- a/canary/client.go +++ b/canary/client.go @@ -120,7 +120,7 @@ func newWorkflowOptions(id string, executionTimeout time.Duration) client.StartW TaskQueue: taskQueueName, WorkflowRunTimeout: executionTimeout, WorkflowTaskTimeout: decisionTaskTimeout, - WorkflowIDReusePolicy: client.WorkflowIDReusePolicyAllowDuplicate, + WorkflowIDReusePolicy: enumspb.WORKFLOW_ID_REUSE_POLICY_ALLOW_DUPLICATE, } } @@ -142,7 +142,7 @@ func newChildWorkflowOptions(namespace string, wfID string) workflow.ChildWorkfl TaskQueue: taskQueueName, WorkflowRunTimeout: childWorkflowTimeout, WorkflowTaskTimeout: decisionTaskTimeout, - WorkflowIDReusePolicy: client.WorkflowIDReusePolicyAllowDuplicate, + WorkflowIDReusePolicy: enumspb.WORKFLOW_ID_REUSE_POLICY_ALLOW_DUPLICATE, } } diff --git a/docker/docker-compose-cockroach.yml b/docker/docker-compose-cockroach.yml index f227321b801..91178855d34 100644 --- a/docker/docker-compose-cockroach.yml +++ b/docker/docker-compose-cockroach.yml @@ -14,7 +14,7 @@ services: command: ["start", "--insecure"] temporal: - image: temporalio/auto-setup:0.25.0 + image: temporalio/auto-setup:0.26.0 ports: - "7233:7233" environment: @@ -30,7 +30,7 @@ services: - cockroach:postgres temporal-web: - image: temporalio/web:0.25.0 + image: temporalio/web:0.26.0 environment: - "TEMPORAL_GRPC_ENDPOINT=temporal:7233" ports: diff --git a/docker/docker-compose-es.yml b/docker/docker-compose-es.yml index 442c3bd7ec8..52b98655ed3 100644 --- a/docker/docker-compose-es.yml +++ b/docker/docker-compose-es.yml @@ -26,7 +26,7 @@ services: - discovery.type=single-node - ES_JAVA_OPTS=-Xms100m -Xmx100m temporal: - image: temporalio/server:${SERVER_TAG:-0.25.0} + image: temporalio/server:${SERVER_TAG:-0.26.0} ports: - "7233:7233" environment: @@ -41,7 +41,7 @@ services: - kafka - elasticsearch temporal-admin-tools: - image: temporalio/admin-tools:${ADMIN_TOOLS_TAG:-0.25.0} + image: temporalio/admin-tools:${ADMIN_TOOLS_TAG:-0.26.0} stdin_open: true tty: true environment: @@ -49,7 +49,7 @@ services: depends_on: - temporal temporal-web: - image: temporalio/web:0.25.0 + image: temporalio/web:0.26.0 environment: - "TEMPORAL_GRPC_ENDPOINT=temporal:7233" ports: diff --git a/docker/docker-compose-mysql.yml b/docker/docker-compose-mysql.yml index 132853de4bb..d844fa0934a 100644 --- a/docker/docker-compose-mysql.yml +++ b/docker/docker-compose-mysql.yml @@ -14,7 +14,7 @@ services: - "8125:8125" - "8126:8126" temporal: - image: temporalio/auto-setup:0.25.0 + image: temporalio/auto-setup:0.26.0 ports: - "7233:7233" environment: @@ -28,7 +28,7 @@ services: - mysql - statsd temporal-web: - image: temporalio/web:0.25.0 + image: temporalio/web:0.26.0 environment: - "TEMPORAL_GRPC_ENDPOINT=temporal:7233" ports: diff --git a/docker/docker-compose-postgres.yml b/docker/docker-compose-postgres.yml index 65717e4afb1..9ec4956e8da 100644 --- a/docker/docker-compose-postgres.yml +++ b/docker/docker-compose-postgres.yml @@ -15,7 +15,7 @@ services: - "8125:8125" - "8126:8126" temporal: - image: temporalio/auto-setup:0.25.0 + image: temporalio/auto-setup:0.26.0 ports: - "7233:7233" environment: @@ -29,7 +29,7 @@ services: depends_on: - postgres temporal-web: - image: temporalio/web:0.25.0 + image: temporalio/web:0.26.0 environment: - "TEMPORAL_GRPC_ENDPOINT=temporal:7233" ports: diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index cb70724de35..0b8152d1e4b 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -6,7 +6,7 @@ services: ports: - "9042:9042" temporal: - image: temporalio/auto-setup:0.25.0 + image: temporalio/auto-setup:0.26.0 ports: - "7233:7233" environment: @@ -15,7 +15,7 @@ services: depends_on: - cassandra temporal-web: - image: temporalio/web:0.25.0 + image: temporalio/web:0.26.0 environment: - "TEMPORAL_GRPC_ENDPOINT=temporal:7233" ports: diff --git a/go.mod b/go.mod index 0689733e334..782b5de5433 100644 --- a/go.mod +++ b/go.mod @@ -65,8 +65,8 @@ require ( github.com/urfave/cli v1.22.4 github.com/valyala/fastjson v1.5.1 github.com/xwb1989/sqlparser v0.0.0-20180606152119-120387863bf2 - go.temporal.io/temporal v0.25.1-0.20200627045318-82db0bc557de - go.temporal.io/temporal-proto v0.25.1-0.20200626222731-b3949ecf5fb6 + go.temporal.io/temporal v0.26.0 + go.temporal.io/temporal-proto v0.26.0 go.uber.org/atomic v1.6.0 go.uber.org/multierr v1.5.0 go.uber.org/zap v1.15.0 @@ -84,7 +84,3 @@ require ( // TODO https://github.com/uber/cadence/issues/2863 replace github.com/jmoiron/sqlx v1.2.0 => github.com/longquanzheng/sqlx v0.0.0-20191125235044-053e6130695c - -replace go.temporal.io/temporal-proto v0.25.0 => ../temporal-proto-go - -replace go.temporal.io/temporal v0.25.0 => ../temporal-go-sdk diff --git a/go.sum b/go.sum index da46599f1fa..047c7efb67f 100644 --- a/go.sum +++ b/go.sum @@ -340,10 +340,10 @@ go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3 h1:8sGtKOrtQqkN1bp2AtX+misvLIlOmsEsNd+9NIcPEm8= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.temporal.io/temporal v0.25.1-0.20200627045318-82db0bc557de h1:1GaIv4aFVh9BhNw9a1rIxvdQUjdT1HiD8Zzi5b626k0= -go.temporal.io/temporal v0.25.1-0.20200627045318-82db0bc557de/go.mod h1:XDYU4DmAiOkZ66JblgpbirFXHxdWKSC9dhGUXgX8EI4= -go.temporal.io/temporal-proto v0.25.1-0.20200626222731-b3949ecf5fb6 h1:cm890W0aYf2qQGHimklEA00EM2ZQ8HIfAILwFJtpLCY= -go.temporal.io/temporal-proto v0.25.1-0.20200626222731-b3949ecf5fb6/go.mod h1:E2Ro+CJXq+Wd26/2cMb7kIOG2fv8vXxouNj4jJC93dw= +go.temporal.io/temporal v0.26.0 h1:qqhnjtykSXMYHyeW/rQTCxSYCJnbQGNJf9l3Cm6EDvU= +go.temporal.io/temporal v0.26.0/go.mod h1:AC7G0RzJoMPJARqxvG5gA7z+n8O3whLseDsViYD1uIU= +go.temporal.io/temporal-proto v0.26.0 h1:Ov+K19g4/n23fgIXkd7wmnmXTGP/MpbNVxUOql0pDSc= +go.temporal.io/temporal-proto v0.26.0/go.mod h1:E2Ro+CJXq+Wd26/2cMb7kIOG2fv8vXxouNj4jJC93dw= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= go.uber.org/atomic v1.6.0 h1:Ezj3JGmsOnG1MoRWQkPBsKLe9DwWD9QeXzTRzzldNVk= go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/service/worker/archiver/client.go b/service/worker/archiver/client.go index 61f38d9fa77..2d8b36f564a 100644 --- a/service/worker/archiver/client.go +++ b/service/worker/archiver/client.go @@ -277,7 +277,7 @@ func (c *client) sendArchiveSignal(ctx context.Context, request *ArchiveRequest, TaskQueue: decisionTaskQueue, WorkflowExecutionTimeout: workflowRunTimeout, WorkflowTaskTimeout: workflowTaskTimeout, - WorkflowIDReusePolicy: sdkclient.WorkflowIDReusePolicyAllowDuplicate, + WorkflowIDReusePolicy: enumspb.WORKFLOW_ID_REUSE_POLICY_ALLOW_DUPLICATE, } signalCtx, cancel := context.WithTimeout(context.Background(), signalTimeout) defer cancel() diff --git a/service/worker/archiver/testdata/archival_workflow_history_v1.json b/service/worker/archiver/testdata/archival_workflow_history_v1.json index 9ac7aeb138f..c6235459f22 100755 --- a/service/worker/archiver/testdata/archival_workflow_history_v1.json +++ b/service/worker/archiver/testdata/archival_workflow_history_v1.json @@ -86,8 +86,8 @@ "markerRecordedEventAttributes": { "markerName": "SideEffect", "details": { - "side-effect-id": {"payloads": [{"metadata":{"encoding":"anNvbg=="},"data":"NQ=="}]}, - "data": {"payloads": [{"metadata":{"encoding":"anNvbg=="},"data":"NQ=="}]} + "side-effect-id": {"payloads": [{"metadata":{"encoding":"anNvbg=="},"data":"Ng=="}]}, + "data": {"payloads": [{"metadata":{"encoding":"anNvbg=="},"data":"Ng=="}]} }, "decisionTaskCompletedEventId": 5 } @@ -99,7 +99,7 @@ "version": -24, "taskId": 6291600, "timerStartedEventAttributes": { - "timerId": "1", + "timerId": "7", "startToFireTimeoutSeconds": 1296000, "decisionTaskCompletedEventId": 5 } @@ -111,7 +111,7 @@ "version": -24, "taskId": 6291601, "activityTaskScheduledEventAttributes": { - "activityId": "2", + "activityId": "8", "activityType": { "name": "uploadHistoryActivity" }, @@ -271,7 +271,7 @@ "version": -24, "taskId": 6291631, "activityTaskScheduledEventAttributes": { - "activityId": "4", + "activityId": "19", "activityType": { "name": "uploadHistoryActivity" }, @@ -455,7 +455,7 @@ "version": -24, "taskId": 6291664, "activityTaskScheduledEventAttributes": { - "activityId": "6", + "activityId": "32", "activityType": { "name": "uploadHistoryActivity" }, @@ -488,7 +488,7 @@ "version": -24, "taskId": 6291665, "activityTaskScheduledEventAttributes": { - "activityId": "7", + "activityId": "33", "activityType": { "name": "uploadHistoryActivity" }, @@ -521,7 +521,7 @@ "version": -24, "taskId": 6291666, "activityTaskScheduledEventAttributes": { - "activityId": "8", + "activityId": "34", "activityType": { "name": "uploadHistoryActivity" }, @@ -755,7 +755,7 @@ "version": -24, "taskId": 6291738, "activityTaskScheduledEventAttributes": { - "activityId": "12", + "activityId": "51", "activityType": { "name": "uploadHistoryActivity" }, @@ -915,7 +915,7 @@ "version": -24, "taskId": 6291767, "activityTaskScheduledEventAttributes": { - "activityId": "14", + "activityId": "62", "activityType": { "name": "uploadHistoryActivity" }, @@ -1075,7 +1075,7 @@ "version": -24, "taskId": 6291796, "activityTaskScheduledEventAttributes": { - "activityId": "16", + "activityId": "73", "activityType": { "name": "uploadHistoryActivity" }, @@ -1235,7 +1235,7 @@ "version": -24, "taskId": 6291856, "activityTaskScheduledEventAttributes": { - "activityId": "18", + "activityId": "84", "activityType": { "name": "uploadHistoryActivity" }, @@ -1395,7 +1395,7 @@ "version": -24, "taskId": 6291885, "activityTaskScheduledEventAttributes": { - "activityId": "20", + "activityId": "95", "activityType": { "name": "uploadHistoryActivity" }, @@ -1555,7 +1555,7 @@ "version": -24, "taskId": 6291914, "activityTaskScheduledEventAttributes": { - "activityId": "22", + "activityId": "106", "activityType": { "name": "uploadHistoryActivity" }, diff --git a/service/worker/archiver/workflow_test.go b/service/worker/archiver/workflow_test.go index f43d2af3c69..ce98c230777 100644 --- a/service/worker/archiver/workflow_test.go +++ b/service/worker/archiver/workflow_test.go @@ -30,11 +30,10 @@ import ( "github.com/stretchr/testify/suite" "github.com/uber-go/tally" "go.temporal.io/temporal/activity" - "go.uber.org/zap" - "go.temporal.io/temporal/testsuite" "go.temporal.io/temporal/worker" "go.temporal.io/temporal/workflow" + "go.uber.org/zap" "github.com/temporalio/temporal/common/log" "github.com/temporalio/temporal/common/log/loggerimpl" @@ -170,6 +169,5 @@ func archivalWorkflowTest(ctx workflow.Context) error { } func (s *workflowSuite) registerWorkflowsForReplayer(env worker.WorkflowReplayer) { - env.RegisterWorkflow(archivalWorkflowTest) env.RegisterWorkflowWithOptions(archivalWorkflow, workflow.RegisterOptions{Name: archivalWorkflowFnName}) } diff --git a/service/worker/parentclosepolicy/client.go b/service/worker/parentclosepolicy/client.go index 46c3ae952ff..4cd8522417d 100644 --- a/service/worker/parentclosepolicy/client.go +++ b/service/worker/parentclosepolicy/client.go @@ -30,6 +30,7 @@ import ( "math/rand" "time" + enumspb "go.temporal.io/temporal-proto/enums/v1" sdkclient "go.temporal.io/temporal/client" "github.com/temporalio/temporal/common/log" @@ -80,7 +81,7 @@ func (c *clientImpl) SendParentClosePolicyRequest(request Request) error { ID: workflowID, TaskQueue: processorTaskQueueName, WorkflowTaskTimeout: time.Minute, - WorkflowIDReusePolicy: sdkclient.WorkflowIDReusePolicyAllowDuplicate, + WorkflowIDReusePolicy: enumspb.WORKFLOW_ID_REUSE_POLICY_ALLOW_DUPLICATE, } signalCtx, cancel := context.WithTimeout(context.Background(), signalTimeout) defer cancel() diff --git a/service/worker/scanner/workflow.go b/service/worker/scanner/workflow.go index a54b95826b2..f57819377b9 100644 --- a/service/worker/scanner/workflow.go +++ b/service/worker/scanner/workflow.go @@ -29,8 +29,9 @@ import ( "time" "go.temporal.io/temporal" + enumspb "go.temporal.io/temporal-proto/enums/v1" "go.temporal.io/temporal/activity" - cclient "go.temporal.io/temporal/client" + "go.temporal.io/temporal/client" "go.temporal.io/temporal/workflow" "github.com/temporalio/temporal/common/log/tag" @@ -81,23 +82,23 @@ var ( HeartbeatTimeout: 5 * time.Minute, RetryPolicy: &activityRetryPolicy, } - tlScannerWFStartOptions = cclient.StartWorkflowOptions{ + tlScannerWFStartOptions = client.StartWorkflowOptions{ ID: tqScannerWFID, TaskQueue: tqScannerTaskQueueName, WorkflowRunTimeout: 5 * 24 * time.Hour, - WorkflowIDReusePolicy: cclient.WorkflowIDReusePolicyAllowDuplicate, + WorkflowIDReusePolicy: enumspb.WORKFLOW_ID_REUSE_POLICY_ALLOW_DUPLICATE, CronSchedule: "0 */12 * * *", } - historyScannerWFStartOptions = cclient.StartWorkflowOptions{ + historyScannerWFStartOptions = client.StartWorkflowOptions{ ID: historyScannerWFID, TaskQueue: historyScannerTaskQueueName, - WorkflowIDReusePolicy: cclient.WorkflowIDReusePolicyAllowDuplicate, + WorkflowIDReusePolicy: enumspb.WORKFLOW_ID_REUSE_POLICY_ALLOW_DUPLICATE, CronSchedule: "0 */12 * * *", } - executionsScannerWFStartOptions = cclient.StartWorkflowOptions{ + executionsScannerWFStartOptions = client.StartWorkflowOptions{ ID: executionsScannerWFID, TaskQueue: executionsScannerTaskQueueName, - WorkflowIDReusePolicy: cclient.WorkflowIDReusePolicyAllowDuplicate, + WorkflowIDReusePolicy: enumspb.WORKFLOW_ID_REUSE_POLICY_ALLOW_DUPLICATE, CronSchedule: "0 */12 * * *", } ) diff --git a/tools/cli/app.go b/tools/cli/app.go index 9c18399232e..e544181bf15 100644 --- a/tools/cli/app.go +++ b/tools/cli/app.go @@ -31,7 +31,7 @@ import ( const ( // Version is the controlled version string. It should be updated every time // before we release a new version. - Version = "0.25.0" + Version = "0.26.0" ) // SetFactory is used to set the ClientFactory global