Skip to content

[NOT READY] Add OAuth support to remaining 6 commands #342

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

Draft
srosenthal-dd wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

[NOT READY] Add OAuth support to remaining 6 commands #342

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 20 additions & 5 deletions src/commands/authn_mappings.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,10 @@ use crate::util;

pub async fn list(cfg: &Config) -> Result<()> {
let dd_cfg = client::make_dd_config(cfg);
let api = AuthNMappingsAPI::with_config(dd_cfg);
let api = match client::make_bearer_client(cfg) {
Some(c) => AuthNMappingsAPI::with_client_and_config(dd_cfg, c),
None => AuthNMappingsAPI::with_config(dd_cfg),
};
let resp = api
.list_authn_mappings(ListAuthNMappingsOptionalParams::default())
.await
Expand All @@ -21,7 +24,10 @@ pub async fn list(cfg: &Config) -> Result<()> {

pub async fn get(cfg: &Config, mapping_id: &str) -> Result<()> {
let dd_cfg = client::make_dd_config(cfg);
let api = AuthNMappingsAPI::with_config(dd_cfg);
let api = match client::make_bearer_client(cfg) {
Some(c) => AuthNMappingsAPI::with_client_and_config(dd_cfg, c),
None => AuthNMappingsAPI::with_config(dd_cfg),
};
let resp = api
.get_authn_mapping(mapping_id.to_string())
.await
Expand All @@ -32,7 +38,10 @@ pub async fn get(cfg: &Config, mapping_id: &str) -> Result<()> {
pub async fn create(cfg: &Config, file: &str) -> Result<()> {
let body: AuthNMappingCreateRequest = util::read_json_file(file)?;
let dd_cfg = client::make_dd_config(cfg);
let api = AuthNMappingsAPI::with_config(dd_cfg);
let api = match client::make_bearer_client(cfg) {
Some(c) => AuthNMappingsAPI::with_client_and_config(dd_cfg, c),
None => AuthNMappingsAPI::with_config(dd_cfg),
};
let resp = api
.create_authn_mapping(body)
.await
Expand All @@ -43,7 +52,10 @@ pub async fn create(cfg: &Config, file: &str) -> Result<()> {
pub async fn update(cfg: &Config, mapping_id: &str, file: &str) -> Result<()> {
let body: AuthNMappingUpdateRequest = util::read_json_file(file)?;
let dd_cfg = client::make_dd_config(cfg);
let api = AuthNMappingsAPI::with_config(dd_cfg);
let api = match client::make_bearer_client(cfg) {
Some(c) => AuthNMappingsAPI::with_client_and_config(dd_cfg, c),
None => AuthNMappingsAPI::with_config(dd_cfg),
};
let resp = api
.update_authn_mapping(mapping_id.to_string(), body)
.await
Expand All @@ -53,7 +65,10 @@ pub async fn update(cfg: &Config, mapping_id: &str, file: &str) -> Result<()> {

pub async fn delete(cfg: &Config, mapping_id: &str) -> Result<()> {
let dd_cfg = client::make_dd_config(cfg);
let api = AuthNMappingsAPI::with_config(dd_cfg);
let api = match client::make_bearer_client(cfg) {
Some(c) => AuthNMappingsAPI::with_client_and_config(dd_cfg, c),
None => AuthNMappingsAPI::with_config(dd_cfg),
};
api.delete_authn_mapping(mapping_id.to_string())
.await
.map_err(|e| anyhow::anyhow!("failed to delete AuthN mapping: {e:?}"))?;
Expand Down
5 changes: 4 additions & 1 deletion src/commands/data_deletion.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,10 @@ use crate::util;

fn make_api(cfg: &Config) -> DataDeletionAPI {
let dd_cfg = client::make_dd_config(cfg);
DataDeletionAPI::with_config(dd_cfg)
match client::make_bearer_client(cfg) {
Some(c) => DataDeletionAPI::with_client_and_config(dd_cfg, c),
None => DataDeletionAPI::with_config(dd_cfg),
}
}

pub async fn requests_list(
Expand Down
5 changes: 4 additions & 1 deletion src/commands/datasets.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,10 @@ use crate::util;

fn make_api(cfg: &Config) -> DatasetsAPI {
let dd_cfg = client::make_dd_config(cfg);
DatasetsAPI::with_config(dd_cfg)
match client::make_bearer_client(cfg) {
Some(c) => DatasetsAPI::with_client_and_config(dd_cfg, c),
None => DatasetsAPI::with_config(dd_cfg),
}
}

pub async fn list(cfg: &Config) -> Result<()> {
Expand Down
35 changes: 28 additions & 7 deletions src/commands/logs_restriction.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,10 @@ use crate::util;

pub async fn list(cfg: &Config) -> Result<()> {
let dd_cfg = client::make_dd_config(cfg);
let api = LogsRestrictionQueriesAPI::with_config(dd_cfg);
let api = match client::make_bearer_client(cfg) {
Some(c) => LogsRestrictionQueriesAPI::with_client_and_config(dd_cfg, c),
None => LogsRestrictionQueriesAPI::with_config(dd_cfg),
};
let resp = api
.list_restriction_queries(ListRestrictionQueriesOptionalParams::default())
.await
Expand All @@ -21,7 +24,10 @@ pub async fn list(cfg: &Config) -> Result<()> {

pub async fn get(cfg: &Config, query_id: &str) -> Result<()> {
let dd_cfg = client::make_dd_config(cfg);
let api = LogsRestrictionQueriesAPI::with_config(dd_cfg);
let api = match client::make_bearer_client(cfg) {
Some(c) => LogsRestrictionQueriesAPI::with_client_and_config(dd_cfg, c),
None => LogsRestrictionQueriesAPI::with_config(dd_cfg),
};
let resp = api
.get_restriction_query(query_id.to_string())
.await
Expand All @@ -31,7 +37,10 @@ pub async fn get(cfg: &Config, query_id: &str) -> Result<()> {

pub async fn create(cfg: &Config, file: &str) -> Result<()> {
let dd_cfg = client::make_dd_config(cfg);
let api = LogsRestrictionQueriesAPI::with_config(dd_cfg);
let api = match client::make_bearer_client(cfg) {
Some(c) => LogsRestrictionQueriesAPI::with_client_and_config(dd_cfg, c),
None => LogsRestrictionQueriesAPI::with_config(dd_cfg),
};
let body = util::read_json_file(file)?;
let resp = api
.create_restriction_query(body)
Expand All @@ -42,7 +51,10 @@ pub async fn create(cfg: &Config, file: &str) -> Result<()> {

pub async fn update(cfg: &Config, query_id: &str, file: &str) -> Result<()> {
let dd_cfg = client::make_dd_config(cfg);
let api = LogsRestrictionQueriesAPI::with_config(dd_cfg);
let api = match client::make_bearer_client(cfg) {
Some(c) => LogsRestrictionQueriesAPI::with_client_and_config(dd_cfg, c),
None => LogsRestrictionQueriesAPI::with_config(dd_cfg),
};
let body = util::read_json_file(file)?;
let resp = api
.update_restriction_query(query_id.to_string(), body)
Expand All @@ -53,7 +65,10 @@ pub async fn update(cfg: &Config, query_id: &str, file: &str) -> Result<()> {

pub async fn delete(cfg: &Config, query_id: &str) -> Result<()> {
let dd_cfg = client::make_dd_config(cfg);
let api = LogsRestrictionQueriesAPI::with_config(dd_cfg);
let api = match client::make_bearer_client(cfg) {
Some(c) => LogsRestrictionQueriesAPI::with_client_and_config(dd_cfg, c),
None => LogsRestrictionQueriesAPI::with_config(dd_cfg),
};
api.delete_restriction_query(query_id.to_string())
.await
.map_err(|e| anyhow::anyhow!("failed to delete restriction query: {e:?}"))?;
Expand All @@ -63,7 +78,10 @@ pub async fn delete(cfg: &Config, query_id: &str) -> Result<()> {

pub async fn roles_list(cfg: &Config, query_id: &str) -> Result<()> {
let dd_cfg = client::make_dd_config(cfg);
let api = LogsRestrictionQueriesAPI::with_config(dd_cfg);
let api = match client::make_bearer_client(cfg) {
Some(c) => LogsRestrictionQueriesAPI::with_client_and_config(dd_cfg, c),
None => LogsRestrictionQueriesAPI::with_config(dd_cfg),
};
let resp = api
.list_restriction_query_roles(
query_id.to_string(),
Expand All @@ -76,7 +94,10 @@ pub async fn roles_list(cfg: &Config, query_id: &str) -> Result<()> {

pub async fn roles_add(cfg: &Config, query_id: &str, file: &str) -> Result<()> {
let dd_cfg = client::make_dd_config(cfg);
let api = LogsRestrictionQueriesAPI::with_config(dd_cfg);
let api = match client::make_bearer_client(cfg) {
Some(c) => LogsRestrictionQueriesAPI::with_client_and_config(dd_cfg, c),
None => LogsRestrictionQueriesAPI::with_config(dd_cfg),
};
let body = util::read_json_file(file)?;
api.add_role_to_restriction_query(query_id.to_string(), body)
.await
Expand Down
7 changes: 5 additions & 2 deletions src/commands/obs_pipelines.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,11 @@ use crate::formatter;
use crate::util;

fn make_api(cfg: &Config) -> ObservabilityPipelinesAPI {
// Observability Pipelines does not support OAuth — API key auth only.
ObservabilityPipelinesAPI::with_config(client::make_dd_config(cfg))
let dd_cfg = client::make_dd_config(cfg);
match client::make_bearer_client(cfg) {
Some(c) => ObservabilityPipelinesAPI::with_client_and_config(dd_cfg, c),
None => ObservabilityPipelinesAPI::with_config(dd_cfg),
}
}

pub async fn list(cfg: &Config, limit: i64) -> Result<()> {
Expand Down
24 changes: 18 additions & 6 deletions src/commands/workflows.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,15 @@ use crate::formatter::{self, Metadata};
use crate::util;

// ---------------------------------------------------------------------------
// Helper: build a WorkflowAutomationAPI (API key auth only)
// Helper: build a WorkflowAutomationAPI
// ---------------------------------------------------------------------------

fn make_api(cfg: &Config) -> WorkflowAutomationAPI {
let dd_cfg = client::make_dd_config(cfg);
WorkflowAutomationAPI::with_config(dd_cfg)
match client::make_bearer_client(cfg) {
Some(c) => WorkflowAutomationAPI::with_client_and_config(dd_cfg, c),
None => WorkflowAutomationAPI::with_config(dd_cfg),
}
}

// ---------------------------------------------------------------------------
Expand Down Expand Up @@ -65,7 +68,7 @@ pub async fn delete(cfg: &Config, workflow_id: &str) -> Result<()> {
}

// ---------------------------------------------------------------------------
// Workflow execution (API trigger only — requires DD_API_KEY + DD_APP_KEY)
// Workflow execution
// ---------------------------------------------------------------------------

pub async fn run(
Expand All @@ -77,7 +80,10 @@ pub async fn run(
timeout: &str,
) -> Result<()> {
let dd_cfg = client::make_dd_config(cfg);
let api = WorkflowAutomationAPI::with_config(dd_cfg);
let api = match client::make_bearer_client(cfg) {
Some(c) => WorkflowAutomationAPI::with_client_and_config(dd_cfg, c),
None => WorkflowAutomationAPI::with_config(dd_cfg),
};

let input_payload: Option<BTreeMap<String, serde_json::Value>> = match (&payload, &payload_file)
{
Expand Down Expand Up @@ -136,7 +142,10 @@ pub async fn run(
tokio::time::sleep(std::time::Duration::from_secs(2)).await;

let dd_cfg = client::make_dd_config(cfg);
let api = WorkflowAutomationAPI::with_config(dd_cfg);
let api = match client::make_bearer_client(cfg) {
Some(c) => WorkflowAutomationAPI::with_client_and_config(dd_cfg, c),
None => WorkflowAutomationAPI::with_config(dd_cfg),
};
let status = api
.get_workflow_instance(workflow_id.to_string(), instance_id.clone())
.await
Expand Down Expand Up @@ -217,7 +226,10 @@ pub async fn instance_cancel(cfg: &Config, workflow_id: &str, instance_id: &str)

fn make_connection_api(cfg: &Config) -> ActionConnectionAPI {
let dd_cfg = client::make_dd_config(cfg);
ActionConnectionAPI::with_config(dd_cfg)
match client::make_bearer_client(cfg) {
Some(c) => ActionConnectionAPI::with_client_and_config(dd_cfg, c),
None => ActionConnectionAPI::with_config(dd_cfg),
}
}

pub async fn connections_get(cfg: &Config, connection_id: &str) -> Result<()> {
Expand Down