Fix metadata

Signed-off-by: joshvanl <[email protected]>

Author: JoshVanL

workflow/api.go

@@ -4,8 +4,6 @@ import (
 	"time"
 
 	"github.com/dapr/durabletask-go/api"
-	"github.com/dapr/durabletask-go/api/protos"
-	"github.com/dapr/kit/ptr"
 	"google.golang.org/protobuf/types/known/wrapperspb"
 )
 
@@ -16,7 +14,7 @@ type TerminateOptions api.TerminateOptions
 type PurgeOptions api.PurgeOptions
 type RerunOptions api.RerunOptions
 
-type WorkflowMetadata protos.OrchestrationMetadata
+type WorkflowMetadata WorkflowState
 
 // WithInstanceID configures an explicit workflow instance ID. If not
 // specified, a random UUID value will be used for the workflow instance ID.
@@ -87,11 +85,11 @@ func WithRecursivePurge(recursive bool) PurgeOptions {
 }
 
 func WorkflowMetadataIsRunning(o *WorkflowMetadata) bool {
-	return api.OrchestrationMetadataIsComplete(ptr.Of(protos.OrchestrationMetadata(*o)))
+	return api.OrchestrationMetadataIsComplete(o.Metadata)
 }
 
 func WorkflowMetadataIsComplete(o *WorkflowMetadata) bool {
-	return api.OrchestrationMetadataIsComplete(ptr.Of(protos.OrchestrationMetadata(*o)))
+	return api.OrchestrationMetadataIsComplete(o.Metadata)
 }
 
 func WithRerunInput(input any) RerunOptions {

workflow/client.go

@@ -53,7 +53,7 @@ func (c *Client) FetchWorkflowMetadata(ctx context.Context, id string, opts ...F
 		oops[i] = api.FetchOrchestrationMetadataOptions(o)
 	}
 	meta, err := c.thgc.FetchOrchestrationMetadata(ctx, api.InstanceID(id), oops...)
-	return (*WorkflowMetadata)(meta), err
+	return &WorkflowMetadata{Metadata: meta}, err
 }
 
 // WaitForWorkflowStart waits for an workflow to start running and returns an
@@ -68,7 +68,7 @@ func (c *Client) WaitForWorkflowStart(ctx context.Context, id string, opts ...Fe
 		oops[i] = api.FetchOrchestrationMetadataOptions(o)
 	}
 	meta, err := c.thgc.WaitForOrchestrationStart(ctx, api.InstanceID(id), oops...)
-	return (*WorkflowMetadata)(meta), err
+	return &WorkflowMetadata{meta}, err
 }
 
 // WaitForWorkflowCompletion waits for an workflow to complete and returns an
@@ -83,7 +83,7 @@ func (c *Client) WaitForWorkflowCompletion(ctx context.Context, id string, opts
 		oops[i] = api.FetchOrchestrationMetadataOptions(o)
 	}
 	meta, err := c.thgc.WaitForOrchestrationCompletion(ctx, api.InstanceID(id), oops...)
-	return (*WorkflowMetadata)(meta), err
+	return &WorkflowMetadata{meta}, err
 }
 
 // TerminateWorkflow terminates a running workflow by causing it to stop

workflow/state.go

@@ -2,7 +2,7 @@ package workflow
 
 import (
 	"github.com/dapr/durabletask-go/api"
-	"github.com/dapr/durabletask-go/api/protos"
+	"github.com/dapr/durabletask-go/backend"
 )
 
 type Status int
@@ -60,7 +60,7 @@ func (s Status) RuntimeStatus() api.OrchestrationStatus {
 }
 
 type WorkflowState struct {
-	Metadata protos.OrchestrationMetadata
+	Metadata *backend.OrchestrationMetadata
 }
 
 // RuntimeStatus returns the status from a workflow state.