Skip to content

Bump SDK version. #603

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jack-edmonds-dd merged 2 commits into from
Jun 18, 2026
Merged

Bump SDK version. #603

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
656c2e2
Bump SDK version.
jack-edmonds-dd Jun 18, 2026
493a1b6
fmt
jack-edmonds-dd Jun 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,9 +127,9 @@ ssh-key = { version = "0.6", features = ["p256", "std"], optional = true }
futures = { version = "0.3", optional = true }
tokio-util = { version = "0.7", features = ["compat", "io"], optional = true }

# Datadog API client — pinned to master HEAD 2026-05-29
# Datadog API client — pinned to 0.32.0 tag
# Use default-features = false; feature sets are activated per-target via features above
datadog-api-client = { git = "https://github.com/DataDog/datadog-api-client-rust", rev = "d4954b117c5451c0a8932dd0ad0db450fcb0989c", optional = true, default-features = false }
datadog-api-client = { git = "https://github.com/DataDog/datadog-api-client-rust", rev = "b769778d0c58806b615165fb444e6f02dc2e86c0", optional = true, default-features = false }

# HTTP middleware (version-matched to DD client; compiles on all targets)
reqwest-middleware = "0.5"
Expand Down
8 changes: 4 additions & 4 deletions src/commands/feature_flags.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@ pub async fn flags_list(
params = params.is_archived(v);
}
if let Some(v) = limit {
params = params.limit(v);
params = params.limit(v as i64);
}
if let Some(v) = offset {
params = params.offset(v);
params = params.offset(v as i64);
}
let resp = api
.list_feature_flags(params)
Expand Down Expand Up @@ -128,10 +128,10 @@ pub async fn envs_list(
params = params.key(v);
}
if let Some(v) = limit {
params = params.limit(v);
params = params.limit(v as i64);
}
if let Some(v) = offset {
params = params.offset(v);
params = params.offset(v as i64);
}
let resp = api
.list_feature_flags_environments(params)
Expand Down
94 changes: 2 additions & 92 deletions src/commands/fleet.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
use anyhow::Result;
use datadog_api_client::datadogV2::api_fleet_automation::{
FleetAutomationAPI, GetFleetDeploymentOptionalParams, ListFleetAgentTracersOptionalParams,
ListFleetAgentsOptionalParams, ListFleetClustersOptionalParams,
ListFleetDeploymentsOptionalParams, ListFleetTracersOptionalParams,
ListFleetAgentsOptionalParams, ListFleetDeploymentsOptionalParams,
ListFleetTracersOptionalParams,
};

use crate::config::Config;
Expand Down Expand Up @@ -218,47 +218,6 @@ pub async fn agents_tracers_list(
formatter::output(cfg, &resp)
}

pub async fn clusters_list(
cfg: &Config,
filter: Option<String>,
page_size: Option<i64>,
page_number: Option<i64>,
sort_attribute: Option<String>,
sort_descending: bool,
) -> Result<()> {
let api = crate::make_api!(FleetAutomationAPI, cfg);
let mut params = ListFleetClustersOptionalParams::default();
if let Some(f) = filter {
params = params.filter(f);
}
if let Some(ps) = page_size {
params = params.page_size(ps);
}
if let Some(pn) = page_number {
params = params.page_number(pn);
}
if let Some(sa) = sort_attribute {
params = params.sort_attribute(sa);
}
if sort_descending {
params = params.sort_descending(true);
}
let resp = api
.list_fleet_clusters(params)
.await
.map_err(|e| anyhow::anyhow!("failed to list fleet clusters: {e:?}"))?;
formatter::output(cfg, &resp)
}

pub async fn instrumented_pods_list(cfg: &Config, cluster_name: String) -> Result<()> {
let api = crate::make_api!(FleetAutomationAPI, cfg);
let resp = api
.list_fleet_instrumented_pods(cluster_name)
.await
.map_err(|e| anyhow::anyhow!("failed to list instrumented pods: {e:?}"))?;
formatter::output(cfg, &resp)
}

