diff --git a/go.mod b/go.mod index 11286db9c..e31a14166 100644 --- a/go.mod +++ b/go.mod @@ -1,16 +1,16 @@ 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.3 - github.com/dapr/durabletask-go v0.11.1 - github.com/dapr/go-sdk v1.14.0 - github.com/dapr/kit v0.17.0 + github.com/dapr/dapr v1.17.0-rc.1.0.20260425162356-f8d0f6142987 + github.com/dapr/durabletask-go v0.11.4-0.20260413145313-c4b7279b6a8e + github.com/dapr/go-sdk v1.14.0-rc.2 + github.com/dapr/kit v0.17.1-0.20260409110905-18c6fce40d5d 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 @@ -67,7 +67,6 @@ require ( github.com/Masterminds/sprig/v3 v3.3.0 // indirect github.com/Masterminds/squirrel v1.5.4 // indirect github.com/Microsoft/go-winio v0.6.2 // indirect - github.com/PuerkitoBio/purell v1.2.1 // indirect github.com/aavaz-ai/pii-scrubber v0.0.0-20220812094047-3fa450ab6973 // indirect github.com/alphadose/haxmap v1.4.0 // indirect github.com/anshal21/go-worker v1.1.0 // indirect @@ -92,9 +91,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.17.2 // 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 @@ -126,7 +125,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 @@ -161,11 +160,11 @@ require ( github.com/klauspost/compress v1.18.4 // 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 @@ -254,7 +253,7 @@ require ( golang.org/x/oauth2 v0.36.0 // indirect golang.org/x/sync v0.20.0 // indirect golang.org/x/term v0.41.0 // indirect - golang.org/x/text v0.35.0 // indirect + golang.org/x/text v0.36.0 // indirect golang.org/x/time v0.12.0 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20260128011058-8636f8732409 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20260319201613-d00831a3d3e7 // indirect @@ -277,3 +276,6 @@ 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 +// replace github.com/dapr/durabletask-go => ../durabletask-go diff --git a/go.sum b/go.sum index 76ff24e19..dbe99eaa0 100644 --- a/go.sum +++ b/go.sum @@ -80,8 +80,6 @@ github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERo github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU= github.com/Pallinder/sillyname-go v0.0.0-20130730142914-97aeae9e6ba1 h1:ReSY7H5Nf08bSzShfWAUTCthIsK08iNitWGX5YFQGXE= github.com/Pallinder/sillyname-go v0.0.0-20130730142914-97aeae9e6ba1/go.mod h1:cTmXjiBQMtbZnpc/yLode6SPqKmzeL7xJlD+9R9zxoc= -github.com/PuerkitoBio/purell v1.2.1 h1:QsZ4TjvwiMpat6gBCBxEQI0rcS9ehtkKtSpiUnd9N28= -github.com/PuerkitoBio/purell v1.2.1/go.mod h1:ZwHcC/82TOaovDi//J/804umJFFmbOHPngi8iYYv/Eo= github.com/aavaz-ai/pii-scrubber v0.0.0-20220812094047-3fa450ab6973 h1:oMQQEYwu9V0O+IcRs7ButCPjsbOS0eEtMOImkvaeWLA= github.com/aavaz-ai/pii-scrubber v0.0.0-20220812094047-3fa450ab6973/go.mod h1:Y5HcXSyXAlR6rvJ5kqvPEtQlRLhekJFI/w/9CRZkpHs= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= @@ -160,22 +158,22 @@ 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.17.2 h1:u42OaQJ4DKbVbfmw2d4QZpPlOBfqJgJAY2g9+7AkfKQ= -github.com/dapr/components-contrib v1.17.2/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/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/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.20260425162356-f8d0f6142987 h1:E5OUtrCDHS0+IsNoCtfMaeJPUjuBJFMS9HMLhUN3Kyo= +github.com/dapr/dapr v1.17.0-rc.1.0.20260425162356-f8d0f6142987/go.mod h1:gWI43O+hBt+dW/jtTcDUJaUGA2zFxRB4aV5OP59k4H0= +github.com/dapr/durabletask-go v0.11.4-0.20260413145313-c4b7279b6a8e h1:SSBxGb1/dOmzyWZhKNHVliw/VemiYgLKlv8oOTIsGG0= +github.com/dapr/durabletask-go v0.11.4-0.20260413145313-c4b7279b6a8e/go.mod h1:nElJPTX9FmveqErAmvTXZrAmt2nnyTQ7Glj0ahPphSY= +github.com/dapr/go-sdk v1.14.0-rc.2 h1:SoXSirvHjg98sYGOLq/k5mflj5g18Sp9tICQkozfNu0= +github.com/dapr/go-sdk v1.14.0-rc.2/go.mod h1:5w0hIN79TvX8Bz/ZWEZFKvKc7aUSWofyemEaMWnr2X4= +github.com/dapr/kit v0.17.1-0.20260409110905-18c6fce40d5d h1:3QXEaZEBsKmOo1hMqcSL+LFZmigzMPMJietg2s5X11Y= +github.com/dapr/kit v0.17.1-0.20260409110905-18c6fce40d5d/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.4 h1:pc0Jk0M5MjrQ7uGydYuX93dKzWfulInA8XAh+i7GQFI= @@ -282,8 +280,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= @@ -463,16 +461,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= @@ -956,8 +954,8 @@ golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= -golang.org/x/text v0.35.0 h1:JOVx6vVDFokkpaq1AEptVzLTpDe9KGpj5tR4/X+ybL8= -golang.org/x/text v0.35.0/go.mod h1:khi/HExzZJ2pGnjenulevKNX1W67CUy0AsXcNubPGCA= +golang.org/x/text v0.36.0 h1:JfKh3XmcRPqZPKevfXVpI1wXPTqbkE5f7JA92a55Yxg= +golang.org/x/text v0.36.0/go.mod h1:NIdBknypM8iqVmPiuco0Dh6P5Jcdk8lJL0CUebqK164= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= diff --git a/pkg/workflow/history.go b/pkg/workflow/history.go index a19ec7323..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++ } @@ -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: @@ -390,22 +372,22 @@ 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)) 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 } 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 }