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

Remove legacy CLI commands #4160

Merged
merged 8 commits into from
Nov 24, 2023
Merged

Remove legacy CLI commands #4160

merged 8 commits into from
Nov 24, 2023

Conversation

jacekwegr
Copy link
Contributor

@jacekwegr jacekwegr commented Nov 6, 2023

This pull request removes outdated command-line interface commands, along with their associated configuration options and tests. Additionally, it removes the mnesia command when executed without arguments, as its functionality is already covered by the systemInfo command.

@mongoose-im

This comment was marked as outdated.

@mongoose-im

This comment was marked as outdated.

@mongoose-im

This comment was marked as outdated.

@mongoose-im

This comment was marked as outdated.

@mongoose-im

This comment was marked as outdated.

@mongoose-im

This comment was marked as outdated.

@mongoose-im

This comment was marked as outdated.

Copy link

codecov bot commented Nov 13, 2023

Codecov Report

Attention: 3 lines in your changes are missing coverage. Please review.

Comparison is base (07c2263) 84.03% compared to head (d51f4fc) 84.29%.
Report is 4 commits behind head on master.

Files Patch % Lines
src/ejabberd_ctl.erl 90.62% 3 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##           master    #4160      +/-   ##
==========================================
+ Coverage   84.03%   84.29%   +0.26%     
==========================================
  Files         564      550      -14     
  Lines       34064    33413     -651     
==========================================
- Hits        28625    28165     -460     
+ Misses       5439     5248     -191     

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

@jacekwegr jacekwegr force-pushed the remove-legacy-cli-commands branch 2 times, most recently from fcb3d76 to bcb0e77 Compare November 14, 2023 10:17
@mongoose-im

This comment was marked as outdated.

@esl esl deleted a comment from mongoose-im Nov 14, 2023
@mongoose-im

This comment was marked as outdated.

@mongoose-im

This comment was marked as outdated.

@mongoose-im

This comment was marked as outdated.

@mongoose-im

This comment was marked as outdated.

@mongoose-im

This comment was marked as outdated.

@jacekwegr jacekwegr marked this pull request as ready for review November 16, 2023 11:04
Copy link
Member

@chrzaszcz chrzaszcz left a comment

Choose a reason for hiding this comment

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

Nice to see the all the cleanup. The main issue I see is that some commands were partially removed, e.g. mongooseimctl still has a lot of scripting around commands like join_cluster. Furthermore, removal of such commands would break our Docker and Helm installations. Finally, these commands were not clearly marked as deprecated. Details in comments.

src/mongoose_account_api.erl Outdated Show resolved Hide resolved
src/mod_roster.erl Outdated Show resolved Hide resolved
src/ejabberd_ctl.erl Show resolved Hide resolved
src/ejabberd_ctl.erl Outdated Show resolved Hide resolved
src/ejabberd_ctl.erl Show resolved Hide resolved
src/ejabberd_ctl.erl Outdated Show resolved Hide resolved
rel/files/mongooseimctl Outdated Show resolved Hide resolved
doc/migrations/6.1.0_6.2.0.md Outdated Show resolved Hide resolved
big_tests/tests/cluster_commands_SUITE.erl Outdated Show resolved Hide resolved
@mongoose-im

This comment was marked as outdated.

@jacekwegr jacekwegr force-pushed the remove-legacy-cli-commands branch 2 times, most recently from 3b3d515 to 5f265e4 Compare November 17, 2023 15:33
@mongoose-im

This comment was marked as outdated.

@mongoose-im

This comment was marked as outdated.

@mongoose-im

This comment was marked as outdated.

@mongoose-im

This comment was marked as outdated.

@mongoose-im

This comment was marked as outdated.

Copy link
Member

@chrzaszcz chrzaszcz left a comment

Choose a reason for hiding this comment

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

Looks really good 👍

src/ejabberd_ctl.erl Outdated Show resolved Hide resolved
src/ejabberd_ctl.erl Outdated Show resolved Hide resolved
src/ejabberd_ctl.erl Outdated Show resolved Hide resolved
src/ejabberd_ctl.erl Outdated Show resolved Hide resolved
@mongoose-im

