Move to new client and use PagedVec

fiberplane · Feb 22, 2024 · 278d968 · 278d968
1 parent 71cecb9
commit 278d968
Showing 1 changed file with 15 additions and 17 deletions.
diff --git a/src/integrations/pagerduty_receivers.rs b/src/integrations/pagerduty_receivers.rs
@@ -5,7 +5,6 @@ use crate::utils::{clear_or_update, override_pagination, override_sorting};
 use anyhow::Result;
 use clap::{Parser, ValueEnum};
 use cli_table::Table;
-use fiberplane::api_client;
 use fiberplane::base64uuid::Base64Uuid;
 use fiberplane::models::names::Name;
 use fiberplane::models::pagerduty::{
@@ -106,12 +105,11 @@ async fn handle_create(args: CreateArgs) -> Result<()> {
     )?;
 
     let new_pagerduty_receiver = NewPagerDutyReceiver::builder()
-        .name(name)
         .creation_template(args.incident_creation_template)
         .build();
-    let pagerduty_receiver =
-        api_client::pagerduty_receiver_create(&client, workspace_id, new_pagerduty_receiver)
-            .await?;
+    let pagerduty_receiver = client
+        .pagerduty_receiver_create(workspace_id, name, new_pagerduty_receiver)
+        .await?;
 
     match args.output {
         PagerDutyWebhookOutput::Table => {
@@ -151,8 +149,7 @@ async fn handle_get(args: GetArgs) -> Result<()> {
     let workspace_id = workspace_picker(&client, args.workspace_id).await?;
     let name = name_req("PagerDuty webhook receiver name", args.name, None)?;
 
-    let pagerduty_receiver =
-        api_client::pagerduty_receiver_get(&client, workspace_id, name).await?;
+    let pagerduty_receiver = client.pagerduty_receiver_get(workspace_id, name).await?;
 
     match args.output {
         PagerDutyWebhookOutput::Table => {
@@ -219,13 +216,9 @@ async fn handle_update(args: UpdateArgs) -> Result<()> {
         .regenerate_security_key(args.regenerate_security_key)
         .build();
 
-    let pagerduty_receiver = api_client::pagerduty_receiver_update(
-        &client,
-        workspace_id,
-        name,
-        update_pagerduty_receiver,
-    )
-    .await?;
+    let pagerduty_receiver = client
+        .pagerduty_receiver_update(workspace_id, name, update_pagerduty_receiver)
+        .await?;
 
     match args.output {
         PagerDutyWebhookOutput::Table => {
@@ -261,7 +254,7 @@ async fn handle_delete(args: DeleteArgs) -> Result<()> {
     let workspace_id = workspace_picker(&client, args.workspace_id).await?;
     let name = name_req("PagerDuty webhook receiver name", args.name, None)?;
 
-    api_client::pagerduty_receiver_delete(&client, workspace_id, name).await?;
+    client.pagerduty_receiver_delete(workspace_id, name).await?;
 
     info!("Deleted Pagerduty receiver");
     Ok(())
@@ -310,8 +303,13 @@ async fn handle_list(args: ListArgs) -> Result<()> {
     let sorting = override_sorting(args.sort_by, args.sort_direction);
     let pagination = override_pagination(args.page, args.limit);
 
-    let pagerduty_receivers =
-        api_client::pagerduty_receiver_list(&client, workspace_id, sorting, pagination).await?;
+    let pagerduty_receivers = client
+        .pagerduty_receiver_list(workspace_id, sorting, pagination)
+        .await?;
+
+    if pagerduty_receivers.has_more_results {
+        info!(total_results = pagerduty_receivers.total_results, "There are more results available. Please use the --page and --limit flags to paginate through the results.")
+    }
 
     match args.output {
         PagerDutyWebhookOutput::Table => {