Skip to content

Pre-sort map keys inside list items in _tests.yaml fixtures#3027

Merged
bgoldberg122 merged 3 commits into
DataDog:masterfrom
vinckama:vincent.roy/3674
Jun 15, 2026
Merged

Pre-sort map keys inside list items in _tests.yaml fixtures#3027
bgoldberg122 merged 3 commits into
DataDog:masterfrom
vinckama:vincent.roy/3674

Conversation

@vinckama

@vinckama vinckama commented Jun 8, 2026

Copy link
Copy Markdown
Contributor

What does this PR do?

Pre-sort map keys inside list-item maps in _tests.yaml pipeline test fixtures, to avoid a spurious diff when the upstream change lands.

MapHelper.deepSort currently sorts map keys recursively at all depths but stops when it encounters a list — maps nested inside list items are left unsorted. A pending change (logs-backend#138681) extends deepSort to also recurse into lists, so maps inside list items will have their keys sorted the next time fixtures are regenerated.

This PR proactively applies that same ordering so the regeneration produces no diff.

@vinckama vinckama requested a review from a team as a code owner June 8, 2026 16:14
thibaultkrebs
thibaultkrebs previously approved these changes Jun 9, 2026
@vinckama

Copy link
Copy Markdown
Contributor Author

/merge

@gh-worker-devflow-routing-ef8351

gh-worker-devflow-routing-ef8351 Bot commented Jun 10, 2026

Copy link
Copy Markdown

View all feedbacks in Devflow UI.

2026-06-10 07:55:06 UTC ℹ️ Start processing command /merge


2026-06-10 07:55:13 UTC ℹ️ MergeQueue: waiting for PR to be ready

This pull request is not mergeable according to GitHub. Common reasons include pending required checks, missing approvals, or merge conflicts — but it could also be blocked by other repository rules or settings.
It will be added to the queue as soon as checks pass and/or get approvals. View in MergeQueue UI.
Note: if you pushed new commits since the last approval, you may need additional approval.
You can remove it from the waiting list with /remove command.


2026-06-10 12:19:08 UTC ⚠️ MergeQueue: This merge request was unqueued

devflow unqueued this merge request: It did not become mergeable within the expected time

@temporal-github-worker-1 temporal-github-worker-1 Bot dismissed thibaultkrebs’s stale review June 15, 2026 11:55

Review from thibaultkrebs is dismissed. Related teams and files:

  • logs-integrations-reviewers
    • contrast_security_adr/assets/logs/contrast-security-adr_tests.yaml
    • doppler/assets/logs/doppler_tests.yaml
    • f5-distributed-cloud/assets/logs/f5-distributed-cloud-services_tests.yaml
    • jamf_protect/assets/logs/jamfprotect_tests.yaml
    • lacework/assets/logs/lacework_tests.yaml
    • loadrunner_professional/assets/logs/loadrunner_professional_tests.yaml
    • vercel/assets/logs/vercel_tests.yaml
@bgoldberg122 bgoldberg122 enabled auto-merge June 15, 2026 17:58
@bgoldberg122 bgoldberg122 added this pull request to the merge queue Jun 15, 2026
Merged via the queue into DataDog:master with commit be9a44f Jun 15, 2026
34 of 36 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants