[CAP-9239] fix --wait on versions release to poll until completion (#301)

WaitForVersion() previously returned immediately after a single fetch instead of poling. Now it polls every 5s until the version reaches a terminal status. Returns non-zero exit code when the release fails.

GitOrigin-RevId: 1f8787d1ee5d503443673a5536bfc66bc2c083de

Author: blue-keleher

cmd/versionrelease.go

@@ -10,6 +10,7 @@ import (
 	"github.com/render-oss/cli/pkg/text"
 	"github.com/render-oss/cli/pkg/tui/flows"
 	workflowviews "github.com/render-oss/cli/pkg/tui/views/workflows"
+	"github.com/render-oss/cli/pkg/workflowversion"
 )
 
 func NewVersionReleaseCmd(deps flows.WorkflowDeps) *cobra.Command {
@@ -68,10 +69,6 @@ Examples:
 		},
 	}
 
-	// TODO CAP-7490
-	// https://linear.app/render-com/issue/CAP-7490/flesh-out-workflow-version-information-at-least-restgql-if-not-present
-	// these are stubbed and non-functional
-	// the underlying information we need to display/act on these is not yet available
 	versionReleaseCmd.Flags().String("commit", "", "The commit ID to release")
 	versionReleaseCmd.Flags().Bool("wait", false, "Wait for release to finish. Returns non-zero exit code if release fails")
 	// optionally, image backed is not in scope for alpha, native env only
@@ -107,7 +104,13 @@ func nonInteractiveVersionRelease(cmd *cobra.Command, input workflowviews.Versio
 				return nil, err
 			}
 			wfv, err = deps.WorkflowLoader().WaitForVersion(cmd.Context(), input.WorkflowID, v.Id)
-			return wfv, err
+			if err != nil {
+				return nil, err
+			}
+			if !workflowversion.IsSuccessful(wfv.Status) {
+				return wfv, fmt.Errorf("release %s failed with status %s", wfv.Id, wfv.Status)
+			}
+			return wfv, nil
 		}
 
 		return v, err

pkg/tui/views/workflows/loader.go

