Skip to content

Conversation

@ortogonal
Copy link

This fix makes JsonEx::Merge aware of chunked properties and make sure the merged result cleans up "left over" checked properties.

createOptions is one of these chunked properties that needs special handling when merging. If merging a JSON-object that contains createOptions and createOptions01 with a JSON-object that ONLY contains createOptions the original implementation of Merge(...) will keep createOptions01 the the base JSON-object. From a JSON perspective this is correct but from a JSON-object which the chunked property createOptions this is wrong.

The pull-request contains added test-cases for JsonEx::Merge that shows how it handled chunked properties, for example createOptions.

Azure IoT Edge PR checklist:

This checklist is used to make sure that common guidelines for a pull request are followed.

General Guidelines and Best Practices

  • [-] I have read the contribution guidelines.
  • [-] Title of the pull request is clear and informative.
  • [-] Description of the pull request includes a concise summary of the enhancement or bug fix.

Testing Guidelines

  • [-] Pull request includes test coverage for the included changes.
  • Description of the pull request includes
    • [-] concise summary of tests added/modified
    • [-] local testing done.

Draft PRs

  • Open the PR in Draft mode if it is:
    • Work in progress or not intended to be merged.
    • Encountering multiple pipeline failures and working on fixes.

Note: We use the kodiakhq bot to merge PRs once the necessary checks and approvals are in place. When it merges a PR, kodiakhq converts the PR title to the commit title, PR description to the commit description, and squashes all the commits in the PR to a single commit. The net effect is that entire PR becomes a single commit. Please follow the best practices mentioned here for the PR title and description

@ortogonal ortogonal force-pushed the handle-chucked-json-properties-in-merge branch from 35eb257 to 21032fe Compare December 9, 2025 11:51
@ortogonal
Copy link
Author

@microsoft-github-policy-service agree

@ortogonal ortogonal changed the title Fix JsonEx::Merge to handle chunked properties (#7489) Fix JsonEx::Merge to handle chunked properties Dec 9, 2025
@vadim-kovalyov
Copy link
Contributor

Thank you for the contribution, @ortogonal. We are reviewing the PR and will get back to your shortly.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants