From ddec30b9182e82c66de36d5def1d757bb41b2b30 Mon Sep 17 00:00:00 2001
From: Tim Geoghegan <timg@letsencrypt.org>
Date: Wed, 17 Feb 2021 09:21:46 -0800
Subject: [PATCH] facilitator: GCS client timeouts

use .timeout to set a 2m timeout on the whole transaction rather than
piecemeal on reads or writes.
---
 facilitator/src/transport/gcs.rs | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/facilitator/src/transport/gcs.rs b/facilitator/src/transport/gcs.rs
index f62f72b06..e48650728 100644
--- a/facilitator/src/transport/gcs.rs
+++ b/facilitator/src/transport/gcs.rs
@@ -9,6 +9,7 @@ use log::info;
 use std::{
     io,
     io::{Read, Write},
+    time::Duration,
 };
 
 const STORAGE_API_BASE_URL: &str = "https://storage.googleapis.com";
@@ -75,8 +76,7 @@ impl Transport for GCSTransport {
                 &format!("Bearer {}", self.oauth_token_provider.ensure_oauth_token()?),
             )
             // By default, ureq will wait forever to connect or read
-            .timeout_connect(10_000) // ten seconds
-            .timeout_read(10_000) // ten seconds
+            .timeout(Duration::from_secs(120)) // two minutes for connect + read + write
             .call();
         if response.error() {
             return Err(anyhow!(
@@ -172,9 +172,7 @@ impl StreamingTransferWriter {
             .query("uploadType", "resumable")
             .query("name", &encoded_object)
             // By default, ureq will wait forever to connect or read
-            .timeout_connect(10_000) // ten seconds
-            .timeout_read(120_000) // two minutes
-            .timeout_write(120_000) // two minutes
+            .timeout(Duration::from_secs(120)) // two minutes for connect + read + write
             .send_bytes(&[]);
         if http_response.error() {
             return Err(anyhow!("uploading to gs://{}: {:?}", bucket, http_response));