Skip to content

fix(integration): clear caplog before diffs and handle non-recurrence downtime dates #730

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
michael-richey merged 1 commit into from
Sep 30, 2026
Merged

fix(integration): clear caplog before diffs and handle non-recurrence downtime dates #730

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
2 changes: 1 addition & 1 deletion datadog_sync/utils/resource_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ def give_up_diffing(self, level, diff_instance) -> bool:
return False


RECURRENCE_START_ATTR_PATH_RE = r"root\['attributes'\]\['schedule'\]\['recurrences'\]\[[0-9]+\]\['start'\]"
RECURRENCE_START_ATTR_PATH_RE = r"root\['attributes'\]\['schedule'\](?:\['recurrences'\]\[[0-9]+\])?\['start'\]"


class DowntimeSchedulesDateOperator(BaseOperator):
Expand Down
8 changes: 8 additions & 0 deletions tests/integration/helpers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,10 @@ def test_resource_import(self, runner, caplog):
source_resources, _ = open_resources(self.resource_type)
assert len(source_resources) > 0

# Clear caplog so import-phase skip messages don't leak into the diffs
# assertion below (e.g. canceled downtimes skipped during import).
caplog.clear()

# Disable skipping on resource connection failure
# From stdout, count the number of resources to be added and ensure they match the import len()
diff_cmd = [
Expand Down Expand Up @@ -414,6 +418,10 @@ def test_resource_import_per_file(self, runner, caplog):
":", "."
), f"Resource with ID {resource_id} should have a file with {file_id}"

# Clear caplog so import-phase skip messages don't leak into the diffs
# assertion below (e.g. canceled downtimes skipped during import).
caplog.clear()

# Run diffs to ensure everything is recognized properly
ret = runner.invoke(
cli,
Expand Down
Loading