handle creating a deploy that isn't started yet (#187)

kitemongerer · web-flow · commit 794c6ba726b5 · 2025-05-12T15:12:56.000-06:00
diff --git a/cmd/deploycreate.go b/cmd/deploycreate.go
@@ -102,6 +102,19 @@ func nonInteractiveDeployCreate(cmd *cobra.Command, input types.DeployInput) boo
 			return nil, err
 		}
 
+		if d == nil {
+			_, err = fmt.Fprintf(cmd.OutOrStderr(), "Waiting for deploy to be created...\n\n")
+			if err != nil {
+				return nil, err
+			}
+			dep, err = views.WaitForDeployCreate(cmd.Context(), input.ServiceID)
+			if err != nil {
+				return nil, err
+			}
+
+			d = dep
+		}
+
 		if input.Wait {
 			_, err = fmt.Fprintf(cmd.OutOrStderr(), "Waiting for deploy %s to complete...\n\n", d.Id)
 			if err != nil {
diff --git a/pkg/client/types_gen.go b/pkg/client/types_gen.go
diff --git a/pkg/tui/views/deploycreate.go b/pkg/tui/views/deploycreate.go
@@ -18,6 +18,7 @@ import (
 )
 
 const deployTimeout = time.Hour
+const deployCreateTimeout = time.Minute
 
 func CreateDeploy(ctx context.Context, input types.DeployInput) (*client.Deploy, error) {
 	deployRepo, err := newDeployRepo()
@@ -42,6 +43,14 @@ func CreateDeploy(ctx context.Context, input types.DeployInput) (*client.Deploy,
 		return nil, err
 	}
 
+	if d == nil {
+		dep, err := WaitForDeployCreate(ctx, input.ServiceID)
+		if err != nil {
+			return nil, err
+		}
+		d = dep
+	}
+
 	return d, nil
 }
 
@@ -87,6 +96,36 @@ func WaitForDeploy(ctx context.Context, serviceID, deployID string) (*client.Dep
 	}
 }
 
+func WaitForDeployCreate(ctx context.Context, serviceID string) (*client.Deploy, error) {
+	deployRepo, err := newDeployRepo()
+	if err != nil {
+		return nil, err
+	}
+
+	timeoutTimer := time.NewTimer(deployCreateTimeout)
+
+	for {
+		select {
+		case <-timeoutTimer.C:
+			return nil, fmt.Errorf("timed out waiting for deploy to be created")
+		default:
+			ds, err := deployRepo.ListDeploysForService(ctx, serviceID, &client.ListDeploysParams{
+				Status: pointers.From([]client.DeployStatus{client.DeployStatusQueued}),
+				Limit:  pointers.From(1),
+			})
+			if err != nil {
+				return nil, err
+			}
+
+			if len(ds) > 0 {
+				return ds[0], nil
+			}
+
+			time.Sleep(time.Second)
+		}
+	}
+}
+
 type DeployCreateView struct {
 	formAction *tui.FormWithAction[*client.Deploy]
 
diff --git a/pkg/tui/views/deploycreate_test.go b/pkg/tui/views/deploycreate_test.go
@@ -33,6 +33,25 @@ func TestWaitForDeploy(t *testing.T) {
 	assert.Equal(t, "some-deploy-id", dep.Id)
 }
 
+func TestWaitForDeployCreate(t *testing.T) {
+	listDeployCallCount := 0
+	setupTestServer(t, func() (int, string) {
+		listDeployCallCount++
+		if listDeployCallCount == 1 {
+			return http.StatusOK, `[]`
+		}
+
+		deploy := fmt.Sprintf(deployRespTmpl, client.DeployStatusQueued)
+		return http.StatusOK, fmt.Sprintf(`[{"deploy": %s, "cursor": "some-cursor"}]`, deploy)
+	})
+
+	dep, err := views.WaitForDeployCreate(context.Background(), "some-service-id")
+	require.NoError(t, err)
+
+	assert.Equal(t, client.DeployStatusQueued, *dep.Status)
+	assert.Equal(t, "some-deploy-id", dep.Id)
+}
+
 func setupTestServer(t *testing.T, handler func() (int, string)) *httptest.Server {
 	s := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		w.Header().Add("Content-Type", "application/json")