This comment was marked as outdated.

@mongoose-im

This comment was marked as outdated.

Copy link
Member

@chrzaszcz chrzaszcz left a comment

Choose a reason for hiding this comment

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

A few minor comments from me

src/ejabberd_ctl.erl Outdated Show resolved Hide resolved
src/ejabberd_ctl.erl Outdated Show resolved Hide resolved
src/ejabberd_ctl.erl Outdated Show resolved Hide resolved
@mongoose-im
Copy link
Collaborator

mongoose-im commented Nov 24, 2023

elasticsearch_and_cassandra_26 / elasticsearch_and_cassandra_mnesia / d51f4fc
Reports root/ big
OK: 368 / Failed: 0 / User-skipped: 38 / Auto-skipped: 0


small_tests_25 / small_tests / d51f4fc
Reports root / small


small_tests_26 / small_tests / d51f4fc
Reports root / small


small_tests_26_arm64 / small_tests / d51f4fc
Reports root / small


ldap_mnesia_25 / ldap_mnesia / d51f4fc
Reports root/ big
OK: 2267 / Failed: 0 / User-skipped: 839 / Auto-skipped: 0


dynamic_domains_mysql_redis_26 / mysql_redis / d51f4fc
Reports root/ big
OK: 4183 / Failed: 0 / User-skipped: 135 / Auto-skipped: 0


ldap_mnesia_26 / ldap_mnesia / d51f4fc
Reports root/ big
OK: 2267 / Failed: 0 / User-skipped: 839 / Auto-skipped: 0


dynamic_domains_pgsql_mnesia_26 / pgsql_mnesia / d51f4fc
Reports root/ big
OK: 4216 / Failed: 0 / User-skipped: 102 / Auto-skipped: 0


pgsql_cets_26 / pgsql_cets / d51f4fc
Reports root/ big
OK: 4264 / Failed: 0 / User-skipped: 110 / Auto-skipped: 0


internal_mnesia_26 / internal_mnesia / d51f4fc
Reports root/ big
OK: 2407 / Failed: 0 / User-skipped: 699 / Auto-skipped: 0


dynamic_domains_mssql_mnesia_26 / odbc_mssql_mnesia / d51f4fc
Reports root/ big
OK: 4212 / Failed: 1 / User-skipped: 105 / Auto-skipped: 0

