From 03ac033bef12cd34f309676acb7767d38c5a686c Mon Sep 17 00:00:00 2001 From: Roey Berman Date: Mon, 12 Jan 2026 16:50:31 -0800 Subject: [PATCH 1/3] Nexus caller timeouts --- go.mod | 18 +++++++----- go.sum | 36 ++++++++++------------- temporalcli/commands.worker.deployment.go | 16 +++++----- temporalcli/commands.workflow.go | 8 ++--- temporalcli/commands.workflow_view.go | 4 +++ 5 files changed, 43 insertions(+), 39 deletions(-) diff --git a/go.mod b/go.mod index c27bb75ab..f1bfb5b83 100644 --- a/go.mod +++ b/go.mod @@ -16,8 +16,8 @@ require ( github.com/spf13/pflag v1.0.6 github.com/stretchr/testify v1.10.0 github.com/temporalio/ui-server/v2 v2.39.0 - go.temporal.io/api v1.59.1-0.20251203230651-7773526824c5 - go.temporal.io/sdk v1.36.0 + go.temporal.io/api v1.60.1-0.20260108175916-49710b8392af + go.temporal.io/sdk v1.38.0 go.temporal.io/sdk/contrib/envconfig v0.1.0 go.temporal.io/server v1.29.0-135.0.0.20251210204203-56cbfb9a643c google.golang.org/grpc v1.72.2 @@ -149,13 +149,13 @@ require ( go.uber.org/mock v0.6.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect - golang.org/x/crypto v0.38.0 // indirect + golang.org/x/crypto v0.45.0 // indirect golang.org/x/exp v0.0.0-20250620022241-b7579e27df2b // indirect - golang.org/x/net v0.40.0 // indirect + golang.org/x/net v0.47.0 // indirect golang.org/x/oauth2 v0.30.0 // indirect - golang.org/x/sync v0.16.0 // indirect - golang.org/x/sys v0.37.0 // indirect - golang.org/x/text v0.25.0 // indirect + golang.org/x/sync v0.18.0 // indirect + golang.org/x/sys v0.38.0 // indirect + golang.org/x/text v0.31.0 // indirect golang.org/x/time v0.11.0 // indirect google.golang.org/api v0.228.0 // indirect google.golang.org/genproto v0.0.0-20250324211829-b45e905df463 // indirect @@ -167,3 +167,7 @@ require ( modernc.org/mathutil v1.7.1 // indirect modernc.org/memory v1.11.0 // indirect ) + +replace go.temporal.io/api => ../api-go + +replace go.temporal.io/server => ../temporal diff --git a/go.sum b/go.sum index 6b8443142..d5af270ed 100644 --- a/go.sum +++ b/go.sum @@ -378,14 +378,10 @@ go.opentelemetry.io/otel/trace v1.35.0 h1:dPpEfJu1sDIqruz7BHFG3c7528f6ddfSWfFDVt go.opentelemetry.io/otel/trace v1.35.0/go.mod h1:WUk7DtFp1Aw2MkvqGdwiXYDZZNvA/1J8o6xRXLrIkyc= go.opentelemetry.io/proto/otlp v1.5.0 h1:xJvq7gMzB31/d406fB8U5CBdyQGw4P399D1aQWU/3i4= go.opentelemetry.io/proto/otlp v1.5.0/go.mod h1:keN8WnHxOy8PG0rQZjJJ5A2ebUoafqWp0eVQ4yIXvJ4= -go.temporal.io/api v1.59.1-0.20251203230651-7773526824c5 h1:7lFIrLVM+NPVcqFMrEwv5d8D9meA7n/Xl9GtCl8Gyhc= -go.temporal.io/api v1.59.1-0.20251203230651-7773526824c5/go.mod h1:iaxoP/9OXMJcQkETTECfwYq4cw/bj4nwov8b3ZLVnXM= -go.temporal.io/sdk v1.36.0 h1:WO9zetpybBNK7xsQth4Z+3Zzw1zSaM9MOUGrnnUjZMo= -go.temporal.io/sdk v1.36.0/go.mod h1:8BxGRF0LcQlfQrLLGkgVajbsKUp/PY7280XTdcKc18Y= +go.temporal.io/sdk v1.38.0 h1:4Bok5LEdED7YKpsSjIa3dDqram5VOq+ydBf4pyx0Wo4= +go.temporal.io/sdk v1.38.0/go.mod h1:a+R2Ej28ObvHoILbHaxMyind7M6D+W0L7edt5UJF4SE= go.temporal.io/sdk/contrib/envconfig v0.1.0 h1:s+G/Ujph+Xl2jzLiiIm2T1vuijDkUL4Kse49dgDVGBE= go.temporal.io/sdk/contrib/envconfig v0.1.0/go.mod h1:FQEO3C56h9C7M6sDgSanB8HnBTmopw9qgVx4F1S6pJk= -go.temporal.io/server v1.29.0-135.0.0.20251210204203-56cbfb9a643c h1:UC4KqFNh9Gx5w7asy/qv4CN2HmZBMebG3edO7X7axaY= -go.temporal.io/server v1.29.0-135.0.0.20251210204203-56cbfb9a643c/go.mod h1:82/ESRXiDGHBdEoTGi1ZR2tPMZC1ZNCezOHyxqfkJ+A= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE= @@ -412,8 +408,8 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4= -golang.org/x/crypto v0.38.0 h1:jt+WWG8IZlBnVbomuhg2Mdq0+BBQaHbtqHEFEigjUV8= -golang.org/x/crypto v0.38.0/go.mod h1:MvrbAqul58NNYPKnOra203SB9vpuZW0e+RRZV+Ggqjw= +golang.org/x/crypto v0.45.0 h1:jMBrvKuj23MTlT0bQEOBcAE0mjg8mK9RXFhRH6nyF3Q= +golang.org/x/crypto v0.45.0/go.mod h1:XTGrrkGJve7CYK7J8PEww4aY7gM3qMCElcJQ8n8JdX4= golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -433,8 +429,8 @@ golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.5.1/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= -golang.org/x/mod v0.27.0 h1:kb+q2PyFnEADO2IEF935ehFUXlWiNjJWtRNgBLSfbxQ= -golang.org/x/mod v0.27.0/go.mod h1:rWI627Fq0DEoudcK+MBkNkCe0EetEaDSwJJkCcjpazc= +golang.org/x/mod v0.29.0 h1:HV8lRxZC4l2cr3Zq1LvtOsi/ThTgWnUk/y64QSs8GwA= +golang.org/x/mod v0.29.0/go.mod h1:NyhrlYXJ2H4eJiRy/WDBO6HMqZQ6q9nk4JzS3NuCK+w= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= @@ -446,8 +442,8 @@ golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= -golang.org/x/net v0.40.0 h1:79Xs7wF06Gbdcg4kdCCIQArK11Z1hr5POQ6+fIYHNuY= -golang.org/x/net v0.40.0/go.mod h1:y0hY0exeL2Pku80/zKK7tpntoX23cqL3Oa6njdgRtds= +golang.org/x/net v0.47.0 h1:Mx+4dIFzqraBXUugkia1OOvlD6LemFo1ALMHjrXDOhY= +golang.org/x/net v0.47.0/go.mod h1:/jNxtkgq5yWUGYkaZGqo27cfGZ1c5Nen03aYrrKpVRU= golang.org/x/oauth2 v0.30.0 h1:dnDm7JmhM45NNpd8FDDeLhK6FwqbOf4MLCM9zb1BOHI= golang.org/x/oauth2 v0.30.0/go.mod h1:B++QgG3ZKulg6sRPGD/mqlHQs5rB3Ml9erfeDY7xKlU= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -456,8 +452,8 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.16.0 h1:ycBJEhp9p4vXvUZNszeOq0kGTPghopOL8q0fq3vstxw= -golang.org/x/sync v0.16.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA= +golang.org/x/sync v0.18.0 h1:kr88TuHDroi+UVf+0hZnirlk8o8T+4MrK6mr60WkH/I= +golang.org/x/sync v0.18.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -476,8 +472,8 @@ golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.37.0 h1:fdNQudmxPjkdUTPnLn5mdQv7Zwvbvpaxqs831goi9kQ= -golang.org/x/sys v0.37.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= +golang.org/x/sys v0.38.0 h1:3yZWxaJjBmCWXqhN1qh02AkOnCQ1poK6oF+a7xWL6Gc= +golang.org/x/sys v0.38.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= @@ -490,8 +486,8 @@ golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= -golang.org/x/text v0.25.0 h1:qVyWApTSYLk/drJRO5mDlNYskwQznZmkpV2c8q9zls4= -golang.org/x/text v0.25.0/go.mod h1:WEdwpYrmk1qmdHvhkSTNPm3app7v4rsT8F2UD6+VHIA= +golang.org/x/text v0.31.0 h1:aC8ghyu4JhP8VojJ2lEHBnochRno1sgL6nEi9WGFGMM= +golang.org/x/text v0.31.0/go.mod h1:tKRAlv61yKIjGGHX/4tP1LTbc13YSec1pxVEWXzfoeM= golang.org/x/time v0.11.0 h1:/bpjEDfN9tkoN/ryeYHnv5hcMlc8ncjMcM4XBk5NWV0= golang.org/x/time v0.11.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg= golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -508,8 +504,8 @@ golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4f golang.org/x/tools v0.1.8/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= -golang.org/x/tools v0.36.0 h1:kWS0uv/zsvHEle1LbV5LE8QujrxB3wfQyxHfhOk0Qkg= -golang.org/x/tools v0.36.0/go.mod h1:WBDiHKJK8YgLHlcQPYQzNCkUxUypCaa5ZegCVutKm+s= +golang.org/x/tools v0.38.0 h1:Hx2Xv8hISq8Lm16jvBZ2VQf+RLmbd7wVUsALibYI/IQ= +golang.org/x/tools v0.38.0/go.mod h1:yEsQ/d/YK8cjh0L6rZlY8tgtlKiBNTL14pGDJPJpYQs= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/temporalcli/commands.worker.deployment.go b/temporalcli/commands.worker.deployment.go index 072fd838f..3d184846f 100644 --- a/temporalcli/commands.worker.deployment.go +++ b/temporalcli/commands.worker.deployment.go @@ -93,7 +93,7 @@ func formatVersionSummaries(vss []client.WorkerDeploymentVersionSummary) ([]vers } vsRows = append(vsRows, versionSummariesRowType{ DeploymentName: vs.Version.DeploymentName, - BuildId: vs.Version.BuildId, + BuildId: vs.Version.BuildID, CreateTime: vs.CreateTime, DrainageStatus: drainageStr, }) @@ -108,11 +108,11 @@ func formatRoutingConfig(rc client.WorkerDeploymentRoutingConfig) (formattedRout rvbid := "" if rc.CurrentVersion != nil { cvdn = rc.CurrentVersion.DeploymentName - cvbid = rc.CurrentVersion.BuildId + cvbid = rc.CurrentVersion.BuildID } if rc.RampingVersion != nil { rvdn = rc.RampingVersion.DeploymentName - rvbid = rc.RampingVersion.BuildId + rvbid = rc.RampingVersion.BuildID } return formattedRoutingConfigType{ CurrentVersionDeploymentName: cvdn, @@ -161,11 +161,11 @@ func printWorkerDeploymentInfo(cctx *CommandContext, deploymentInfo client.Worke rampVerBuildId := "" if deploymentInfo.RoutingConfig.CurrentVersion != nil { curVerDepName = deploymentInfo.RoutingConfig.CurrentVersion.DeploymentName - curVerBuildId = deploymentInfo.RoutingConfig.CurrentVersion.BuildId + curVerBuildId = deploymentInfo.RoutingConfig.CurrentVersion.BuildID } if deploymentInfo.RoutingConfig.RampingVersion != nil { rampVerDepName = deploymentInfo.RoutingConfig.RampingVersion.DeploymentName - rampVerBuildId = deploymentInfo.RoutingConfig.RampingVersion.BuildId + rampVerBuildId = deploymentInfo.RoutingConfig.RampingVersion.BuildID } printMe := struct { Name string @@ -261,7 +261,7 @@ func workerDeploymentVersionInfoToRows(deploymentInfo client.WorkerDeploymentVer return formattedWorkerDeploymentVersionInfoType{ DeploymentName: deploymentInfo.Version.DeploymentName, - BuildId: deploymentInfo.Version.BuildId, + BuildId: deploymentInfo.Version.BuildID, CreateTime: deploymentInfo.CreateTime, RoutingChangedTime: deploymentInfo.RoutingChangedTime, CurrentSinceTime: deploymentInfo.CurrentSinceTime, @@ -307,7 +307,7 @@ func printWorkerDeploymentVersionInfo(cctx *CommandContext, deploymentInfo clien Metadata map[string]*common.Payload `cli:",cardOmitEmpty"` }{ DeploymentName: deploymentInfo.Version.DeploymentName, - BuildId: deploymentInfo.Version.BuildId, + BuildId: deploymentInfo.Version.BuildID, CreateTime: deploymentInfo.CreateTime, RoutingChangedTime: deploymentInfo.RoutingChangedTime, CurrentSinceTime: deploymentInfo.CurrentSinceTime, @@ -620,7 +620,7 @@ func (c *TemporalWorkerDeploymentUpdateMetadataVersionCommand) run(cctx *Command dHandle := cl.WorkerDeploymentClient().GetHandle(c.DeploymentName) response, err := dHandle.UpdateVersionMetadata(cctx, client.WorkerDeploymentUpdateVersionMetadataOptions{ Version: worker.WorkerDeploymentVersion{ - BuildId: c.BuildId, + BuildID: c.BuildId, DeploymentName: c.DeploymentName, }, MetadataUpdate: client.WorkerDeploymentMetadataUpdate{ diff --git a/temporalcli/commands.workflow.go b/temporalcli/commands.workflow.go index 6b9b8714b..4daf81b91 100644 --- a/temporalcli/commands.workflow.go +++ b/temporalcli/commands.workflow.go @@ -129,7 +129,7 @@ func (c *TemporalWorkflowUpdateOptionsCommand) run(cctx *CommandContext, args [] Value: &client.PinnedVersioningOverride{ Version: worker.WorkerDeploymentVersion{ DeploymentName: c.VersioningOverrideDeploymentName, - BuildId: c.VersioningOverrideBuildId, + BuildID: c.VersioningOverrideBuildId, }, }, } @@ -698,17 +698,17 @@ func versioningOverrideToProto(versioningOverride client.VersioningOverride) *wo case *client.PinnedVersioningOverride: return &workflowpb.VersioningOverride{ Behavior: enums.VERSIONING_BEHAVIOR_PINNED, - PinnedVersion: fmt.Sprintf("%s.%s", v.Version.DeploymentName, v.Version.BuildId), + PinnedVersion: fmt.Sprintf("%s.%s", v.Version.DeploymentName, v.Version.BuildID), Deployment: &deploymentpb.Deployment{ SeriesName: v.Version.DeploymentName, - BuildId: v.Version.BuildId, + BuildId: v.Version.BuildID, }, Override: &workflowpb.VersioningOverride_Pinned{ Pinned: &workflowpb.VersioningOverride_PinnedOverride{ Behavior: workflowpb.VersioningOverride_PINNED_OVERRIDE_BEHAVIOR_PINNED, Version: &deploymentpb.WorkerDeploymentVersion{ DeploymentName: v.Version.DeploymentName, - BuildId: v.Version.BuildId, + BuildId: v.Version.BuildID, }, }, }, diff --git a/temporalcli/commands.workflow_view.go b/temporalcli/commands.workflow_view.go index 23cdccc94..d3fb50dbd 100644 --- a/temporalcli/commands.workflow_view.go +++ b/temporalcli/commands.workflow_view.go @@ -335,6 +335,8 @@ func (c *TemporalWorkflowDescribeCommand) run(cctx *CommandContext, args []strin State enums.PendingNexusOperationState Attempt int32 ScheduleToCloseTimeout string `cli:",cardOmitEmpty"` + ScheduleToStartTimeout string `cli:",cardOmitEmpty"` + StartToCloseTimeout string `cli:",cardOmitEmpty"` NextAttemptScheduleTime time.Time `cli:",cardOmitEmpty"` LastAttemptCompleteTime time.Time `cli:",cardOmitEmpty"` LastAttemptFailure *failure.Failure `cli:",cardOmitEmpty"` @@ -361,6 +363,8 @@ func (c *TemporalWorkflowDescribeCommand) run(cctx *CommandContext, args []strin ops[i].LastAttemptCompleteTime = timestampToTime(op.LastAttemptCompleteTime) ops[i].NextAttemptScheduleTime = timestampToTime(op.NextAttemptScheduleTime) ops[i].ScheduleToCloseTimeout = formatDuration(op.GetScheduleToCloseTimeout().AsDuration()) + ops[i].ScheduleToStartTimeout = formatDuration(op.GetScheduleToStartTimeout().AsDuration()) + ops[i].StartToCloseTimeout = formatDuration(op.GetStartToCloseTimeout().AsDuration()) ops[i].BlockedReason = op.GetBlockedReason() ops[i].CancelationState = op.GetCancellationInfo().GetState() ops[i].CancelationAttempt = op.GetCancellationInfo().GetAttempt() From 1700875f7d9d7d1b03f9b6f752fa1ce9906ce0c8 Mon Sep 17 00:00:00 2001 From: Roey Berman Date: Tue, 13 Jan 2026 12:44:01 -0800 Subject: [PATCH 2/3] Use merged dependencies --- go.mod | 8 ++------ go.sum | 4 ++++ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index f1bfb5b83..09e1846ba 100644 --- a/go.mod +++ b/go.mod @@ -16,10 +16,10 @@ require ( github.com/spf13/pflag v1.0.6 github.com/stretchr/testify v1.10.0 github.com/temporalio/ui-server/v2 v2.39.0 - go.temporal.io/api v1.60.1-0.20260108175916-49710b8392af + go.temporal.io/api v1.60.1-0.20260113171616-51aa2c291ff8 go.temporal.io/sdk v1.38.0 go.temporal.io/sdk/contrib/envconfig v0.1.0 - go.temporal.io/server v1.29.0-135.0.0.20251210204203-56cbfb9a643c + go.temporal.io/server v1.29.0-135.0.0.20260113195300-8f4d4ba06710 google.golang.org/grpc v1.72.2 google.golang.org/protobuf v1.36.6 gopkg.in/yaml.v3 v3.0.1 @@ -167,7 +167,3 @@ require ( modernc.org/mathutil v1.7.1 // indirect modernc.org/memory v1.11.0 // indirect ) - -replace go.temporal.io/api => ../api-go - -replace go.temporal.io/server => ../temporal diff --git a/go.sum b/go.sum index d5af270ed..f22d2d62d 100644 --- a/go.sum +++ b/go.sum @@ -378,10 +378,14 @@ go.opentelemetry.io/otel/trace v1.35.0 h1:dPpEfJu1sDIqruz7BHFG3c7528f6ddfSWfFDVt go.opentelemetry.io/otel/trace v1.35.0/go.mod h1:WUk7DtFp1Aw2MkvqGdwiXYDZZNvA/1J8o6xRXLrIkyc= go.opentelemetry.io/proto/otlp v1.5.0 h1:xJvq7gMzB31/d406fB8U5CBdyQGw4P399D1aQWU/3i4= go.opentelemetry.io/proto/otlp v1.5.0/go.mod h1:keN8WnHxOy8PG0rQZjJJ5A2ebUoafqWp0eVQ4yIXvJ4= +go.temporal.io/api v1.60.1-0.20260113171616-51aa2c291ff8 h1:Btl9joj1fKCqa3ljjAL2TZt87fzx/EHLtVaStOHtISU= +go.temporal.io/api v1.60.1-0.20260113171616-51aa2c291ff8/go.mod h1:iaxoP/9OXMJcQkETTECfwYq4cw/bj4nwov8b3ZLVnXM= go.temporal.io/sdk v1.38.0 h1:4Bok5LEdED7YKpsSjIa3dDqram5VOq+ydBf4pyx0Wo4= go.temporal.io/sdk v1.38.0/go.mod h1:a+R2Ej28ObvHoILbHaxMyind7M6D+W0L7edt5UJF4SE= go.temporal.io/sdk/contrib/envconfig v0.1.0 h1:s+G/Ujph+Xl2jzLiiIm2T1vuijDkUL4Kse49dgDVGBE= go.temporal.io/sdk/contrib/envconfig v0.1.0/go.mod h1:FQEO3C56h9C7M6sDgSanB8HnBTmopw9qgVx4F1S6pJk= +go.temporal.io/server v1.29.0-135.0.0.20260113195300-8f4d4ba06710 h1:dRc9bccD4UD1yaCF7JEHF/eL/WGVGFuQ6WU7CJy3R/k= +go.temporal.io/server v1.29.0-135.0.0.20260113195300-8f4d4ba06710/go.mod h1:UMJ8tPTjN0/GgaclRZJ9cp0ZIlyEHfCZkssxyZf3/Ng= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE= From e513494d8ea09e0a929d8c5df46eaeddc961c626 Mon Sep 17 00:00:00 2001 From: Roey Berman Date: Tue, 13 Jan 2026 12:58:14 -0800 Subject: [PATCH 3/3] Fix tests --- .../commands.worker.deployment_test.go | 86 +++++++++---------- temporalcli/commands.workflow_test.go | 28 +++--- temporalcli/commands.workflow_view_test.go | 12 +-- 3 files changed, 63 insertions(+), 63 deletions(-) diff --git a/temporalcli/commands.worker.deployment_test.go b/temporalcli/commands.worker.deployment_test.go index f72b8b40a..0b5b7a5e4 100644 --- a/temporalcli/commands.worker.deployment_test.go +++ b/temporalcli/commands.worker.deployment_test.go @@ -69,7 +69,7 @@ func (s *SharedServerSuite) TestDeployment_Set_Current_Version() { buildId := uuid.NewString() version := worker.WorkerDeploymentVersion{ DeploymentName: deploymentName, - BuildId: buildId, + BuildID: buildId, } w := s.DevServer.StartDevWorker(s.Suite.T(), DevWorkerOptions{ Worker: worker.Options{ @@ -95,7 +95,7 @@ func (s *SharedServerSuite) TestDeployment_Set_Current_Version() { res := s.Execute( "worker", "deployment", "describe-version", "--address", s.Address(), - "--deployment-name", version.DeploymentName, "--build-id", version.BuildId, + "--deployment-name", version.DeploymentName, "--build-id", version.BuildID, ) assert.NoError(t, res.Err) }, 30*time.Second, 100*time.Millisecond) @@ -103,7 +103,7 @@ func (s *SharedServerSuite) TestDeployment_Set_Current_Version() { res := s.Execute( "worker", "deployment", "set-current-version", "--address", s.Address(), - "--deployment-name", version.DeploymentName, "--build-id", version.BuildId, + "--deployment-name", version.DeploymentName, "--build-id", version.BuildID, "--yes", ) s.NoError(res.Err) @@ -117,7 +117,7 @@ func (s *SharedServerSuite) TestDeployment_Set_Current_Version() { s.ContainsOnSameLine(res.Stdout.String(), "Name", deploymentName) s.ContainsOnSameLine(res.Stdout.String(), "CurrentVersionDeploymentName", version.DeploymentName) - s.ContainsOnSameLine(res.Stdout.String(), "CurrentVersionBuildID", version.BuildId) + s.ContainsOnSameLine(res.Stdout.String(), "CurrentVersionBuildID", version.BuildID) // json res = s.Execute( @@ -132,13 +132,13 @@ func (s *SharedServerSuite) TestDeployment_Set_Current_Version() { s.NoError(json.Unmarshal(res.Stdout.Bytes(), &jsonOut)) s.Equal(deploymentName, jsonOut.Name) s.Equal(version.DeploymentName, jsonOut.RoutingConfig.CurrentVersionDeploymentName) - s.Equal(version.BuildId, jsonOut.RoutingConfig.CurrentVersionBuildID) + s.Equal(version.BuildID, jsonOut.RoutingConfig.CurrentVersionBuildID) // set metadata res = s.Execute( "worker", "deployment", "update-metadata-version", "--address", s.Address(), - "--deployment-name", version.DeploymentName, "--build-id", version.BuildId, + "--deployment-name", version.DeploymentName, "--build-id", version.BuildID, "--metadata", "bar=1", "--output", "json", ) @@ -155,7 +155,7 @@ func (s *SharedServerSuite) TestDeployment_Set_Current_Version() { res = s.Execute( "worker", "deployment", "update-metadata-version", "--address", s.Address(), - "--deployment-name", version.DeploymentName, "--build-id", version.BuildId, + "--deployment-name", version.DeploymentName, "--build-id", version.BuildID, "--remove-entries", "bar", "--output", "json", ) @@ -164,7 +164,7 @@ func (s *SharedServerSuite) TestDeployment_Set_Current_Version() { res = s.Execute( "worker", "deployment", "describe-version", "--address", s.Address(), - "--deployment-name", version.DeploymentName, "--build-id", version.BuildId, + "--deployment-name", version.DeploymentName, "--build-id", version.BuildID, "--output", "json", ) s.NoError(res.Err) @@ -190,11 +190,11 @@ func (s *SharedServerSuite) TestDeployment_List() { buildId2 := uuid.NewString() version1 := worker.WorkerDeploymentVersion{ DeploymentName: deploymentName1, - BuildId: buildId1, + BuildID: buildId1, } version2 := worker.WorkerDeploymentVersion{ DeploymentName: deploymentName2, - BuildId: buildId2, + BuildID: buildId2, } w1 := s.DevServer.StartDevWorker(s.Suite.T(), DevWorkerOptions{ @@ -233,13 +233,13 @@ func (s *SharedServerSuite) TestDeployment_List() { res := s.Execute( "worker", "deployment", "describe-version", "--address", s.Address(), - "--deployment-name", version1.DeploymentName, "--build-id", version1.BuildId, + "--deployment-name", version1.DeploymentName, "--build-id", version1.BuildID, ) assert.NoError(t, res.Err) res = s.Execute( "worker", "deployment", "describe-version", "--address", s.Address(), - "--deployment-name", version2.DeploymentName, "--build-id", version2.BuildId, + "--deployment-name", version2.DeploymentName, "--build-id", version2.BuildID, ) assert.NoError(t, res.Err) }, 30*time.Second, 100*time.Millisecond) @@ -247,7 +247,7 @@ func (s *SharedServerSuite) TestDeployment_List() { res := s.Execute( "worker", "deployment", "set-current-version", "--address", s.Address(), - "--deployment-name", version1.DeploymentName, "--build-id", version1.BuildId, + "--deployment-name", version1.DeploymentName, "--build-id", version1.BuildID, "--yes", ) s.NoError(res.Err) @@ -255,7 +255,7 @@ func (s *SharedServerSuite) TestDeployment_List() { res = s.Execute( "worker", "deployment", "set-current-version", "--address", s.Address(), - "--deployment-name", version2.DeploymentName, "--build-id", version2.BuildId, + "--deployment-name", version2.DeploymentName, "--build-id", version2.BuildID, "--yes", ) s.NoError(res.Err) @@ -268,8 +268,8 @@ func (s *SharedServerSuite) TestDeployment_List() { s.NoError(res.Err) }, 10*time.Second, 100*time.Millisecond) - s.ContainsOnSameLine(res.Stdout.String(), deploymentName1, version1.BuildId) - s.ContainsOnSameLine(res.Stdout.String(), deploymentName2, version2.BuildId) + s.ContainsOnSameLine(res.Stdout.String(), deploymentName1, version1.BuildID) + s.ContainsOnSameLine(res.Stdout.String(), deploymentName2, version2.BuildID) // json res = s.Execute( @@ -288,10 +288,10 @@ func (s *SharedServerSuite) TestDeployment_List() { s.Equal(2, len(jsonOut)) s.Equal(deploymentName1, jsonOut[0].Name) s.Equal(version1.DeploymentName, jsonOut[0].RoutingConfig.CurrentVersionDeploymentName) - s.Equal(version1.BuildId, jsonOut[0].RoutingConfig.CurrentVersionBuildID) + s.Equal(version1.BuildID, jsonOut[0].RoutingConfig.CurrentVersionBuildID) s.Equal(deploymentName2, jsonOut[1].Name) s.Equal(version2.DeploymentName, jsonOut[1].RoutingConfig.CurrentVersionDeploymentName) - s.Equal(version2.BuildId, jsonOut[1].RoutingConfig.CurrentVersionBuildID) + s.Equal(version2.BuildID, jsonOut[1].RoutingConfig.CurrentVersionBuildID) } func (s *SharedServerSuite) TestDeployment_Describe_Drainage() { @@ -300,11 +300,11 @@ func (s *SharedServerSuite) TestDeployment_Describe_Drainage() { buildId2 := "b" + uuid.NewString() version1 := worker.WorkerDeploymentVersion{ DeploymentName: deploymentName, - BuildId: buildId1, + BuildID: buildId1, } version2 := worker.WorkerDeploymentVersion{ DeploymentName: deploymentName, - BuildId: buildId2, + BuildID: buildId2, } w1 := s.DevServer.StartDevWorker(s.Suite.T(), DevWorkerOptions{ @@ -342,13 +342,13 @@ func (s *SharedServerSuite) TestDeployment_Describe_Drainage() { res := s.Execute( "worker", "deployment", "describe-version", "--address", s.Address(), - "--deployment-name", version1.DeploymentName, "--build-id", version1.BuildId, + "--deployment-name", version1.DeploymentName, "--build-id", version1.BuildID, ) assert.NoError(t, res.Err) res = s.Execute( "worker", "deployment", "describe-version", "--address", s.Address(), - "--deployment-name", version2.DeploymentName, "--build-id", version2.BuildId, + "--deployment-name", version2.DeploymentName, "--build-id", version2.BuildID, ) assert.NoError(t, res.Err) }, 30*time.Second, 100*time.Millisecond) @@ -356,7 +356,7 @@ func (s *SharedServerSuite) TestDeployment_Describe_Drainage() { res := s.Execute( "worker", "deployment", "set-current-version", "--address", s.Address(), - "--deployment-name", version1.DeploymentName, "--build-id", version1.BuildId, + "--deployment-name", version1.DeploymentName, "--build-id", version1.BuildID, "--yes", ) s.NoError(res.Err) @@ -368,13 +368,13 @@ func (s *SharedServerSuite) TestDeployment_Describe_Drainage() { ) s.NoError(res.Err) s.ContainsOnSameLine(res.Stdout.String(), "CurrentVersionDeploymentName", version1.DeploymentName) - s.ContainsOnSameLine(res.Stdout.String(), "CurrentVersionBuildID", version1.BuildId) + s.ContainsOnSameLine(res.Stdout.String(), "CurrentVersionBuildID", version1.BuildID) fmt.Print("hello") res = s.Execute( "worker", "deployment", "set-current-version", "--address", s.Address(), - "--deployment-name", version2.DeploymentName, "--build-id", version2.BuildId, + "--deployment-name", version2.DeploymentName, "--build-id", version2.BuildID, "--yes", ) s.NoError(res.Err) @@ -387,7 +387,7 @@ func (s *SharedServerSuite) TestDeployment_Describe_Drainage() { s.NoError(res.Err) s.ContainsOnSameLine(res.Stdout.String(), "CurrentVersionDeploymentName", version2.DeploymentName) - s.ContainsOnSameLine(res.Stdout.String(), "CurrentVersionBuildID", version2.BuildId) + s.ContainsOnSameLine(res.Stdout.String(), "CurrentVersionBuildID", version2.BuildID) s.ContainsOnSameLine(res.Stdout.String(), version1.DeploymentName, "draining") s.ContainsOnSameLine(res.Stdout.String(), version2.DeploymentName, "unspecified") @@ -409,9 +409,9 @@ func (s *SharedServerSuite) TestDeployment_Describe_Drainage() { s.Equal(2, len(jsonOut.VersionSummaries)) s.Equal("draining", jsonOut.VersionSummaries[0].DrainageStatus) - s.Equal(version1.BuildId, jsonOut.VersionSummaries[0].BuildID) + s.Equal(version1.BuildID, jsonOut.VersionSummaries[0].BuildID) s.Equal("unspecified", jsonOut.VersionSummaries[1].DrainageStatus) - s.Equal(version2.BuildId, jsonOut.VersionSummaries[1].BuildID) + s.Equal(version2.BuildID, jsonOut.VersionSummaries[1].BuildID) } func (s *SharedServerSuite) TestDeployment_Ramping() { @@ -420,11 +420,11 @@ func (s *SharedServerSuite) TestDeployment_Ramping() { buildId2 := "b" + uuid.NewString() version1 := worker.WorkerDeploymentVersion{ DeploymentName: deploymentName, - BuildId: buildId1, + BuildID: buildId1, } version2 := worker.WorkerDeploymentVersion{ DeploymentName: deploymentName, - BuildId: buildId2, + BuildID: buildId2, } w1 := s.DevServer.StartDevWorker(s.Suite.T(), DevWorkerOptions{ @@ -462,13 +462,13 @@ func (s *SharedServerSuite) TestDeployment_Ramping() { res := s.Execute( "worker", "deployment", "describe-version", "--address", s.Address(), - "--deployment-name", version1.DeploymentName, "--build-id", version1.BuildId, + "--deployment-name", version1.DeploymentName, "--build-id", version1.BuildID, ) assert.NoError(t, res.Err) res = s.Execute( "worker", "deployment", "describe-version", "--address", s.Address(), - "--deployment-name", version2.DeploymentName, "--build-id", version2.BuildId, + "--deployment-name", version2.DeploymentName, "--build-id", version2.BuildID, ) assert.NoError(t, res.Err) }, 30*time.Second, 100*time.Millisecond) @@ -476,7 +476,7 @@ func (s *SharedServerSuite) TestDeployment_Ramping() { res := s.Execute( "worker", "deployment", "set-current-version", "--address", s.Address(), - "--deployment-name", version1.DeploymentName, "--build-id", version1.BuildId, + "--deployment-name", version1.DeploymentName, "--build-id", version1.BuildID, "--yes", ) s.NoError(res.Err) @@ -484,7 +484,7 @@ func (s *SharedServerSuite) TestDeployment_Ramping() { res = s.Execute( "worker", "deployment", "set-ramping-version", "--address", s.Address(), - "--deployment-name", version2.DeploymentName, "--build-id", version2.BuildId, + "--deployment-name", version2.DeploymentName, "--build-id", version2.BuildID, "--percentage", "12.5", "--yes", ) @@ -497,16 +497,16 @@ func (s *SharedServerSuite) TestDeployment_Ramping() { ) s.NoError(res.Err) s.ContainsOnSameLine(res.Stdout.String(), "CurrentVersionDeploymentName", version1.DeploymentName) - s.ContainsOnSameLine(res.Stdout.String(), "CurrentVersionBuildID", version1.BuildId) + s.ContainsOnSameLine(res.Stdout.String(), "CurrentVersionBuildID", version1.BuildID) s.ContainsOnSameLine(res.Stdout.String(), "RampingVersionDeploymentName", version2.DeploymentName) - s.ContainsOnSameLine(res.Stdout.String(), "RampingVersionBuildID", version2.BuildId) + s.ContainsOnSameLine(res.Stdout.String(), "RampingVersionBuildID", version2.BuildID) s.ContainsOnSameLine(res.Stdout.String(), "RampingVersionPercentage", "12.5") // setting version2 as current also removes the ramp res = s.Execute( "worker", "deployment", "set-current-version", "--address", s.Address(), - "--deployment-name", version2.DeploymentName, "--build-id", version2.BuildId, + "--deployment-name", version2.DeploymentName, "--build-id", version2.BuildID, "--yes", ) s.NoError(res.Err) @@ -523,13 +523,13 @@ func (s *SharedServerSuite) TestDeployment_Ramping() { s.NoError(json.Unmarshal(res.Stdout.Bytes(), &jsonOut)) s.Equal(deploymentName, jsonOut.Name) s.Empty(jsonOut.RoutingConfig.RampingVersionBuildID) - s.Equal(version2.BuildId, jsonOut.RoutingConfig.CurrentVersionBuildID) + s.Equal(version2.BuildID, jsonOut.RoutingConfig.CurrentVersionBuildID) //same with explicit delete res = s.Execute( "worker", "deployment", "set-ramping-version", "--address", s.Address(), - "--deployment-name", version1.DeploymentName, "--build-id", version1.BuildId, + "--deployment-name", version1.DeploymentName, "--build-id", version1.BuildID, "--percentage", "10.1", "--yes", ) @@ -542,15 +542,15 @@ func (s *SharedServerSuite) TestDeployment_Ramping() { ) s.NoError(res.Err) s.ContainsOnSameLine(res.Stdout.String(), "CurrentVersionDeploymentName", version2.DeploymentName) - s.ContainsOnSameLine(res.Stdout.String(), "CurrentVersionBuildID", version2.BuildId) + s.ContainsOnSameLine(res.Stdout.String(), "CurrentVersionBuildID", version2.BuildID) s.ContainsOnSameLine(res.Stdout.String(), "RampingVersionDeploymentName", version1.DeploymentName) - s.ContainsOnSameLine(res.Stdout.String(), "RampingVersionBuildID", version1.BuildId) + s.ContainsOnSameLine(res.Stdout.String(), "RampingVersionBuildID", version1.BuildID) s.ContainsOnSameLine(res.Stdout.String(), "RampingVersionPercentage", "10.1") res = s.Execute( "worker", "deployment", "set-ramping-version", "--address", s.Address(), - "--deployment-name", version1.DeploymentName, "--build-id", version1.BuildId, + "--deployment-name", version1.DeploymentName, "--build-id", version1.BuildID, "--delete", "--yes", ) @@ -567,5 +567,5 @@ func (s *SharedServerSuite) TestDeployment_Ramping() { s.NoError(json.Unmarshal(res.Stdout.Bytes(), &jsonOut)) s.Equal(deploymentName, jsonOut.Name) s.Equal(float32(0), jsonOut.RoutingConfig.RampingVersionPercentage) - s.Equal(version2.BuildId, jsonOut.RoutingConfig.CurrentVersionBuildID) + s.Equal(version2.BuildID, jsonOut.RoutingConfig.CurrentVersionBuildID) } diff --git a/temporalcli/commands.workflow_test.go b/temporalcli/commands.workflow_test.go index 775b7000e..91024ed66 100644 --- a/temporalcli/commands.workflow_test.go +++ b/temporalcli/commands.workflow_test.go @@ -474,11 +474,11 @@ func (s *SharedServerSuite) TestWorkflow_Batch_Update_Options_Versioning_Overrid deploymentName := uuid.NewString() version1 := worker.WorkerDeploymentVersion{ DeploymentName: deploymentName, - BuildId: buildId1, + BuildID: buildId1, } version2 := worker.WorkerDeploymentVersion{ DeploymentName: deploymentName, - BuildId: buildId2, + BuildID: buildId2, } // Workflow that waits to be canceled. waitingWorkflow := func(ctx workflow.Context) error { @@ -511,7 +511,7 @@ func (s *SharedServerSuite) TestWorkflow_Batch_Update_Options_Versioning_Overrid "worker", "deployment", "describe-version", "--address", s.Address(), "--deployment-name", version1.DeploymentName, - "--build-id", version1.BuildId, + "--build-id", version1.BuildID, ) assert.NoError(t, res.Err) }, 30*time.Second, 100*time.Millisecond) @@ -520,7 +520,7 @@ func (s *SharedServerSuite) TestWorkflow_Batch_Update_Options_Versioning_Overrid "worker", "deployment", "set-current-version", "--address", s.Address(), "--deployment-name", version1.DeploymentName, - "--build-id", version1.BuildId, + "--build-id", version1.BuildID, "--yes", ) s.NoError(res.Err) @@ -551,7 +551,7 @@ func (s *SharedServerSuite) TestWorkflow_Batch_Update_Options_Versioning_Overrid ) assert.NoError(t, res.Err) assert.Contains(t, res.Stdout.String(), version1.DeploymentName) - assert.Contains(t, res.Stdout.String(), version1.BuildId) + assert.Contains(t, res.Stdout.String(), version1.BuildID) assert.Contains(t, res.Stdout.String(), "Pinned") } }, 30*time.Second, 100*time.Millisecond) @@ -572,7 +572,7 @@ func (s *SharedServerSuite) TestWorkflow_Batch_Update_Options_Versioning_Overrid "--query", "CustomKeywordField = '"+searchAttr+"'", "--versioning-override-behavior", "pinned", "--versioning-override-deployment-name", version2.DeploymentName, - "--versioning-override-build-id", version2.BuildId, + "--versioning-override-build-id", version2.BuildID, ) s.NoError(res.Err) time.Sleep(10 * time.Second) @@ -602,7 +602,7 @@ func (s *SharedServerSuite) TestWorkflow_Batch_Update_Options_Versioning_Overrid require.NotNil(t, versioningInfo.VersioningOverride) asPinned := versioningInfo.VersioningOverride.Override.(*workflowpb.VersioningOverride_Pinned) require.Equal(t, version2.DeploymentName, asPinned.Pinned.Version.DeploymentName) - require.Equal(t, version2.BuildId, asPinned.Pinned.Version.BuildId) + require.Equal(t, version2.BuildID, asPinned.Pinned.Version.BuildId) require.Equal(t, enums.VERSIONING_BEHAVIOR_PINNED, versioningInfo.Behavior) } }, 10*time.Second, 100*time.Millisecond) @@ -615,11 +615,11 @@ func (s *SharedServerSuite) TestWorkflow_Update_Options_Versioning_Override() { deploymentName := uuid.NewString() version1 := worker.WorkerDeploymentVersion{ DeploymentName: deploymentName, - BuildId: buildId1, + BuildID: buildId1, } version2 := worker.WorkerDeploymentVersion{ DeploymentName: deploymentName, - BuildId: buildId2, + BuildID: buildId2, } // Workflow that waits to be canceled. @@ -653,7 +653,7 @@ func (s *SharedServerSuite) TestWorkflow_Update_Options_Versioning_Override() { "worker", "deployment", "describe-version", "--address", s.Address(), "--deployment-name", version1.DeploymentName, - "--build-id", version1.BuildId, + "--build-id", version1.BuildID, ) assert.NoError(t, res.Err) }, 30*time.Second, 100*time.Millisecond) @@ -662,7 +662,7 @@ func (s *SharedServerSuite) TestWorkflow_Update_Options_Versioning_Override() { "worker", "deployment", "set-current-version", "--address", s.Address(), "--deployment-name", version1.DeploymentName, - "--build-id", version1.BuildId, + "--build-id", version1.BuildID, "--yes", ) s.NoError(res.Err) @@ -683,7 +683,7 @@ func (s *SharedServerSuite) TestWorkflow_Update_Options_Versioning_Override() { ) assert.NoError(t, res.Err) assert.Contains(t, res.Stdout.String(), version1.DeploymentName) - assert.Contains(t, res.Stdout.String(), version1.BuildId) + assert.Contains(t, res.Stdout.String(), version1.BuildID) assert.Contains(t, res.Stdout.String(), "Pinned") }, 30*time.Second, 100*time.Millisecond) @@ -693,7 +693,7 @@ func (s *SharedServerSuite) TestWorkflow_Update_Options_Versioning_Override() { "-w", run.GetID(), "--versioning-override-behavior", "pinned", "--versioning-override-deployment-name", version2.DeploymentName, - "--versioning-override-build-id", version2.BuildId, + "--versioning-override-build-id", version2.BuildID, ) s.NoError(res.Err) @@ -706,7 +706,7 @@ func (s *SharedServerSuite) TestWorkflow_Update_Options_Versioning_Override() { s.ContainsOnSameLine(res.Stdout.String(), "OverrideBehavior", "Pinned") s.ContainsOnSameLine(res.Stdout.String(), "OverridePinnedVersionDeploymentName", version2.DeploymentName) - s.ContainsOnSameLine(res.Stdout.String(), "OverridePinnedVersionBuildId", version2.BuildId) + s.ContainsOnSameLine(res.Stdout.String(), "OverridePinnedVersionBuildId", version2.BuildID) // Using only build-id res = s.Execute( diff --git a/temporalcli/commands.workflow_view_test.go b/temporalcli/commands.workflow_view_test.go index 1e9150755..3ac697209 100644 --- a/temporalcli/commands.workflow_view_test.go +++ b/temporalcli/commands.workflow_view_test.go @@ -560,7 +560,7 @@ func (s *SharedServerSuite) TestWorkflow_Describe_Deployment() { } version := worker.WorkerDeploymentVersion{ DeploymentName: deploymentName, - BuildId: buildId, + BuildID: buildId, } w := s.DevServer.StartDevWorker(s.Suite.T(), DevWorkerOptions{ Worker: worker.Options{ @@ -588,7 +588,7 @@ func (s *SharedServerSuite) TestWorkflow_Describe_Deployment() { "worker", "deployment", "describe-version", "--address", s.Address(), "--deployment-name", version.DeploymentName, - "--build-id", version.BuildId, + "--build-id", version.BuildID, ) assert.NoError(t, res.Err) }, 30*time.Second, 100*time.Millisecond) @@ -597,7 +597,7 @@ func (s *SharedServerSuite) TestWorkflow_Describe_Deployment() { "worker", "deployment", "set-current-version", "--address", s.Address(), "--deployment-name", version.DeploymentName, - "--build-id", version.BuildId, + "--build-id", version.BuildID, "--yes", ) s.NoError(res.Err) @@ -618,14 +618,14 @@ func (s *SharedServerSuite) TestWorkflow_Describe_Deployment() { ) assert.NoError(t, res.Err) assert.Contains(t, res.Stdout.String(), version.DeploymentName) - assert.Contains(t, res.Stdout.String(), version.BuildId) + assert.Contains(t, res.Stdout.String(), version.BuildID) assert.Contains(t, res.Stdout.String(), "Pinned") }, 30*time.Second, 100*time.Millisecond) out := res.Stdout.String() s.ContainsOnSameLine(out, "Behavior", "Pinned") s.ContainsOnSameLine(out, "DeploymentName", version.DeploymentName) - s.ContainsOnSameLine(out, "BuildId", version.BuildId) + s.ContainsOnSameLine(out, "BuildId", version.BuildID) // json res = s.Execute( @@ -640,7 +640,7 @@ func (s *SharedServerSuite) TestWorkflow_Describe_Deployment() { s.NoError(temporalcli.UnmarshalProtoJSONWithOptions(res.Stdout.Bytes(), &jsonResp, true)) versioningInfo := jsonResp.WorkflowExecutionInfo.VersioningInfo s.Equal("Pinned", versioningInfo.Behavior.String()) - s.Equal(version.BuildId, versioningInfo.DeploymentVersion.BuildId) + s.Equal(version.BuildID, versioningInfo.DeploymentVersion.BuildId) s.Equal(version.DeploymentName, versioningInfo.DeploymentVersion.DeploymentName) s.Nil(versioningInfo.VersioningOverride) }