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

fix: Fixed overwrite JSON type configuration being empty #4486

Merged
merged 14 commits into from Jul 30, 2022

Conversation

falser101
Copy link
Member

What's the purpose of this PR

bugfix

Which issue(s) this PR fixes:

Fixes #4483

falser101 and others added 9 commits July 3, 2022 21:59
@codecov-commenter
Copy link

codecov-commenter commented Jul 27, 2022

Codecov Report

Merging #4486 (45830b4) into master (4a61fcb) will increase coverage by 0.00%.
The diff coverage is n/a.

@@            Coverage Diff            @@
##             master    #4486   +/-   ##
=========================================
  Coverage     53.63%   53.64%           
  Complexity     2702     2702           
=========================================
  Files           489      489           
  Lines         15294    15294           
  Branches       1588     1588           
=========================================
+ Hits           8203     8204    +1     
+ Misses         6535     6534    -1     
  Partials        556      556           
Impacted Files Coverage Δ
...ervice/service/ReleaseMessageServiceWithCache.java 84.70% <0.00%> (-1.18%) ⬇️
...ework/apollo/configservice/util/WatchKeysUtil.java 97.95% <0.00%> (+4.08%) ⬆️

Help us with your feedback. Take ten seconds to tell us how you rate us.

@nobodyiam
Copy link
Member

This change seems to bring a new issue: if the user does want to clear the content, it won't work after this fix?

@falser101
Copy link
Member Author

if the user does want to clear the content

Yes, let me make a fix

Signed-off-by: jianfei.zhang <jianfei.zhang@daocloud.io>
@falser101 falser101 added the feature Categorizes issue as related to a new feature. label Jul 28, 2022
@falser101 falser101 requested a review from nobodyiam July 28, 2022 07:40
@falser101
Copy link
Member Author

This change seems to bring a new issue: if the user does want to clear the content, it won't work after this fix?

Done.

@falser101 falser101 added bug Categorizes issue or PR as related to a bug. and removed feature Categorizes issue as related to a new feature. labels Jul 28, 2022
Signed-off-by: jianfei.zhang <jianfei.zhang@daocloud.io>
@falser101 falser101 requested a review from nobodyiam July 28, 2022 15:10
@nobodyiam
Copy link
Member

Looks good to me, would you please also update the CHANGES.md?

@falser101 falser101 changed the title Fix/json update fix: Fixed overwrite JSON type configuration being empty Jul 29, 2022
Signed-off-by: jianfei.zhang <jianfei.zhang@daocloud.io>
@falser101
Copy link
Member Author

Looks good to me, would you please also update the CHANGES.md?

Done.

Copy link
Member

@nobodyiam nobodyiam left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@nobodyiam nobodyiam merged commit 4272471 into apolloconfig:master Jul 30, 2022
@github-actions github-actions bot locked and limited conversation to collaborators Jul 30, 2022
@falser101 falser101 deleted the fix/json_update branch July 30, 2022 02:27
@nobodyiam nobodyiam added this to the 2.1.0 milestone Feb 5, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
bug Categorizes issue or PR as related to a bug.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

某些场景下覆盖json类型的配置会导致配置为空
3 participants