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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: emqx_schema: comma_separated_atoms() type cannot be configured as a list #10389

Merged
merged 5 commits into from Apr 18, 2023

Conversation

zhongwencool
Copy link
Member

@zhongwencool zhongwencool commented Apr 13, 2023

Fixes EMQX-9005

Summary

馃 Generated by Copilot at 1472a37

This pull request updates the cluster configuration schema and tests to allow more flexible node name formats. It also updates the hocon dependency to enable this feature.

PR Checklist

Please convert it to a draft if any of the following conditions are not met. Reviewers may skip over until all the items are checked:

  • Added tests for the changes
  • Changed lines covered in coverage report
  • Change log has been added to changes/{ce,ee}/(feat|perf|fix)-<PR-id>.en.md files
  • For internal contributor: there is a jira ticket to track this change
  • If there should be document changes, a PR to emqx-docs.git is sent, or a jira ticket is created to follow up
  • Schema changes are backward compatible

Checklist for CI (.github/workflows) changes

  • If changed package build workflow, pass this action (manual trigger)
  • Change log has been added to changes/ dir for user-facing artifacts update

thalesmg
thalesmg previously approved these changes Apr 13, 2023
changes/ce/feat-10389.en.md Outdated Show resolved Hide resolved
thalesmg
thalesmg previously approved these changes Apr 13, 2023
@zhongwencool
Copy link
Member Author

@zmstone something wrong when using hocon 0.39.0

===< Generating: _build/docgen/emqx/config-en.md
{"init terminating in do_boot",{{badmatch,{error,badarg}},[{emqx_conf,gen_config_md,4,[{file,"emqx_conf.erl"},{line,195}]},{emqx_conf,'-dump_schema/3-fun-0-',4,[{file,"emqx_conf.erl"},{line,147}]},{lists,foreach,2,[{file,"lists.erl"},{line,1342}]},{erl_eval,do_apply,6,[{file,"erl_eval.erl"},{line,685}]},{erl_eval,expr,5,[{file,"erl_eval.erl"},{line,446}]},{erl_eval,exprs,5,[{file,"erl_eval.erl"},{line,123}]},{init,start_it,1,[]},{init,start_em,1,[]}]}}
init terminating in do_boot ({{badmatch,{error,badarg}},[{emqx_conf,gen_config_md,4,[{_},{_}]},{emqx_conf,-dump_schema/3-fun-0-,4,[{_},{_}]},{lists,foreach,2,[{_},{_}]},{erl_eval,do_apply,6,[{_},{_}]},{erl_eval,expr,5,[{_},{_}]},{erl_eval,exprs,5,[{_},{_}]},{init,start_it,1,[]},{init,start_em,1,[]}]})

@thalesmg
Copy link
Contributor

@zmstone something wrong when using hocon 0.39.0

===< Generating: _build/docgen/emqx/config-en.md
{"init terminating in do_boot",{{badmatch,{error,badarg}},[{emqx_conf,gen_config_md,4,[{file,"emqx_conf.erl"},{line,195}]},{emqx_conf,'-dump_schema/3-fun-0-',4,[{file,"emqx_conf.erl"},{line,147}]},{lists,foreach,2,[{file,"lists.erl"},{line,1342}]},{erl_eval,do_apply,6,[{file,"erl_eval.erl"},{line,685}]},{erl_eval,expr,5,[{file,"erl_eval.erl"},{line,446}]},{erl_eval,exprs,5,[{file,"erl_eval.erl"},{line,123}]},{init,start_it,1,[]},{init,start_em,1,[]}]}}
init terminating in do_boot ({{badmatch,{error,badarg}},[{emqx_conf,gen_config_md,4,[{_},{_}]},{emqx_conf,-dump_schema/3-fun-0-,4,[{_},{_}]},{lists,foreach,2,[{_},{_}]},{erl_eval,do_apply,6,[{_},{_}]},{erl_eval,expr,5,[{_},{_}]},{erl_eval,exprs,5,[{_},{_}]},{init,start_it,1,[]},{init,start_em,1,[]}]})

I think the latest hocon has this breaking change: emqx/hocon#244

@zhongwencool zhongwencool force-pushed the core-nodes-array branch 2 times, most recently from 3656b30 to 6ba1ec5 Compare April 18, 2023 01:31
Co-authored-by: Thales Macedo Garitezi <thalesmg@gmail.com>
@coveralls
Copy link
Collaborator

Pull Request Test Coverage Report for Build 4727601091

  • 0 of 0 changed or added relevant lines in 0 files are covered.
  • 17 unchanged lines in 9 files lost coverage.
  • Overall coverage increased (+0.08%) to 81.27%

Files with Coverage Reduction New Missed Lines %
apps/emqx_machine/src/emqx_machine.erl 1 77.42%
apps/emqx/src/emqx_broker.erl 1 85.96%
apps/emqx/src/emqx_channel.erl 1 87.64%
apps/emqx/src/emqx_logger_textfmt.erl 1 59.09%
apps/emqx/src/emqx_message.erl 1 94.83%
apps/emqx/src/emqx_sys_mon.erl 1 91.67%
apps/emqx_connector/src/emqx_connector_jwt_worker.erl 2 92.54%
apps/emqx/src/emqx_flapping.erl 3 83.64%
apps/emqx/src/emqx_reason_codes.erl 6 94.12%
Totals Coverage Status
Change from base Build 4724231973: 0.08%
Covered Lines: 25618
Relevant Lines: 31522

馃挍 - Coveralls

Co-authored-by: JianBo He <heeejianbo@163.com>
@zhongwencool zhongwencool merged commit 37c0bad into emqx:master Apr 18, 2023
109 of 110 checks passed
@zhongwencool zhongwencool deleted the core-nodes-array branch April 18, 2023 03:33
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.

None yet

4 participants