Skip to content
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.

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

Allow empty configuration merging #2432

Merged
merged 3 commits into from
Jan 11, 2024

Conversation

MatteoPologruto
Copy link
Contributor

@MatteoPologruto MatteoPologruto commented Nov 22, 2023

Please check if the PR fulfills these requirements

See how to contribute

  • The PR has no duplicates (please search among the Pull Requests
    before creating one)
  • The PR follows
    our contributing guidelines
  • Tests for the changes have been added (for bug fixes / features)
  • Docs have been added / updated (for bug fixes / features)
  • UPGRADING.md has been updated with a migration guide (for breaking changes)
  • configuration.schema.json updated if new parameters are added.

What kind of change does this PR introduce?

Code enhancement

What is the current behavior?

It is not possible to merge empty values to delete elements inside the configuration.

What is the new behavior?

It is possible to delete non-defaults elements inside the configuration using an empty value. A full json configuration must be passed to the merge command.

Does this PR introduce a breaking change, and is titled accordingly?

Other information

@MatteoPologruto MatteoPologruto added type: enhancement Proposed improvement topic: code Related to content of the project itself topic: gRPC Related to the gRPC interface labels Nov 22, 2023
@MatteoPologruto MatteoPologruto self-assigned this Nov 22, 2023
Copy link

codecov bot commented Jan 8, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (95753fc) 68.85% compared to head (c7719c1) 68.86%.
Report is 4 commits behind head on master.

Additional details and impacted files
@@           Coverage Diff           @@
##           master    #2432   +/-   ##
=======================================
  Coverage   68.85%   68.86%           
=======================================
  Files         204      204           
  Lines       20465    20470    +5     
=======================================
+ Hits        14091    14096    +5     
  Misses       5220     5220           
  Partials     1154     1154           
Flag Coverage Δ
unit 68.86% <100.00%> (+<0.01%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@MatteoPologruto MatteoPologruto marked this pull request as ready for review January 8, 2024 14:15
@umbynos umbynos merged commit 74a99aa into arduino:master Jan 11, 2024
98 checks passed
@MatteoPologruto MatteoPologruto deleted the marge-empty-config branch January 11, 2024 11:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
topic: code Related to content of the project itself topic: gRPC Related to the gRPC interface type: enhancement Proposed improvement
Projects
None yet
Development

Successfully merging this pull request may close these issues.

SettingsService#Merge and SettingsService#Write work incorrectly between daemon sessions
4 participants