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(conf cli): don't crash when diffing missing key #13996

Merged

Conversation

thalesmg
Copy link
Contributor

Fixes https://emqx.atlassian.net/browse/EMQX-13004

Release version: v/e5.8.2

Summary

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
  • Added property-based tests for code which performs user input validation
  • Changed lines covered in coverage report
  • Change log has been added to changes/(ce|ee)/(feat|perf|fix|breaking)-<PR-id>.en.md files
  • For internal contributor: there is a jira ticket to track this change
  • Created PR to emqx-docs if documentation update is required, or link to a follow-up jira ticket
  • 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 force-pushed the 20241014-m-fix-print-inconsist-mapget branch from 995a74a to bd9df1c Compare October 14, 2024 21:06
@thalesmg thalesmg marked this pull request as ready for review October 15, 2024 16:09
@thalesmg thalesmg requested a review from a team as a code owner October 15, 2024 16:09
@@ -855,7 +857,7 @@ print_inconsistent_conf(New, Old, Options) ->
target := {Target, TargetTnxId},
node := {Node, NodeTnxId}
} = Options,
emqx_ctl:print("~ts(tnx_id=~w)'s ~s is diff from ~ts(tnx_id=~w).~n", [
emqx_ctl:print("~ts(tnx_id=~w)'s ~s is different from ~ts(tnx_id=~w).~n", [
Copy link
Contributor

Choose a reason for hiding this comment

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

Nit / Q: Why is it tnx and not txn, which is a common abbreviation for transaction?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Good question. I can only guess. Maybe who wrote this initially is not familiar with that convention, or it's a typo that got carried by copy-and-pasting. 🤔

@thalesmg thalesmg merged commit 1d701a8 into emqx:master Oct 16, 2024
195 checks passed
@thalesmg thalesmg deleted the 20241014-m-fix-print-inconsist-mapget branch October 16, 2024 12:23
@emqxqa
Copy link

emqxqa commented Oct 22, 2024

TestExecution

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.

3 participants