small cleanup

cmd/dbos/migrate.go

@@ -29,7 +29,7 @@ func init() {
 
 func runMigrate(cmd *cobra.Command, args []string) error {
 	// Get database URL
-	dbURL, err := getDBURL(cmd)
+	dbURL, err := getDBURL()
 	if err != nil {
 		return err
 	}

cmd/dbos/reset.go

@@ -34,7 +34,7 @@ func runReset(cmd *cobra.Command, args []string) error {
 	}
 
 	// Get database URL
-	dbURL, err := getDBURL(cmd)
+	dbURL, err := getDBURL()
 	if err != nil {
 		return err
 	}

cmd/dbos/utils.go

@@ -9,7 +9,6 @@ import (
 	"os"
 
 	"github.com/dbos-inc/dbos-transact-golang/dbos"
-	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 )
 
@@ -43,7 +42,7 @@ func maskPassword(dbURL string) string {
 }
 
 // getDBURL resolves the database URL from flag, config, or environment variable
-func getDBURL(_ *cobra.Command) (string, error) {
+func getDBURL() (string, error) {
 	var resolvedURL string
 	var source string
 

cmd/dbos/workflow.go

@@ -85,7 +85,7 @@ func init() {
 
 func runWorkflowList(cmd *cobra.Command, args []string) error {
 	// Get database URL
-	dbURL, err := getDBURL(cmd)
+	dbURL, err := getDBURL()
 	if err != nil {
 		return err
 	}
@@ -192,7 +192,7 @@ func runWorkflowGet(cmd *cobra.Command, args []string) error {
 	workflowID := args[0]
 
 	// Get database URL
-	dbURL, err := getDBURL(cmd)
+	dbURL, err := getDBURL()
 	if err != nil {
 		return err
 	}
@@ -227,7 +227,7 @@ func runWorkflowSteps(cmd *cobra.Command, args []string) error {
 	workflowID := args[0]
 
 	// Get database URL
-	dbURL, err := getDBURL(cmd)
+	dbURL, err := getDBURL()
 	if err != nil {
 		return err
 	}
@@ -259,7 +259,7 @@ func runWorkflowCancel(cmd *cobra.Command, args []string) error {
 	workflowID := args[0]
 
 	// Get database URL
-	dbURL, err := getDBURL(cmd)
+	dbURL, err := getDBURL()
 	if err != nil {
 		return err
 	}
@@ -285,7 +285,7 @@ func runWorkflowResume(cmd *cobra.Command, args []string) error {
 	workflowID := args[0]
 
 	// Get database URL
-	dbURL, err := getDBURL(cmd)
+	dbURL, err := getDBURL()
 	if err != nil {
 		return err
 	}
@@ -318,7 +318,7 @@ func runWorkflowFork(cmd *cobra.Command, args []string) error {
 	workflowID := args[0]
 
 	// Get database URL
-	dbURL, err := getDBURL(cmd)
+	dbURL, err := getDBURL()
 	if err != nil {
 		return err
 	}

dbos/workflow.go

@@ -839,14 +839,11 @@ func (c *dbosContext) RunWorkflow(_ DBOSContext, fn WorkflowFunc, input any, opt
 		return earlyReturnPollingHandle, nil
 	}
 
-	outcomeChan := make(chan workflowOutcome[any], 1)
-
 	// Create workflow state to track step execution
 	wfState := &workflowState{
 		workflowID: workflowID,
 		stepID:     -1, // Steps are O-indexed
 	}
-
 	workflowCtx := WithValue(c, workflowStateKey, wfState)
 
 	// If the workflow has a timeout but no deadline, compute the deadline from the timeout.
@@ -863,7 +860,7 @@ func (c *dbosContext) RunWorkflow(_ DBOSContext, fn WorkflowFunc, input any, opt
 	if !durableDeadline.IsZero() {
 		workflowCtx, _ = WithTimeout(workflowCtx, time.Until(durableDeadline))
 		// Register a cancel function that cancels the workflow in the DB as soon as the context is cancelled
-		dbosCancelFunction := func() {
+		workflowCancelFunction := func() {
 			c.logger.Info("Cancelling workflow", "workflow_id", workflowID)
 			err = retry(c, func() error {
 				return c.systemDB.cancelWorkflow(uncancellableCtx, workflowID)
@@ -873,10 +870,11 @@ func (c *dbosContext) RunWorkflow(_ DBOSContext, fn WorkflowFunc, input any, opt
 			}
 			close(cancelFuncCompleted)
 		}
-		stopFunc = context.AfterFunc(workflowCtx, dbosCancelFunction)
+		stopFunc = context.AfterFunc(workflowCtx, workflowCancelFunction)
 	}
 
 	// Run the function in a goroutine
+	outcomeChan := make(chan workflowOutcome[any], 1)
 	c.workflowsWg.Add(1)
 	go func() {
 		defer c.workflowsWg.Done()