muc_SUITE:register:user_submits_registration_form_twice
{error,
  {{assertion_failed,assert,is_iq_result,
     [{xmlel,<<"iq">>,
        [{<<"type">>,<<"set">>},
         {<<"id">>,<<"4fd3318a89013a6160c6e688035cfb19">>},
         {<<"to">>,<<"groupchats.domain.example.com">>}],
        [{xmlel,<<"query">>,
           [{<<"xmlns">>,<<"jabber:iq:register">>}],
           [{xmlel,<<"x">>,
            [{<<"xmlns">>,<<"jabber:x:data">>},
             {<<"type">>,<<"submit">>}],
            [{xmlel,<<"field">>,
               [{<<"type">>,<<"hidden">>},
                {<<"var">>,<<"FORM_TYPE">>}],
               [{xmlel,<<"value">>,[],
                  [{xmlcdata,<<"jabber:iq:register">>}]}]},
             {xmlel,<<"field">>,
               [{<<"type">>,<<"text-single">>},
                {<<"var">>,<<"nick">>}],
               [{xmlel,<<"value">>,[],
                  [{xmlcdata,
                     <<"thirdwitchroom-a56e1ea50d">>}]}]}]}]}]}],
     {xmlel,<<"iq">>,
       [{<<"from">>,<<"groupchats.domain.example.com">>},
        {<<"to">>,
         <<"alice_user_submits_registration_form_twice_2611@domain.example.com/res1">>},
        {<<"type">>,<<"error">>},
        {<<"id">>,<<"4fd3318a89013a6160c6e688035cfb19">>}],
       [{xmlel,<<"query">>,
          [{<<"xmlns">>,<<"jabber:iq:register">>}],
          [{xmlel,<<"x">>,
             [{<<"xmlns">>,<<"jabber:x:data">>},
            {<<"type">>,<<"submit">>}],
             [{xmlel,<<"field">>,
              [{<<"type">>,<<"hidden">>},
               {<<"var">>,<<"FORM_TYPE">>}],
...

Report log


pgsql_mnesia_25 / pgsql_mnesia / d51f4fc
Reports root/ big
OK: 4605 / Failed: 0 / User-skipped: 109 / Auto-skipped: 0


pgsql_mnesia_26 / pgsql_mnesia / d51f4fc
Reports root/ big
OK: 4605 / Failed: 0 / User-skipped: 109 / Auto-skipped: 0


mysql_redis_26 / mysql_redis / d51f4fc
Reports root/ big
OK: 4584 / Failed: 0 / User-skipped: 130 / Auto-skipped: 0


mssql_mnesia_26 / odbc_mssql_mnesia / d51f4fc
Reports root/ big
OK: 4602 / Failed: 0 / User-skipped: 112 / Auto-skipped: 0

graphql_muc_light_SUITE:admin_cli:admin_muc_light:end_per_group
{error,
 {{unregistering_failed,
   {amount,1},
   {unregistered_items,
  [{{<<"_admin_delete_room_1126">>,
     [{escalus_event_mgr,<0.24524.0>},
    {tc_name,admin_delete_room},
    {escalus_cleaner,<0.24523.0>},
    {watchdog,<0.24522.0>},
    {muc_light_host,<<"muclight.localhost">>},
    {secondary_muc_light_host,<<"muclight.localhost.bis">>},
    {protocol,cli},
    {schema_endpoint,admin},
    {{ejabberd_cwd,mongooseim@localhost},
     "/home/circleci/project/_build/mim1/rel/mongooseim"},
    {preset,"odbc_mssql_mnesia"},
    {mim_data_dir,
     "/home/circleci/project/big_tests/tests/graphql_muc_light_SUITE_data"},
    {tc_logfile,
     "https://circleci-mim-results.s3.eu-central-1.amazonaws.com/PR/4160/200780/odbc_mssql_mnesia.26.1.2-amd64/big/ct_run.test%40a2158090244d.2023-11-24_08.05.14/big_tests.tests.graphql_muc_light_SUITE.logs/run.2023-11-24_08.09.50/graphql_muc_light_suite.admin_delete_room.43651.html"},
    {tc_group_properties,[{name,admin_muc_light}]},
    {tc_group_path,[[{name,admin_cli}]]},
    {data_dir,
     "/home/circleci/project/big_tests/_build/default/lib/mongoose_tests/ebin/graphql_muc_light_SUITE_data/"},
    {priv_dir,
     "https://circleci-mim-results.s3.eu-central-1.amazonaws.com/PR/4160/200780/odbc_mssql_mnesia.26.1.2-amd64/big/ct_run.test%40a2158090244d.2023-11-24_08.05.14/big_tests.tests.graphql_muc_light_SUITE.logs/run.2023-11-24_08.09.50/log_private/"},
    {{saved_modules,mongooseim@localhost,<<"localhost">>},
     #{mod_vcard =>
      #{matches => 30,
        host => {prefix,<<"vjud.">>},
        search => true,backend => rdbms,iqdisc => parallel},
       mod_roster ...

Report log


dynamic_domains_pgsql_mnesia_25 / pgsql_mnesia / d51f4fc
Reports root/ big
OK: 4216 / Failed: 0 / User-skipped: 102 / Auto-skipped: 0


dynamic_domains_mssql_mnesia_26 / odbc_mssql_mnesia / d51f4fc
Reports root/ big
OK: 4213 / Failed: 0 / User-skipped: 105 / Auto-skipped: 0

Copy link
Member

@chrzaszcz chrzaszcz left a comment

Choose a reason for hiding this comment

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

👌

@chrzaszcz chrzaszcz merged commit 3619f12 into master Nov 24, 2023
4 checks passed
@chrzaszcz chrzaszcz deleted the remove-legacy-cli-commands branch November 24, 2023 09:59
@chrzaszcz chrzaszcz added this to the 6.2.0 milestone Dec 11, 2023
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