Scope current_user lookup to policy-carrying resources#622
Merged
Conversation
Adds BaseResource._fetch_destination_org_principal(has_policy) helper. monitors, synthetics_tests, restriction_policies use it in pre_apply_hook to skip GET /api/v2/current_user when no source resource carries a restriction_policy. Addresses non-blocking review comment on #616. Removes an unnecessary API call and failure dependency for policy-free syncs. Ref: HAMR-392
…fires PR 622 scopes the current_user org lookup to policy-carrying source resources, so the helper short-circuits and skips the GET when source state has no such resource. The restriction_policies unit tests built a bare mock state, leaving the gate closed — so org_principal was never set and the failure path never raised. Seed a policy-carrying resource into source state so the GET (and its error path) is exercised, matching the monitors/synthetics test pattern. Also add an empty-source skip-path test for parity. Environment: Datadog workspace Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
nathantournant
approved these changes
Jul 10, 2026
nathantournant
left a comment
nathantournant
left a comment
Member
There was a problem hiding this comment.
Approving — the scoped current_user lookup is a solid reliability fix (no more aborting policy-free syncs on a current_user permission/shape failure), and the gate correctly matches the remap-consumption condition. Pushed a small follow-up to seed source state in test_restriction_policies.py so the current_user GET (and its failure path) is actually exercised; CI is now green across all jobs.
Contributor
Author
|
Thanks @nathantournant — much appreciated for the test-state seed fix. That's the exact patch I was about to push based on a Codex review flagging the same P1. Pulled your commit locally. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Follow-up to #616 addressing @nathantournant's non-blocking review comment: only fetch destination org UUID when at least one source resource actually carries a
restriction_policy.Change
BaseResource._fetch_destination_org_principal(has_policy)scansstate.source[resource_type]and callsGET /api/v2/current_useronly when the predicate matches.monitors.py,synthetics_tests.py,restriction_policies.pypre_apply_hooknow delegate to the helper. Behavior unchanged when policies exist; skipped entirely otherwise.Motivation
@nathantournant: "On destinations where credentials lack current_user access (or on a transient failure / unexpected response shape → KeyError), this would abort the whole synthetics sync rather than just the affected resources."
After this PR: syncs that carry no
restriction_policydon't touch/api/v2/current_userat all — no unnecessary call, no new failure dependency.Ref: HAMR-392