Wire ContractPreviewStatus through PollRetryPolicy

ContractPreviewStatus's Response changes from Option<PollState> to bool
(preview builds never had a target_url to accumulate, so the richer
PollState wrapper added nothing). poll() now builds
ServiceBuilder::new().retry(PollRetryPolicy::new(...)).service(status)
instead of calling the removed poll_preview_build, and maps the one-shot
result fetch's error to PreviewResultUnavailable inline instead of via a
separate remapping helper.

Author: sirdodger

crates/rover-client/src/operations/contract/preview/mod.rs

@@ -1,11 +1,14 @@
 mod service;
 mod types;
 
+use std::time::Duration;
+
+use rover_tower::poll_retry::PollRetryPolicy;
 pub use service::{ContractPreviewResult, ContractPreviewStart};
-use tower::{Service, ServiceExt};
+use tower::{Service, ServiceBuilder, ServiceExt};
 pub use types::*;
 
-use crate::{blocking::StudioClient, shared::preview_poll::poll_preview_build, RoverClientError};
+use crate::{blocking::StudioClient, RoverClientError};
 
 /// Start an async contract preview job, returning its (pending) status
 /// immediately.
@@ -22,20 +25,6 @@ pub async fn start(
     service.call(input).await
 }
 
-/// Check the status (without fetching the result) of a contract preview build.
-async fn status(
-    input: ContractPreviewStatusInput,
-    client: &StudioClient,
-) -> Result<Option<crate::shared::check_workflow_poll::PollState>, RoverClientError> {
-    let mut service = service::ContractPreviewStatus::new(
-        client
-            .studio_graphql_service()
-            .map_err(|err| RoverClientError::ServiceReady(Box::new(err)))?,
-    );
-    let service = service.ready().await?;
-    service.call(input).await
-}
-
 /// Fetch the full result of a previously started contract preview build.
 pub async fn result(
     input: ContractPreviewStatusInput,
@@ -50,19 +39,42 @@ pub async fn result(
     service.call(input).await
 }
 
-/// Continuously poll the status of an already-started contract preview build.
+/// Continuously poll the status of an already-started contract preview build,
+/// then fetch its full result once it's finished.
 pub async fn poll(
     status_input: ContractPreviewStatusInput,
     client: &StudioClient,
     checks_timeout_seconds: u64,
 ) -> Result<PreviewJobResponse, RoverClientError> {
-    poll_preview_build(
-        checks_timeout_seconds,
-        &status_input.build_id,
-        async || status(status_input.clone(), client).await,
-        async || result(status_input.clone(), client).await,
-    )
-    .await
+    let build_id = status_input.build_id.clone();
+    let mut status_service = ServiceBuilder::new()
+        .retry(PollRetryPolicy::new(
+            Duration::from_secs(5),
+            Duration::from_secs(checks_timeout_seconds),
+            {
+                let build_id = build_id.clone();
+                move || RoverClientError::PreviewTimeoutError {
+                    build_id: build_id.clone(),
+                }
+            },
+        ))
+        .service(service::ContractPreviewStatus::new(
+            client
+                .studio_graphql_service()
+                .map_err(|err| RoverClientError::ServiceReady(Box::new(err)))?,
+        ));
+    status_service
+        .ready()
+        .await?
+        .call(status_input.clone())
+        .await?;
+
+    result(status_input, client).await.map_err(|source| {
+        RoverClientError::PreviewResultUnavailable {
+            build_id,
+            source: Box::new(source),
+        }
+    })
 }
 
 /// Start an async contract preview build then poll until it reaches a

crates/rover-client/src/operations/contract/preview/service.rs

@@ -6,10 +6,7 @@ use tower::Service;
 
 use crate::{
     operations::contract::preview::types::{ContractPreviewInput, ContractPreviewStatusInput},
-    shared::{
-        check_workflow_poll::PollState, preview_poll::require_variant, AsyncBuildStatus,
-        PreviewJobResponse,
-    },
+    shared::{preview_poll::require_variant, AsyncBuildStatus, PreviewJobResponse},
     RoverClientError,
 };
 
@@ -131,7 +128,7 @@ where
         + 'static,
     Fut: Future<Output = Result<S::Response, S::Error>> + Send,
 {
-    type Response = Option<PollState>;
+    type Response = bool;
     type Error = RoverClientError;
     type Future = Pin<Box<dyn Future<Output = Result<Self::Response, Self::Error>> + Send>>;
 
@@ -164,11 +161,7 @@ where
 
             use contract_preview_status_query::ContractPreviewStatusQueryGraphVariantContractPreviewStatus as Status;
 
-            let finished = !matches!(status, Status::ContractPreviewAsyncPending);
-            Ok(Some(PollState {
-                finished,
-                target_url: None,
-            }))
+            Ok(!matches!(status, Status::ContractPreviewAsyncPending))
         };
         Box::pin(fut)
     }