#[cfg(test)]
mod tests {

Expand Down Expand Up @@ -375,55 +334,6 @@ mod tests {
cleanup_env();
}

#[tokio::test]
async fn test_fleet_instrumented_pods_list() {
let _lock = lock_env().await;
let mut server = mockito::Server::new_async().await;
let cfg = test_config(&server.url());

let mock = server
.mock(
"GET",
"/api/unstable/fleet/clusters/my-cluster/instrumented_pods",
)
.with_status(200)
.with_header("content-type", "application/json")
.with_body(
r#"{"data":{"type":"cluster_name","id":"my-cluster","attributes":{"groups":[]}}}"#,
)
.create_async()
.await;

let result = super::instrumented_pods_list(&cfg, "my-cluster".into()).await;
assert!(
result.is_ok(),
"instrumented_pods_list failed: {:?}",
result.err()
);
mock.assert_async().await;
cleanup_env();
}

#[tokio::test]
async fn test_fleet_clusters_list() {
let _lock = lock_env().await;
let mut server = mockito::Server::new_async().await;
let cfg = test_config(&server.url());

let mock = server
.mock("GET", "/api/unstable/fleet/clusters")
.with_status(200)
.with_header("content-type", "application/json")
.with_body(r#"{"data":{"type":"status","id":"done","attributes":{"clusters":[]}}}"#)
.create_async()
.await;

let result = super::clusters_list(&cfg, None, None, None, None, false).await;
assert!(result.is_ok(), "clusters_list failed: {:?}", result.err());
mock.assert_async().await;
cleanup_env();
}

#[tokio::test]
async fn test_fleet_deployments_list() {
let _lock = lock_env().await;
Expand Down
98 changes: 0 additions & 98 deletions src/commands/incidents.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
use anyhow::{bail, Result};
use datadog_api_client::datadogV2::api_incident_services::{
GetIncidentServiceOptionalParams, IncidentServicesAPI, ListIncidentServicesOptionalParams,
};
use datadog_api_client::datadogV2::api_incidents::{
CreateGlobalIncidentHandleOptionalParams, GetIncidentOptionalParams,
ImportIncidentOptionalParams, IncidentsAPI, ListGlobalIncidentHandlesOptionalParams,
Expand Down Expand Up @@ -223,64 +220,6 @@ pub async fn postmortem_templates_delete(cfg: &Config, template_id: &str) -> Res
Ok(())
}

// ---------------------------------------------------------------------------
// Incident services
// ---------------------------------------------------------------------------

fn make_services_api(cfg: &Config) -> IncidentServicesAPI {
crate::make_api!(IncidentServicesAPI, cfg)
}

pub async fn services_list(cfg: &Config) -> Result<()> {
let api = make_services_api(cfg);
let resp = api
.list_incident_services(ListIncidentServicesOptionalParams::default())
.await
.map_err(|e| anyhow::anyhow!("failed to list incident services: {:?}", e))?;
formatter::output(cfg, &resp)
}

pub async fn services_get(cfg: &Config, service_id: &str) -> Result<()> {
let api = make_services_api(cfg);
let resp = api
.get_incident_service(
service_id.to_string(),
GetIncidentServiceOptionalParams::default(),
)
.await
.map_err(|e| anyhow::anyhow!("failed to get incident service: {:?}", e))?;
formatter::output(cfg, &resp)
}

pub async fn services_create(cfg: &Config, file: &str) -> Result<()> {
let body = util::read_json_file(file)?;
let api = make_services_api(cfg);
let resp = api
.create_incident_service(body)
.await
.map_err(|e| anyhow::anyhow!("failed to create incident service: {:?}", e))?;
formatter::output(cfg, &resp)
}

pub async fn services_update(cfg: &Config, service_id: &str, file: &str) -> Result<()> {
let body = util::read_json_file(file)?;
let api = make_services_api(cfg);
let resp = api
.update_incident_service(service_id.to_string(), body)
.await
.map_err(|e| anyhow::anyhow!("failed to update incident service: {:?}", e))?;
formatter::output(cfg, &resp)
}

pub async fn services_delete(cfg: &Config, service_id: &str) -> Result<()> {
let api = make_services_api(cfg);
api.delete_incident_service(service_id.to_string())
.await
.map_err(|e| anyhow::anyhow!("failed to delete incident service: {:?}", e))?;
println!("Incident service {service_id} deleted.");
Ok(())
}

// ---- Import ----

pub async fn import(cfg: &Config, file: &str) -> Result<()> {
Expand Down Expand Up @@ -477,41 +416,4 @@ mod tests {
let _ = super::postmortem_templates_list(&cfg).await;
cleanup_env();
}

#[tokio::test]
async fn test_incident_services_list() {
let _lock = lock_env().await;
std::env::set_var("DD_TOKEN_STORAGE", "file");
let mut server = mockito::Server::new_async().await;
let cfg = test_config(&server.url());
let _mock = mock_any(&mut server, "GET", r#"{"data":[],"meta":{}}"#).await;
let result = super::services_list(&cfg).await;
assert!(
result.is_ok(),
"incident services list failed: {:?}",
result.err()
);
cleanup_env();
std::env::remove_var("DD_TOKEN_STORAGE");
}

#[tokio::test]
async fn test_incident_services_list_error() {
let _lock = lock_env().await;
std::env::set_var("DD_TOKEN_STORAGE", "file");
let mut server = mockito::Server::new_async().await;
let cfg = test_config(&server.url());
let _mock = server
.mock("GET", mockito::Matcher::Any)
.match_query(mockito::Matcher::Any)
.with_status(403)
.with_header("content-type", "application/json")
.with_body(r#"{"errors":["Forbidden"]}"#)
.create_async()
.await;
let result = super::services_list(&cfg).await;
assert!(result.is_err(), "incident services list should fail on 403");
cleanup_env();
std::env::remove_var("DD_TOKEN_STORAGE");
}
}
2 changes: 1 addition & 1 deletion src/commands/rum.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ pub async fn playlists_list(cfg: &Config) -> Result<()> {
pub async fn playlists_get(cfg: &Config, playlist_id: i32) -> Result<()> {
let api = crate::make_api!(RumReplayPlaylistsAPI, cfg);
let resp = api
.get_rum_replay_playlist(playlist_id)
.get_rum_replay_playlist(playlist_id as i64)
.await
.map_err(|e| anyhow::anyhow!("failed to get RUM playlist: {e:?}"))?;
formatter::output(cfg, &resp)
Expand Down
2 changes: 1 addition & 1 deletion src/commands/seats.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ fn make_api(cfg: &Config) -> SeatsAPI {

pub async fn users_list(cfg: &Config, product: &str, limit: i32) -> Result<()> {
let api = make_api(cfg);
let params = GetSeatsUsersOptionalParams::default().page_limit(limit);
let params = GetSeatsUsersOptionalParams::default().page_limit(limit as i64);
let resp = api
.get_seats_users(product.to_string(), params)
.await
Expand Down
10 changes: 7 additions & 3 deletions src/commands/security.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,9 @@ use datadog_api_client::datadogV2::api_restriction_policies::{
RestrictionPoliciesAPI, UpdateRestrictionPolicyOptionalParams,
};
use datadog_api_client::datadogV2::api_security_monitoring::{
ListFindingsOptionalParams, ListIndicatorsOfCompromiseOptionalParams,
ListSecurityMonitoringRulesOptionalParams, ListSecurityMonitoringSuppressionsOptionalParams,
GetIndicatorOfCompromiseOptionalParams, ListFindingsOptionalParams,
ListIndicatorsOfCompromiseOptionalParams, ListSecurityMonitoringRulesOptionalParams,
ListSecurityMonitoringSuppressionsOptionalParams,
SearchSecurityMonitoringSignalsOptionalParams, SecurityMonitoringAPI,
};
use datadog_api_client::datadogV2::model::{
Expand Down Expand Up @@ -471,7 +472,10 @@ pub async fn iocs_list(
pub async fn iocs_get(cfg: &Config, indicator: &str) -> Result<()> {
let api = crate::make_api!(SecurityMonitoringAPI, cfg);
let resp = api
.get_indicator_of_compromise(indicator.to_string())
.get_indicator_of_compromise(
indicator.to_string(),
GetIndicatorOfCompromiseOptionalParams::default(),
)
.await
.map_err(|e| anyhow::anyhow!("failed to get indicator of compromise: {e:?}"))?;
formatter::output(cfg, &resp)
Expand Down
4 changes: 2 additions & 2 deletions src/commands/widgets.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,10 @@ pub async fn list(
params = params.sort(s);
}
if let Some(n) = page_number {
params = params.page_number(n);
params = params.page_number(n as i64);
}
if let Some(n) = page_size {
params = params.page_size(n);
params = params.page_size(n as i64);
}

let resp = api
Expand Down
Loading