From 481362ef856df2e00b484cc6f789b6a4fc35beda Mon Sep 17 00:00:00 2001 From: Samantha Coyle Date: Thu, 9 Apr 2026 14:45:08 -0500 Subject: [PATCH 1/5] fix: rename with proto changes Signed-off-by: Samantha Coyle --- go.mod | 24 +++++++------ go.sum | 40 +++++++++++----------- pkg/workflow/history.go | 76 ++++++++++++++++------------------------- 3 files changed, 62 insertions(+), 78 deletions(-) diff --git a/go.mod b/go.mod index e74e80be7..df8f37f3a 100644 --- a/go.mod +++ b/go.mod @@ -1,17 +1,17 @@ module github.com/dapr/cli -go 1.26.0 +go 1.26.2 require ( github.com/Masterminds/semver v1.5.0 github.com/Masterminds/semver/v3 v3.3.0 github.com/Pallinder/sillyname-go v0.0.0-20130730142914-97aeae9e6ba1 github.com/briandowns/spinner v1.19.0 - github.com/dapr/dapr v1.17.0-rc.8 - github.com/dapr/durabletask-go v0.11.0 + github.com/dapr/dapr v1.17.0-rc.1.0.20260409185128-2e4aff616422 + github.com/dapr/durabletask-go v0.11.4-0.20260406161632-36d7b5486fa8 github.com/dapr/go-sdk v1.13.0 - github.com/dapr/kit v0.16.2-0.20251124175541-3ac186dff64d - github.com/diagridio/go-etcd-cron v0.12.3 + github.com/dapr/kit v0.17.1-0.20260402173438-be272d92042b + github.com/diagridio/go-etcd-cron v0.12.4 github.com/docker/docker v28.5.2+incompatible github.com/evanphx/json-patch/v5 v5.9.0 github.com/fatih/color v1.17.0 @@ -90,9 +90,9 @@ require ( github.com/coreos/go-semver v0.3.1 // indirect github.com/coreos/go-systemd/v22 v22.5.0 // indirect github.com/cyphar/filepath-securejoin v0.6.1 // indirect - github.com/dapr/components-contrib v1.16.2-0.20260212154145-4a37800d3727 // indirect + github.com/dapr/components-contrib v1.17.3 // indirect github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect - github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect + github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0 // indirect github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect github.com/distribution/reference v0.6.0 // indirect github.com/dlclark/regexp2 v1.11.0 // indirect @@ -121,7 +121,7 @@ require ( github.com/go-openapi/jsonreference v0.21.0 // indirect github.com/go-openapi/swag v0.23.0 // indirect github.com/gobwas/glob v0.2.3 // indirect - github.com/goccy/go-json v0.10.2 // indirect + github.com/goccy/go-json v0.10.3 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 // indirect github.com/golang-sql/sqlexp v0.1.0 // indirect @@ -156,11 +156,11 @@ require ( github.com/klauspost/compress v1.18.3 // indirect github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 // indirect github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 // indirect - github.com/lestrrat-go/blackmagic v1.0.2 // indirect + github.com/lestrrat-go/blackmagic v1.0.3 // indirect github.com/lestrrat-go/httpcc v1.0.1 // indirect - github.com/lestrrat-go/httprc v1.0.5 // indirect + github.com/lestrrat-go/httprc v1.0.6 // indirect github.com/lestrrat-go/iter v1.0.2 // indirect - github.com/lestrrat-go/jwx/v2 v2.0.21 // indirect + github.com/lestrrat-go/jwx/v2 v2.1.6 // indirect github.com/lestrrat-go/option v1.0.1 // indirect github.com/lib/pq v1.10.9 // indirect github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect @@ -270,3 +270,5 @@ require ( sigs.k8s.io/randfill v1.0.0 // indirect sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect ) + +// replace github.com/dapr/dapr => ../dapr diff --git a/go.sum b/go.sum index b0fd4bb41..f93eae8fc 100644 --- a/go.sum +++ b/go.sum @@ -158,26 +158,26 @@ github.com/creack/pty v1.1.18 h1:n56/Zwd5o6whRC5PMGretI4IdRLlmBXYNjScPaBgsbY= github.com/creack/pty v1.1.18/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4= github.com/cyphar/filepath-securejoin v0.6.1 h1:5CeZ1jPXEiYt3+Z6zqprSAgSWiggmpVyciv8syjIpVE= github.com/cyphar/filepath-securejoin v0.6.1/go.mod h1:A8hd4EnAeyujCJRrICiOWqjS1AX0a9kM5XL+NwKoYSc= -github.com/dapr/components-contrib v1.16.2-0.20260212154145-4a37800d3727 h1:qSvkGkWPd+4bIEpVoAwxNGh76UlS5/cd1lE6FjzUJtA= -github.com/dapr/components-contrib v1.16.2-0.20260212154145-4a37800d3727/go.mod h1:CrBOZVPMKdnblS9AjHGw02LGr9JVlNbgqiISwQeGVW8= -github.com/dapr/dapr v1.17.0-rc.8 h1:CZTPQRwX7sO9H4wKrVnnV6w1foKWLP89wtAJY/bL5KQ= -github.com/dapr/dapr v1.17.0-rc.8/go.mod h1:GZq8BjQaX3BbMmZET4HDe6Rrv58yC1pHNVQod3bIAVk= -github.com/dapr/durabletask-go v0.11.0 h1:e9Ns/3a2b6JDKGuvksvx6gCHn7rd+nwZZyAXbg5Ley4= -github.com/dapr/durabletask-go v0.11.0/go.mod h1:0Ts4rXp74JyG19gDWPcwNo5V6NBZzhARzHF5XynmA7Q= +github.com/dapr/components-contrib v1.17.3 h1:lhSvLZ1nGGkmlRKCpzgNEsnNXqOWjFlhAtp1Rjxp8HU= +github.com/dapr/components-contrib v1.17.3/go.mod h1:lVPRj9ywzkUWoKXxRTAJbvS+Vg8A882av/nynGstNE4= +github.com/dapr/dapr v1.17.0-rc.1.0.20260409185128-2e4aff616422 h1:gSMftYDUZ0/q/kD/8y3vm4XUdneT/ptdj1Ow9qL0qr0= +github.com/dapr/dapr v1.17.0-rc.1.0.20260409185128-2e4aff616422/go.mod h1:FDERusHLXTmlIxUN1bRn4E8gnVGuYfz9ZgXRnOawufg= +github.com/dapr/durabletask-go v0.11.4-0.20260406161632-36d7b5486fa8 h1:5qIIrZWhYaaXycT04Mjy3B0QajiSE8gPoEEbQQjIGuY= +github.com/dapr/durabletask-go v0.11.4-0.20260406161632-36d7b5486fa8/go.mod h1:omLTzNvLQvpemgQYpKpfQGLMLVzDyUxBePRT/UlwqYI= github.com/dapr/go-sdk v1.13.0 h1:Qw2BmUonClQ9yK/rrEEaFL1PyDgq616RrvYj0CT67Lk= github.com/dapr/go-sdk v1.13.0/go.mod h1:RsffVNZitDApmQqoS68tNKGMXDZUjTviAbKZupJSzts= -github.com/dapr/kit v0.16.2-0.20251124175541-3ac186dff64d h1:csljij9d1IO6u9nqbg+TuSRmTZ+OXT8G49yh6zie1yI= -github.com/dapr/kit v0.16.2-0.20251124175541-3ac186dff64d/go.mod h1:40ZWs5P6xfYf7O59XgwqZkIyDldTIXlhTQhGop8QoSM= +github.com/dapr/kit v0.17.1-0.20260402173438-be272d92042b h1:hXbRlNKvmMGbiMSRy3MX04kH5OiMgH82PRuLN7adtwE= +github.com/dapr/kit v0.17.1-0.20260402173438-be272d92042b/go.mod h1:2v02LZdXzPmOadxoT6EMEt0bsEYe6h1fn2ndYWmylCg= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 h1:8UrgZ3GkP4i/CLijOJx79Yu+etlyjdBU4sfcs2WYQMs= -github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0/go.mod h1:v57UDF4pDQJcEfFUCRop3lJL149eHGSe9Jvczhzjo/0= +github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0 h1:NMZiJj8QnKe1LgsbDayM4UoHwbvwDRwnI3hwNaAHRnc= +github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0/go.mod h1:ZXNYxsqcloTdSy/rNShjYzMhyjf0LaoftYK0p+A3h40= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc= -github.com/diagridio/go-etcd-cron v0.12.3 h1:KfA//9LcktVeFFHSVv1MZ+Ui5U0fIAPFq1db7mzKPw4= -github.com/diagridio/go-etcd-cron v0.12.3/go.mod h1:XpjpGLT4WzS/eE+20h4aUl2yFtudShbrKK7cPQMtMJ0= +github.com/diagridio/go-etcd-cron v0.12.4 h1:pc0Jk0M5MjrQ7uGydYuX93dKzWfulInA8XAh+i7GQFI= +github.com/diagridio/go-etcd-cron v0.12.4/go.mod h1:XpjpGLT4WzS/eE+20h4aUl2yFtudShbrKK7cPQMtMJ0= github.com/distribution/distribution/v3 v3.0.0 h1:q4R8wemdRQDClzoNNStftB2ZAfqOiN6UX90KJc4HjyM= github.com/distribution/distribution/v3 v3.0.0/go.mod h1:tRNuFoZsUdyRVegq8xGNeds4KLjwLCRin/tTo6i1DhU= github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk= @@ -276,8 +276,8 @@ github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y= github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8= github.com/gocarina/gocsv v0.0.0-20220927221512-ad3251f9fa25 h1:wxgEEZvsnOTrDO2npSSKUMDx5IykfoGmro+/Vjc1BQ8= github.com/gocarina/gocsv v0.0.0-20220927221512-ad3251f9fa25/go.mod h1:5YoVOkjYAQumqlV356Hj3xeYh4BdZuLE0/nRkf2NKkI= -github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU= -github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= +github.com/goccy/go-json v0.10.3 h1:KZ5WoDbxAIgm2HNbYckL0se1fHD6rz5j4ywS6ebzDqA= +github.com/goccy/go-json v0.10.3/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= @@ -455,16 +455,16 @@ github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 h1:SOEGU9fKiNWd/HOJuq github.com/lann/builder v0.0.0-20180802200727-47ae307949d0/go.mod h1:dXGbAdH5GtBTC4WfIxhKZfyBF/HBFgRZSWwZ9g/He9o= github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 h1:P6pPBnrTSX3DEVR4fDembhRWSsG5rVo6hYhAB/ADZrk= github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0/go.mod h1:vmVJ0l/dxyfGW6FmdpVm2joNMFikkuWg0EoCKLGUMNw= -github.com/lestrrat-go/blackmagic v1.0.2 h1:Cg2gVSc9h7sz9NOByczrbUvLopQmXrfFx//N+AkAr5k= -github.com/lestrrat-go/blackmagic v1.0.2/go.mod h1:UrEqBzIR2U6CnzVyUtfM6oZNMt/7O7Vohk2J0OGSAtU= +github.com/lestrrat-go/blackmagic v1.0.3 h1:94HXkVLxkZO9vJI/w2u1T0DAoprShFd13xtnSINtDWs= +github.com/lestrrat-go/blackmagic v1.0.3/go.mod h1:6AWFyKNNj0zEXQYfTMPfZrAXUWUfTIZ5ECEUEJaijtw= github.com/lestrrat-go/httpcc v1.0.1 h1:ydWCStUeJLkpYyjLDHihupbn2tYmZ7m22BGkcvZZrIE= github.com/lestrrat-go/httpcc v1.0.1/go.mod h1:qiltp3Mt56+55GPVCbTdM9MlqhvzyuL6W/NMDA8vA5E= -github.com/lestrrat-go/httprc v1.0.5 h1:bsTfiH8xaKOJPrg1R+E3iE/AWZr/x0Phj9PBTG/OLUk= -github.com/lestrrat-go/httprc v1.0.5/go.mod h1:mwwz3JMTPBjHUkkDv/IGJ39aALInZLrhBp0X7KGUZlo= +github.com/lestrrat-go/httprc v1.0.6 h1:qgmgIRhpvBqexMJjA/PmwSvhNk679oqD1RbovdCGW8k= +github.com/lestrrat-go/httprc v1.0.6/go.mod h1:mwwz3JMTPBjHUkkDv/IGJ39aALInZLrhBp0X7KGUZlo= github.com/lestrrat-go/iter v1.0.2 h1:gMXo1q4c2pHmC3dn8LzRhJfP1ceCbgSiT9lUydIzltI= github.com/lestrrat-go/iter v1.0.2/go.mod h1:Momfcq3AnRlRjI5b5O8/G5/BvpzrhoFTZcn06fEOPt4= -github.com/lestrrat-go/jwx/v2 v2.0.21 h1:jAPKupy4uHgrHFEdjVjNkUgoBKtVDgrQPB/h55FHrR0= -github.com/lestrrat-go/jwx/v2 v2.0.21/go.mod h1:09mLW8zto6bWL9GbwnqAli+ArLf+5M33QLQPDggkUWM= +github.com/lestrrat-go/jwx/v2 v2.1.6 h1:hxM1gfDILk/l5ylers6BX/Eq1m/pnxe9NBwW6lVfecA= +github.com/lestrrat-go/jwx/v2 v2.1.6/go.mod h1:Y722kU5r/8mV7fYDifjug0r8FK8mZdw0K0GpJw/l8pU= github.com/lestrrat-go/option v1.0.1 h1:oAzP2fvZGQKWkvHa1/SAcFolBEca1oN+mQ7eooNBEYU= github.com/lestrrat-go/option v1.0.1/go.mod h1:5ZHFbivi4xwXxhxY9XHDe2FHo6/Z7WWmtT7T5nBBp3I= github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw= diff --git a/pkg/workflow/history.go b/pkg/workflow/history.go index a19ec7323..48252f210 100644 --- a/pkg/workflow/history.go +++ b/pkg/workflow/history.go @@ -154,9 +154,9 @@ func HistoryWide(ctx context.Context, opts HistoryOptions) ([]*HistoryOutputWide switch t := ev.GetEventType().(type) { case *protos.HistoryEvent_ExecutionStarted: - if t.ExecutionStarted.OrchestrationInstance != nil && - t.ExecutionStarted.OrchestrationInstance.ExecutionId != nil { - execID := t.ExecutionStarted.OrchestrationInstance.ExecutionId.Value + if t.ExecutionStarted.WorkflowInstance != nil && + t.ExecutionStarted.WorkflowInstance.ExecutionId != nil { + execID := t.ExecutionStarted.WorkflowInstance.ExecutionId.Value row.ExecutionID = &execID } if t.ExecutionStarted.Input != nil { @@ -188,9 +188,9 @@ func HistoryWide(ctx context.Context, opts HistoryOptions) ([]*HistoryOutputWide if t.TaskCompleted.Result != nil { row.addAttr("output", trim(t.TaskCompleted.Result, 120)) } - case *protos.HistoryEvent_OrchestratorStarted: - if t.OrchestratorStarted.Version != nil { - version := t.OrchestratorStarted.GetVersion() + case *protos.HistoryEvent_WorkflowStarted: + if t.WorkflowStarted.Version != nil { + version := t.WorkflowStarted.GetVersion() if version.Name != nil { row.addAttr("versionName", *version.Name) } @@ -198,13 +198,13 @@ func HistoryWide(ctx context.Context, opts HistoryOptions) ([]*HistoryOutputWide row.addAttr("versionPatches", strings.Join(version.Patches, ",")) } } - case *protos.HistoryEvent_SubOrchestrationInstanceCreated: - if t.SubOrchestrationInstanceCreated.Input != nil { - row.addAttr("input", trim(t.SubOrchestrationInstanceCreated.Input, 120)) + case *protos.HistoryEvent_ChildWorkflowInstanceCreated: + if t.ChildWorkflowInstanceCreated.Input != nil { + row.addAttr("input", trim(t.ChildWorkflowInstanceCreated.Input, 120)) } - case *protos.HistoryEvent_SubOrchestrationInstanceCompleted: - if t.SubOrchestrationInstanceCompleted.Result != nil { - row.addAttr("output", trim(t.SubOrchestrationInstanceCompleted.Result, 120)) + case *protos.HistoryEvent_ChildWorkflowInstanceCompleted: + if t.ChildWorkflowInstanceCompleted.Result != nil { + row.addAttr("output", trim(t.ChildWorkflowInstanceCompleted.Result, 120)) } case *protos.HistoryEvent_TaskFailed: row.addAttr("scheduledId", fmt.Sprintf("%d", t.TaskFailed.TaskScheduledId)) @@ -278,28 +278,24 @@ func eventTypeName(h *protos.HistoryEvent) string { return "TaskCompleted" case *protos.HistoryEvent_TaskFailed: return "TaskFailed" - case *protos.HistoryEvent_SubOrchestrationInstanceCreated: - return "SubOrchCreated" - case *protos.HistoryEvent_SubOrchestrationInstanceCompleted: - return "SubOrchCompleted" - case *protos.HistoryEvent_SubOrchestrationInstanceFailed: - return "SubOrchFailed" + case *protos.HistoryEvent_ChildWorkflowInstanceCreated: + return "ChildWorkflowCreated" + case *protos.HistoryEvent_ChildWorkflowInstanceCompleted: + return "ChildWorkflowCompleted" + case *protos.HistoryEvent_ChildWorkflowInstanceFailed: + return "ChildWorkflowFailed" case *protos.HistoryEvent_TimerCreated: return "TimerCreated" case *protos.HistoryEvent_TimerFired: return "TimerFired" - case *protos.HistoryEvent_OrchestratorStarted: - return "OrchestratorStarted" - case *protos.HistoryEvent_OrchestratorCompleted: - return "OrchestratorCompleted" + case *protos.HistoryEvent_WorkflowStarted: + return "WorkflowStarted" + case *protos.HistoryEvent_WorkflowCompleted: + return "WorkflowCompleted" case *protos.HistoryEvent_EventSent: return "EventSent" case *protos.HistoryEvent_EventRaised: return "EventRaised" - case *protos.HistoryEvent_GenericEvent: - return "GenericEvent" - case *protos.HistoryEvent_HistoryState: - return "HistoryState" case *protos.HistoryEvent_ContinueAsNew: return "ContinueAsNew" case *protos.HistoryEvent_ExecutionSuspended: @@ -308,20 +304,6 @@ func eventTypeName(h *protos.HistoryEvent) string { return "ExecutionResumed" case *protos.HistoryEvent_ExecutionStalled: return "ExecutionStalled" - case *protos.HistoryEvent_EntityOperationSignaled: - return "EntitySignaled" - case *protos.HistoryEvent_EntityOperationCalled: - return "EntityCalled" - case *protos.HistoryEvent_EntityOperationCompleted: - return "EntityCompleted" - case *protos.HistoryEvent_EntityOperationFailed: - return "EntityFailed" - case *protos.HistoryEvent_EntityLockRequested: - return "EntityLockRequested" - case *protos.HistoryEvent_EntityLockGranted: - return "EntityLockGranted" - case *protos.HistoryEvent_EntityUnlockSent: - return "EntityUnlockSent" default: return "Unknown" } @@ -335,8 +317,8 @@ func deriveName(h *protos.HistoryEvent) *string { return nil case *protos.HistoryEvent_TaskFailed: return nil - case *protos.HistoryEvent_SubOrchestrationInstanceCreated: - return ptr.Of(t.SubOrchestrationInstanceCreated.Name) + case *protos.HistoryEvent_ChildWorkflowInstanceCreated: + return ptr.Of(t.ChildWorkflowInstanceCreated.Name) case *protos.HistoryEvent_TimerCreated: if t.TimerCreated.Name != nil { return ptr.Of(*t.TimerCreated.Name) @@ -356,7 +338,7 @@ func deriveStatus(h *protos.HistoryEvent) string { case *protos.HistoryEvent_TaskFailed: return "FAILED" case *protos.HistoryEvent_ExecutionCompleted: - return (workflow.WorkflowMetadata{RuntimeStatus: t.ExecutionCompleted.OrchestrationStatus}).String() + return (workflow.WorkflowMetadata{RuntimeStatus: t.ExecutionCompleted.WorkflowStatus}).String() case *protos.HistoryEvent_ExecutionTerminated: return "TERMINATED" case *protos.HistoryEvent_ExecutionSuspended: @@ -399,13 +381,13 @@ func deriveDetails(first *protos.HistoryEvent, h *protos.HistoryEvent) *string { return ptr.Of(fmt.Sprintf("eventId=%d", t.TaskCompleted.TaskScheduledId)) case *protos.HistoryEvent_ExecutionCompleted: return ptr.Of(fmt.Sprintf("execDuration=%s", utils.HumanizeDuration(h.GetTimestamp().AsTime().Sub(first.GetTimestamp().AsTime())))) - case *protos.HistoryEvent_SubOrchestrationInstanceCreated: - if in := t.SubOrchestrationInstanceCreated.RerunParentInstanceInfo; in != nil { + case *protos.HistoryEvent_ChildWorkflowInstanceCreated: + if in := t.ChildWorkflowInstanceCreated.RerunParentInstanceInfo; in != nil { return ptr.Of(fmt.Sprintf("rerunParent=%s", in.InstanceID)) } return nil - case *protos.HistoryEvent_SubOrchestrationInstanceCompleted: - return ptr.Of(fmt.Sprintf("eventId=%d", t.SubOrchestrationInstanceCompleted.GetTaskScheduledId())) + case *protos.HistoryEvent_ChildWorkflowInstanceCompleted: + return ptr.Of(fmt.Sprintf("eventId=%d", t.ChildWorkflowInstanceCompleted.GetTaskScheduledId())) default: return nil } From 02de4915d6dffed3a1cf594c7c010e27b6da7339 Mon Sep 17 00:00:00 2001 From: Samantha Coyle Date: Fri, 10 Apr 2026 11:06:13 -0500 Subject: [PATCH 2/5] fix: address copilot feedback Signed-off-by: Samantha Coyle --- pkg/workflow/history.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/workflow/history.go b/pkg/workflow/history.go index 48252f210..dba53cf34 100644 --- a/pkg/workflow/history.go +++ b/pkg/workflow/history.go @@ -124,7 +124,7 @@ func HistoryWide(ctx context.Context, opts HistoryOptions) ([]*HistoryOutputWide prevTs = ts } - if _, ok := ev.GetEventType().(*protos.HistoryEvent_OrchestratorStarted); ok { + if _, ok := ev.GetEventType().(*protos.HistoryEvent_WorkflowStarted); ok { replay++ } @@ -372,10 +372,10 @@ func deriveDetails(first *protos.HistoryEvent, h *protos.HistoryEvent) *string { case *protos.HistoryEvent_ExecutionStarted: d := ptr.Of("workflowStart") if p := h.GetExecutionStarted().GetParentInstance(); p != nil { - *d += fmt.Sprintf(",parent=%s", p.GetOrchestrationInstance().GetInstanceId()) + *d += fmt.Sprintf(",parent=%s", p.GetWorkflowInstance().GetInstanceId()) } return d - case *protos.HistoryEvent_OrchestratorStarted: + case *protos.HistoryEvent_WorkflowStarted: return ptr.Of("replay") case *protos.HistoryEvent_TaskCompleted: return ptr.Of(fmt.Sprintf("eventId=%d", t.TaskCompleted.TaskScheduledId)) From 90095db31a011612176c48854c3d81eac8ab5ca2 Mon Sep 17 00:00:00 2001 From: Samantha Coyle Date: Fri, 10 Apr 2026 13:15:45 -0500 Subject: [PATCH 3/5] fix: updates for build Signed-off-by: Samantha Coyle --- pkg/workflow/list.go | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkg/workflow/list.go b/pkg/workflow/list.go index 9fbbd5376..8fd0a90d4 100644 --- a/pkg/workflow/list.go +++ b/pkg/workflow/list.go @@ -22,9 +22,7 @@ import ( "github.com/dapr/cli/cmd/runtime" "github.com/dapr/cli/pkg/workflow/dclient" - "github.com/dapr/durabletask-go/api" - "github.com/dapr/durabletask-go/api/protos" - "github.com/dapr/kit/ptr" + "github.com/dapr/durabletask-go/workflow" "k8s.io/apimachinery/pkg/util/duration" ) @@ -151,9 +149,7 @@ func list(ctx context.Context, instanceIDs []string, cl *dclient.Client, opts Li continue } - // TODO: @joshvanl: add `WorkflowIsCompleted` func to workflow package. - //nolint:govet - if opts.Filter.Terminal && !api.OrchestrationMetadataIsComplete(ptr.Of(protos.OrchestrationMetadata(*resp))) { + if opts.Filter.Terminal && !workflow.WorkflowMetadataIsComplete(resp) { continue } From 4afabc5fda91e347c14e8570c4985f569c0770e3 Mon Sep 17 00:00:00 2001 From: Samantha Coyle Date: Fri, 24 Apr 2026 10:19:39 -0500 Subject: [PATCH 4/5] fix: bump deps Signed-off-by: Samantha Coyle --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index bf9011330..bf8cb39d3 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,7 @@ require ( github.com/Pallinder/sillyname-go v0.0.0-20130730142914-97aeae9e6ba1 github.com/briandowns/spinner v1.19.0 github.com/dapr/dapr v1.17.3 - github.com/dapr/durabletask-go v0.11.1 + github.com/dapr/durabletask-go v0.11.3 github.com/dapr/go-sdk v1.14.0 github.com/dapr/kit v0.17.0 github.com/diagridio/go-etcd-cron v0.12.4 diff --git a/go.sum b/go.sum index 89afd2316..039cc2c01 100644 --- a/go.sum +++ b/go.sum @@ -164,8 +164,8 @@ github.com/dapr/components-contrib v1.17.3 h1:lhSvLZ1nGGkmlRKCpzgNEsnNXqOWjFlhAt github.com/dapr/components-contrib v1.17.3/go.mod h1:lVPRj9ywzkUWoKXxRTAJbvS+Vg8A882av/nynGstNE4= github.com/dapr/dapr v1.17.3 h1:A4pRHW/bnC9X/u1u27JU6Ut4oipaEzBqUeBy2lqsWuc= github.com/dapr/dapr v1.17.3/go.mod h1:ZBVXrZSZykIXZkDyAghk+JdBuy7xnXhEmuS+BTwkPBk= -github.com/dapr/durabletask-go v0.11.1 h1:URG8YjFqZ4dXj7gkLe3G9ZwKYuJhuF/jNyVx+jPMT8A= -github.com/dapr/durabletask-go v0.11.1/go.mod h1:0Ts4rXp74JyG19gDWPcwNo5V6NBZzhARzHF5XynmA7Q= +github.com/dapr/durabletask-go v0.11.3 h1:DVWfiPo9+Xg0Q3uJIFGvEh2707uNyFKwIoy/PXiTXGc= +github.com/dapr/durabletask-go v0.11.3/go.mod h1:omLTzNvLQvpemgQYpKpfQGLMLVzDyUxBePRT/UlwqYI= github.com/dapr/go-sdk v1.14.0 h1:OAGOobBsKXhcqfxUEMDOtpkwKollokfZDIwNPly9ANU= github.com/dapr/go-sdk v1.14.0/go.mod h1:knMKBC95OCI3WdtitIsEXWy7eTpbZOMBh1NG/2QoV5Y= github.com/dapr/kit v0.17.0 h1:WCltVyKRMwk+3pbBs/3Qe5on4BZUnhy6tKgLObB2nMs= From 481e3b32cd5cd29da404bf9e12caadf18fe6f8cb Mon Sep 17 00:00:00 2001 From: Samantha Coyle Date: Fri, 24 Apr 2026 10:36:07 -0500 Subject: [PATCH 5/5] fix: update to latest commti ref Signed-off-by: Samantha Coyle --- go.mod | 6 ++++-- go.sum | 6 ++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index bf8cb39d3..12412c948 100644 --- a/go.mod +++ b/go.mod @@ -8,9 +8,9 @@ require ( github.com/Pallinder/sillyname-go v0.0.0-20130730142914-97aeae9e6ba1 github.com/briandowns/spinner v1.19.0 github.com/dapr/dapr v1.17.3 - github.com/dapr/durabletask-go v0.11.3 + github.com/dapr/durabletask-go v0.11.4-0.20260413145313-c4b7279b6a8e github.com/dapr/go-sdk v1.14.0 - github.com/dapr/kit v0.17.0 + github.com/dapr/kit v0.17.1-0.20260402173438-be272d92042b github.com/diagridio/go-etcd-cron v0.12.4 github.com/docker/docker v28.5.2+incompatible github.com/evanphx/json-patch/v5 v5.9.0 @@ -279,3 +279,5 @@ require ( ) // replace github.com/dapr/dapr => ../dapr + +replace github.com/dapr/durabletask-go => ../durabletask-go diff --git a/go.sum b/go.sum index 039cc2c01..4dafbf16f 100644 --- a/go.sum +++ b/go.sum @@ -164,12 +164,10 @@ github.com/dapr/components-contrib v1.17.3 h1:lhSvLZ1nGGkmlRKCpzgNEsnNXqOWjFlhAt github.com/dapr/components-contrib v1.17.3/go.mod h1:lVPRj9ywzkUWoKXxRTAJbvS+Vg8A882av/nynGstNE4= github.com/dapr/dapr v1.17.3 h1:A4pRHW/bnC9X/u1u27JU6Ut4oipaEzBqUeBy2lqsWuc= github.com/dapr/dapr v1.17.3/go.mod h1:ZBVXrZSZykIXZkDyAghk+JdBuy7xnXhEmuS+BTwkPBk= -github.com/dapr/durabletask-go v0.11.3 h1:DVWfiPo9+Xg0Q3uJIFGvEh2707uNyFKwIoy/PXiTXGc= -github.com/dapr/durabletask-go v0.11.3/go.mod h1:omLTzNvLQvpemgQYpKpfQGLMLVzDyUxBePRT/UlwqYI= github.com/dapr/go-sdk v1.14.0 h1:OAGOobBsKXhcqfxUEMDOtpkwKollokfZDIwNPly9ANU= github.com/dapr/go-sdk v1.14.0/go.mod h1:knMKBC95OCI3WdtitIsEXWy7eTpbZOMBh1NG/2QoV5Y= -github.com/dapr/kit v0.17.0 h1:WCltVyKRMwk+3pbBs/3Qe5on4BZUnhy6tKgLObB2nMs= -github.com/dapr/kit v0.17.0/go.mod h1:40ZWs5P6xfYf7O59XgwqZkIyDldTIXlhTQhGop8QoSM= +github.com/dapr/kit v0.17.1-0.20260402173438-be272d92042b h1:hXbRlNKvmMGbiMSRy3MX04kH5OiMgH82PRuLN7adtwE= +github.com/dapr/kit v0.17.1-0.20260402173438-be272d92042b/go.mod h1:2v02LZdXzPmOadxoT6EMEt0bsEYe6h1fn2ndYWmylCg= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=