@@ -13,6 +13,7 @@ import (
 	"github.com/render-oss/cli/pkg/tasks"
 	"github.com/render-oss/cli/pkg/version"
 	"github.com/render-oss/cli/pkg/workflow"
+	"github.com/render-oss/cli/pkg/workflowversion"
 )
 
 type WorkflowLoaderDeps interface {
@@ -116,46 +117,54 @@ func (w *WorkflowLoader) ReleaseVersion(ctx context.Context, input VersionReleas
 
 func (w *WorkflowLoader) WaitForVersion(ctx context.Context, workflowID, workflowVersionID string) (*wfclient.WorkflowVersion, error) {
 	timeoutTimer := time.NewTimer(versionTimeout)
+	ticker := time.NewTicker(5 * time.Second)
+	defer ticker.Stop()
+
+	// Check immediately before waiting for the first tick
+	v, err := w.workflowVersionRepo.GetVersion(ctx, workflowVersionID)
+	if err != nil {
+		return nil, err
+	}
+	if workflowversion.IsComplete(v.Status) {
+		return v, nil
+	}
 
 	for {
 		select {
 		case <-timeoutTimer.C:
 			return nil, fmt.Errorf("timed out waiting for release to finish")
-		default:
+		case <-ticker.C:
 			v, err := w.workflowVersionRepo.GetVersion(ctx, workflowVersionID)
 			if err != nil {
 				return nil, err
 			}
 
-			return v, nil
-
-			// TODO CAP-7490
-			// https://linear.app/render-com/issue/CAP-7490/flesh-out-workflow-version-information-at-least-restgql-if-not-present
-			// if workflowversion.IsComplete(v.Status) {
-			// 	return v, nil
-			// }
-
-			// if v.Status == nil || *v.Status == client.VersionStatusCreated {
-			// 	time.Sleep(10 * time.Second)
-			// } else {
-			// 	// if the release has started, poll more frequently
-			// 	time.Sleep(5 * time.Second)
-			// }
+			if workflowversion.IsComplete(v.Status) {
+				return v, nil
+			}
 		}
 	}
 }
 
 func (w *WorkflowLoader) WaitForVersionRelease(ctx context.Context, workflowID string) (*wfclient.WorkflowVersion, error) {
 	timeoutTimer := time.NewTimer(versionReleaseTimeout)
+	ticker := time.NewTicker(time.Second)
+	defer ticker.Stop()
+
+	// Check immediately before waiting for the first tick
+	_, wfv, err := w.workflowVersionRepo.ListVersions(ctx, workflowID, &client.ListWorkflowVersionsParams{Limit: pointers.From(1)})
+	if err != nil {
+		return nil, err
+	}
+	if len(wfv) > 0 {
+		return wfv[0], nil
+	}
 
 	for {
 		select {
 		case <-timeoutTimer.C:
 			return nil, fmt.Errorf("timed out waiting for version to be created")
-		default:
-			// TODO CAP-7490
-			// https://linear.app/render-com/issue/CAP-7490/flesh-out-workflow-version-information-at-least-restgql-if-not-present
-			// hacky "get latest version" straight up does not work without statuses/visibility
+		case <-ticker.C:
 			_, wfv, err := w.workflowVersionRepo.ListVersions(ctx, workflowID, &client.ListWorkflowVersionsParams{Limit: pointers.From(1)})
 			if err != nil {
 				return nil, err
@@ -164,8 +173,6 @@ func (w *WorkflowLoader) WaitForVersionRelease(ctx context.Context, workflowID s
 			if len(wfv) > 0 {
 				return wfv[0], nil
 			}
-
-			time.Sleep(time.Second)
 		}
 	}
 }

pkg/workflowversion/util.go

@@ -0,0 +1,24 @@
+package workflowversion
+
+import (
+	wfclient "github.com/render-oss/cli/pkg/client/workflows"
+)
+
+func IsComplete(status wfclient.WorkflowVersionStatus) bool {
+	switch status {
+	case wfclient.Ready,
+		wfclient.BuildFailed,
+		wfclient.RegistrationFailed:
+		return true
+	case wfclient.Created,
+		wfclient.Building,
+		wfclient.Registering:
+		return false
+	default:
+		return false
+	}
+}
+
+func IsSuccessful(status wfclient.WorkflowVersionStatus) bool {
+	return status == wfclient.Ready
+}

pkg/workflowversion/util_test.go

@@ -0,0 +1,46 @@
+package workflowversion_test
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+
+	wfclient "github.com/render-oss/cli/pkg/client/workflows"
+	"github.com/render-oss/cli/pkg/workflowversion"
+)
+
+func TestIsComplete(t *testing.T) {
+	tests := map[wfclient.WorkflowVersionStatus]bool{
+		wfclient.BuildFailed:        true,
+		wfclient.Building:           false,
+		wfclient.Created:            false,
+		wfclient.Ready:              true,
+		wfclient.Registering:        false,
+		wfclient.RegistrationFailed: true,
+	}
+
+	for status, expected := range tests {
+		t.Run(string(status), func(t *testing.T) {
+			actual := workflowversion.IsComplete(status)
+			assert.Equal(t, expected, actual)
+		})
+	}
+}
+
+func TestIsSuccessful(t *testing.T) {
+	tests := map[wfclient.WorkflowVersionStatus]bool{
+		wfclient.BuildFailed:        false,
+		wfclient.Building:           false,
+		wfclient.Created:            false,
+		wfclient.Ready:              true,
+		wfclient.Registering:        false,
+		wfclient.RegistrationFailed: false,
+	}
+
+	for status, expected := range tests {
+		t.Run(string(status), func(t *testing.T) {
+			actual := workflowversion.IsSuccessful(status)
+			assert.Equal(t, expected, actual)
+		})
+	}
+}