cleanup: reduce integration test matrix wrt client config (#3366)

Author: dbolduc

src/integration-tests/src/bigquery.rs

@@ -19,9 +19,7 @@ use rand::{Rng, distr::Alphanumeric};
 
 const INSTANCE_LABEL: &str = "rust-sdk-integration-test";
 
-pub async fn dataset_admin(
-    builder: bigquery::builder::dataset_service::ClientBuilder,
-) -> Result<()> {
+pub async fn dataset_admin() -> Result<()> {
     // Enable a basic subscriber. Useful to troubleshoot problems and visually
     // verify tracing is doing something.
     #[cfg(feature = "log-integration-tests")]
@@ -37,7 +35,10 @@ pub async fn dataset_admin(
     };
 
     let project_id = crate::project_id()?;
-    let client: bigquery::client::DatasetService = builder.build().await?;
+    let client = bigquery::client::DatasetService::builder()
+        .with_tracing()
+        .build()
+        .await?;
     cleanup_stale_datasets(&client, &project_id).await?;
 
     let dataset_id = random_dataset_id();
@@ -187,7 +188,7 @@ fn extract_dataset_id(project_id: &str, id: &str) -> Option<String> {
         .map(|v| v.to_string())
 }
 
-pub async fn job_service(builder: bigquery::builder::job_service::ClientBuilder) -> Result<()> {
+pub async fn job_service() -> Result<()> {
     // Enable a basic subscriber. Useful to troubleshoot problems and visually
     // verify tracing is doing something.
     #[cfg(feature = "log-integration-tests")]
@@ -203,7 +204,10 @@ pub async fn job_service(builder: bigquery::builder::job_service::ClientBuilder)
     };
 
     let project_id = crate::project_id()?;
-    let client: bigquery::client::JobService = builder.build().await?;
+    let client = bigquery::client::JobService::builder()
+        .with_tracing()
+        .build()
+        .await?;
     cleanup_stale_jobs(&client, &project_id).await?;
 
     let job_id = random_job_id();

src/integration-tests/src/error_details.rs

@@ -14,10 +14,9 @@
 
 use crate::Result;
 use gax::retry_policy::{AlwaysRetry, RetryPolicyExt};
+use storage::client::StorageControl;
 
-pub async fn error_details_http(
-    builder: ta::builder::telco_automation::ClientBuilder,
-) -> Result<()> {
+pub async fn error_details_http() -> Result<()> {
     // Enable a basic subscriber. Useful to troubleshoot problems and visually
     // verify tracing is doing something.
     #[cfg(feature = "log-integration-tests")]
@@ -34,7 +33,8 @@ pub async fn error_details_http(
 
     let project_id = crate::project_id()?;
     let region_id = crate::region_id();
-    let client = builder
+    let client = ta::client::TelcoAutomation::builder()
+        .with_tracing()
         .with_retry_policy(AlwaysRetry.with_attempt_limit(2))
         .build()
         .await?;
@@ -54,9 +54,7 @@ pub async fn error_details_http(
     Ok(())
 }
 
-pub async fn error_details_grpc(
-    builder: storage::builder::storage_control::ClientBuilder,
-) -> Result<()> {
+pub async fn error_details_grpc() -> Result<()> {
     #[cfg(feature = "log-integration-tests")]
     let _guard = {
         use tracing_subscriber::fmt::format::FmtSpan;
@@ -69,7 +67,7 @@ pub async fn error_details_grpc(
         tracing::subscriber::set_default(subscriber)
     };
 
-    let client = builder.build().await?;
+    let client = StorageControl::builder().with_tracing().build().await?;
     let err = client
         .get_bucket()
         .set_name("malformed/_/bucket/name")
@@ -84,7 +82,7 @@ pub async fn error_details_grpc(
     Ok(())
 }
 
-pub async fn check_code_for_http(builder: wf::builder::workflows::ClientBuilder) -> Result<()> {
+pub async fn check_code_for_http() -> Result<()> {
     #[cfg(feature = "log-integration-tests")]
     let _guard = {
         use tracing_subscriber::fmt::format::FmtSpan;
@@ -102,7 +100,10 @@ pub async fn check_code_for_http(builder: wf::builder::workflows::ClientBuilder)
     let workflow_id = crate::random_workflow_id();
     let workflow_name =
         format!("projects/{project_id}/locations/{location_id}/workflows/{workflow_id}");
-    let client = builder.build().await?;
+    let client = wf::client::Workflows::builder()
+        .with_tracing()
+        .build()
+        .await?;
 
     match client.get_workflow().set_name(&workflow_name).send().await {
         Ok(g) => panic!("unexpected success {g:?}"),
@@ -119,9 +120,7 @@ pub async fn check_code_for_http(builder: wf::builder::workflows::ClientBuilder)
     Ok(())
 }
 
-pub async fn check_code_for_grpc(
-    builder: storage::builder::storage_control::ClientBuilder,
-) -> Result<()> {
+pub async fn check_code_for_grpc() -> Result<()> {
     #[cfg(feature = "log-integration-tests")]
     let _guard = {
         use tracing_subscriber::fmt::format::FmtSpan;
@@ -136,7 +135,7 @@ pub async fn check_code_for_grpc(
 
     let bucket_id = crate::random_bucket_id();
     let bucket_name = format!("projects/_/buckets/{bucket_id}");
-    let client = builder.build().await?;
+    let client = StorageControl::builder().with_tracing().build().await?;
 
     match client.get_bucket().set_name(&bucket_name).send().await {
         Ok(g) => panic!("unexpected success {g:?}"),

src/integration-tests/src/firestore.rs

@@ -30,7 +30,7 @@ fn new_collection_id() -> String {
     format!("{prefix}{collection_id}")
 }
 
-pub async fn basic(builder: firestore::builder::firestore::ClientBuilder) -> Result<()> {
+pub async fn basic() -> Result<()> {
     // Enable a basic subscriber. Useful to troubleshoot problems and visually
     // verify tracing is doing something.
     #[cfg(feature = "log-integration-tests")]
@@ -45,10 +45,10 @@ pub async fn basic(builder: firestore::builder::firestore::ClientBuilder) -> Res
         tracing::subscriber::set_default(subscriber)
     };
 
-    cleanup_stale_documents().await?;
+    let client = Firestore::builder().with_tracing().build().await?;
+    cleanup_stale_documents(&client).await?;
 
     let project_id = crate::project_id()?;
-    let client = builder.build().await?;
     let collection_id = new_collection_id();
     let response = client
         .create_document()
@@ -113,19 +113,15 @@ pub async fn basic(builder: firestore::builder::firestore::ClientBuilder) -> Res
     Ok(())
 }
 
-async fn cleanup_stale_documents() -> Result<()> {
+async fn cleanup_stale_documents(client: &Firestore) -> Result<()> {
+    use gax::options::RequestOptionsBuilder;
     use gax::retry_policy::RetryPolicyExt;
     use std::time::{Duration, SystemTime, UNIX_EPOCH};
 
     let stale_deadline = SystemTime::now().duration_since(UNIX_EPOCH)?;
     let stale_deadline = stale_deadline - Duration::from_secs(48 * 60 * 60);
     let stale_deadline = wkt::Timestamp::clamp(stale_deadline.as_secs() as i64, 0);
 
-    let client = Firestore::builder()
-        .with_retry_policy(gax::retry_policy::AlwaysRetry.with_attempt_limit(3))
-        .build()
-        .await?;
-
     let mut stale_documents = Vec::new();
 
     let project_id = crate::project_id()?;
@@ -152,7 +148,13 @@ async fn cleanup_stale_documents() -> Result<()> {
     let stale_documents = stale_documents;
     let pending = stale_documents
         .iter()
-        .map(|name| client.delete_document().set_name(name).send())
+        .map(|name| {
+            client
+                .delete_document()
+                .set_name(name)
+                .with_retry_policy(gax::retry_policy::AlwaysRetry.with_attempt_limit(3))
+                .send()
+        })
         .collect::<Vec<_>>();
 
     futures::future::join_all(pending)

src/integration-tests/src/secret_manager/openapi.rs

@@ -16,7 +16,7 @@ use crate::Result;
 use gax::paginator::Paginator;
 use rand::{Rng, distr::Alphanumeric};
 
-pub async fn run(builder: smo::builder::secret_manager_service::ClientBuilder) -> Result<()> {
+pub async fn run() -> Result<()> {
     // Enable a basic subscriber. Useful to troubleshoot problems and visually
     // verify tracing is doing something.
     #[cfg(feature = "log-integration-tests")]
@@ -37,7 +37,10 @@ pub async fn run(builder: smo::builder::secret_manager_service::ClientBuilder) -
         .map(char::from)
         .collect();
 
-    let client = builder.build().await?;
+    let client = smo::client::SecretManagerService::builder()
+        .with_tracing()
+        .build()
+        .await?;
 
     println!("\nTesting create_secret()");
     let create = client

src/integration-tests/src/secret_manager/openapi_locational.rs

@@ -15,7 +15,7 @@
 use crate::Result;
 use rand::{Rng, distr::Alphanumeric};
 
-pub async fn run(builder: smo::builder::secret_manager_service::ClientBuilder) -> Result<()> {
+pub async fn run() -> Result<()> {
     // Enable a basic subscriber. Useful to troubleshoot problems and visually
     // verify tracing is doing something.
     #[cfg(feature = "log-integration-tests")]
@@ -40,7 +40,11 @@ pub async fn run(builder: smo::builder::secret_manager_service::ClientBuilder) -
     // We must override the configuration to use a regional endpoint.
     let location_id = "us-central1".to_string();
     let endpoint = format!("https://secretmanager.{location_id}.rep.googleapis.com");
-    let client = builder.with_endpoint(endpoint).build().await?;
+    let client = smo::client::SecretManagerService::builder()
+        .with_tracing()
+        .with_endpoint(endpoint)
+        .build()
+        .await?;
 
     cleanup_stale_secrets(&client, &project_id, &location_id).await?;
 

src/integration-tests/src/sql.rs

@@ -19,9 +19,7 @@ use rand::Rng;
 use sql::model;
 use storage_samples::RandomChars;
 
-pub async fn run_sql_instances_service(
-    builder: sql::builder::sql_instances_service::ClientBuilder,
-) -> Result<()> {
+pub async fn run_sql_instances_service() -> Result<()> {
     // Enable a basic subscriber. Useful to troubleshoot problems and visually
     // verify tracing is doing something.
     #[cfg(feature = "log-integration-tests")]
@@ -38,7 +36,10 @@ pub async fn run_sql_instances_service(
 
     let project_id = crate::project_id()?;
     let name = random_sql_instance_name(&project_id);
-    let client: sql::client::SqlInstancesService = builder.build().await?;
+    let client = sql::client::SqlInstancesService::builder()
+        .with_tracing()
+        .build()
+        .await?;
 
     cleanup_stale_sql_instances(&client, &project_id).await?;
 
@@ -168,9 +169,7 @@ async fn cleanup_stale_sql_instances(
     Ok(())
 }
 
-pub async fn run_sql_tiers_service(
-    builder: sql::builder::sql_tiers_service::ClientBuilder,
-) -> Result<()> {
+pub async fn run_sql_tiers_service() -> Result<()> {
     // Enable a basic subscriber. Useful to troubleshoot problems and visually
     // verify tracing is doing something.
     #[cfg(feature = "log-integration-tests")]
@@ -186,7 +185,10 @@ pub async fn run_sql_tiers_service(
     };
 
     let project_id = crate::project_id()?;
-    let client: sql::client::SqlTiersService = builder.build().await?;
+    let client = sql::client::SqlTiersService::builder()
+        .with_tracing()
+        .build()
+        .await?;
 
     let list = client.list().set_project(&project_id).send().await?;
 

src/integration-tests/src/workflows.rs

@@ -19,7 +19,7 @@ use gax::paginator::ItemPaginator as _;
 use lro::Poller;
 use std::time::Duration;
 
-pub async fn until_done(builder: wf::builder::workflows::ClientBuilder) -> Result<()> {
+pub async fn until_done() -> Result<()> {
     // Enable a basic subscriber. Useful to troubleshoot problems and visually
     // verify tracing is doing something.
     #[cfg(feature = "log-integration-tests")]
@@ -38,7 +38,10 @@ pub async fn until_done(builder: wf::builder::workflows::ClientBuilder) -> Resul
     let location_id = crate::region_id();
     let workflows_runner = crate::workflows_runner()?;
 
-    let client = builder.build().await?;
+    let client = wf::client::Workflows::builder()
+        .with_tracing()
+        .build()
+        .await?;
     cleanup_stale_workflows(&client, &project_id, &location_id).await?;
 
     let source_contents = r###"# Test only workflow
@@ -81,7 +84,7 @@ main:
     Ok(())
 }
 
-pub async fn explicit_loop(builder: wf::builder::workflows::ClientBuilder) -> Result<()> {
+pub async fn explicit_loop() -> Result<()> {
     // Enable a basic subscriber. Useful to troubleshoot problems and visually
     // verify tracing is doing something.
     #[cfg(feature = "log-integration-tests")]
@@ -100,7 +103,10 @@ pub async fn explicit_loop(builder: wf::builder::workflows::ClientBuilder) -> Re
     let location_id = crate::region_id();
     let workflows_runner = crate::workflows_runner()?;
 
-    let client = builder.build().await?;
+    let client = wf::client::Workflows::builder()
+        .with_tracing()
+        .build()
+        .await?;
     cleanup_stale_workflows(&client, &project_id, &location_id).await?;
 
     let source_contents = r###"# Test only workflow
@@ -238,7 +244,10 @@ pub async fn manual(
     workflow_id: String,
     workflow: wf::model::Workflow,
 ) -> Result<()> {
-    let client = wf::client::Workflows::builder().build().await?;
+    let client = wf::client::Workflows::builder()
+        .with_tracing()
+        .build()
+        .await?;
 
     println!("\n\nStart create_workflow() LRO and poll it to completion");
     let create = client

src/integration-tests/src/workflows_executions.rs

@@ -21,7 +21,7 @@ use lro::Poller;
 use std::time::Duration;
 
 // Verify enum query parameters are serialized correctly.
-pub async fn list(builder: wfe::builder::executions::ClientBuilder) -> Result<()> {
+pub async fn list() -> Result<()> {
     // Enable a basic subscriber. Useful to troubleshoot problems and visually
     // verify tracing is doing something.
     #[cfg(feature = "log-integration-tests")]
@@ -40,7 +40,10 @@ pub async fn list(builder: wfe::builder::executions::ClientBuilder) -> Result<()
     // workflows integration tests to delete it if something fails or crashes
     // in this test.
     let parent = create_test_workflow().await?;
-    let client = builder.build().await?;
+    let client = wfe::client::Executions::builder()
+        .with_tracing()
+        .build()
+        .await?;
 
     // Create an execution with a label. The label is not returned for the `BASIC` view.
     let start = client