Skip to content

Enable OAuth on remaining API+App Key endpoints: 100% client-side coverage #832

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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
platinummonkey merged 2 commits into from
Sep 16, 2026
Merged

Enable OAuth on remaining API+App Key endpoints: 100% client-side coverage #832

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
5eb3246
Drop stale OAuth exclusions for fleet and profiling
srosenthal-dd Sep 16, 2026
02e65e8
Simplify exclusion tests and soften table comment
srosenthal-dd Sep 16, 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
12 changes: 6 additions & 6 deletions src/commands/api.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -872,11 +872,11 @@ mod tests {
cleanup_env();
}

/// OAuth-excluded endpoints (e.g. GET /api/unstable/fleet/some-id) must use API-key
/// OAuth-excluded endpoints (e.g. GET /api/v2/validate_keys) must use API-key
/// auth even when a bearer token is present. This exercises the reuse of
/// raw_client::apply_auth's per-endpoint fallback table.
///
/// Uses the still-excluded unstable Fleet entry as the example.
/// Uses the indefinitely-exempt validate_keys entry as the example.
#[tokio::test]
async fn test_api_oauth_excluded_uses_api_keys() {
let _lock = lock_env().await;
Expand All @@ -886,7 +886,7 @@ mod tests {
// must prefer the API keys.
cfg.access_token = Some("bearer-token".into());
let _mock = server
.mock("GET", "/api/unstable/fleet/some-id")
.mock("GET", "/api/v2/validate_keys")
.match_query(mockito::Matcher::Any)
.match_header("DD-API-KEY", "test-api-key")
.match_header("DD-APPLICATION-KEY", "test-app-key")
Expand All @@ -899,7 +899,7 @@ mod tests {

let result = super::run(
&cfg,
"unstable/fleet/some-id",
"v2/validate_keys",
"GET",
&[],
&[],
Expand Down Expand Up @@ -927,7 +927,7 @@ mod tests {
let mut cfg = test_config(&server.url());
cfg.access_token = Some("bearer-token".into());
let _mock = server
.mock("GET", "/api/unstable/fleet/some-id")
.mock("GET", "/api/v2/validate_keys")
.match_query(mockito::Matcher::Any)
.match_header("DD-API-KEY", "test-api-key")
.match_header("authorization", mockito::Matcher::Missing)
Expand All @@ -938,7 +938,7 @@ mod tests {
.await;

// Pass the fully-qualified URL, not a relative path.
let absolute = format!("{}/api/unstable/fleet/some-id", server.url());
let absolute = format!("{}/api/v2/validate_keys", server.url());
let result = super::run(
&cfg,
&absolute,
Expand Down
Loading