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.

Sign up for GitHub

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

Jump to bottom

Remove custom eldap.hrl #3647

Merged
merged 1 commit into from
May 13, 2022
Merged

Remove custom eldap.hrl #3647

merged 1 commit into from
May 13, 2022

Conversation

chrzaszcz
Copy link
Member

@chrzaszcz chrzaszcz commented May 12, 2022 •
edited
Loading

This custom eldap.hrl file is not needed as the one from the OTP eldap library could be used instead.
The custom one got broken when the record definition changed in OTP 24.3, so LDAP connections were unusable with the newest OTP versions.

Use eldap.hrl from OTP
f39a1c9 
The custom one got out of date in OTP 24.3 and the code stopped working.
It is better to use the original one.
@chrzaszcz chrzaszcz changed the base branch from master to pool-config-rework May 12, 2022 13:40
@mongoose-im
Copy link
Collaborator

mongoose-im commented May 12, 2022 •
edited
Loading

small_tests_24 / small_tests / f39a1c9
Reports root / small

small_tests_23 / small_tests / f39a1c9
Reports root / small

dynamic_domains_pgsql_mnesia_24 / pgsql_mnesia / f39a1c9
Reports root/ big
OK: 2861 / Failed: 0 / User-skipped: 133 / Auto-skipped: 0

dynamic_domains_mysql_redis_24 / mysql_redis / f39a1c9
Reports root/ big
OK: 2844 / Failed: 0 / User-skipped: 150 / Auto-skipped: 0

dynamic_domains_pgsql_mnesia_23 / pgsql_mnesia / f39a1c9
Reports root/ big
OK: 2861 / Failed: 0 / User-skipped: 133 / Auto-skipped: 0

ldap_mnesia_23 / ldap_mnesia / f39a1c9
Reports root/ big
OK: 1506 / Failed: 0 / User-skipped: 402 / Auto-skipped: 0

dynamic_domains_mssql_mnesia_24 / odbc_mssql_mnesia / f39a1c9
Reports root/ big
OK: 2861 / Failed: 0 / User-skipped: 133 / Auto-skipped: 0

ldap_mnesia_24 / ldap_mnesia / f39a1c9
Reports root/ big
OK: 1506 / Failed: 0 / User-skipped: 402 / Auto-skipped: 0

internal_mnesia_24 / internal_mnesia / f39a1c9
Reports root/ big
OK: 1547 / Failed: 0 / User-skipped: 361 / Auto-skipped: 0

elasticsearch_and_cassandra_24 / elasticsearch_and_cassandra_mnesia / f39a1c9
Reports root/ big
OK: 1854 / Failed: 0 / User-skipped: 369 / Auto-skipped: 0

pgsql_mnesia_24 / pgsql_mnesia / f39a1c9
Reports root/ big
OK: 3235 / Failed: 0 / User-skipped: 142 / Auto-skipped: 0

pgsql_mnesia_23 / pgsql_mnesia / f39a1c9
Reports root/ big
OK: 3235 / Failed: 0 / User-skipped: 142 / Auto-skipped: 0

mysql_redis_24 / mysql_redis / f39a1c9
Reports root/ big
OK: 3230 / Failed: 0 / User-skipped: 147 / Auto-skipped: 0

riak_mnesia_24 / riak_mnesia / f39a1c9
Reports root/ big
OK: 1697 / Failed: 0 / User-skipped: 368 / Auto-skipped: 0

mssql_mnesia_24 / odbc_mssql_mnesia / f39a1c9
Reports root/ big
OK: 3246 / Failed: 1 / User-skipped: 142 / Auto-skipped: 0

pep_SUITE:pep_tests:unsubscribe_after_presence_unsubscription 
{error,
  {{badmatch,
     [{xmlel,<<"message">>,
        [{<<"from">>,
        <<"alice_unsubscribe_after_presence_unsubscription_1978@localhost">>},
         {<<"to">>,
        <<"bob_unsubscribe_after_presence_unsubscription_1978@localhost/res1">>},
         {<<"type">>,<<"headline">>}],
        [{xmlel,<<"event">>,
           [{<<"xmlns">>,
           <<"http://jabber.org/protocol/pubsub#event">>}],
           [{xmlel,<<"items">>,
            [{<<"node">>,<<"iRrs32vWIVMPSssDlQM9QQ==">>}],
            [{xmlel,<<"item">>,
               [{<<"id">>,<<"salmon">>}],
               [{xmlel,<<"entry">>,
                  [{<<"xmlns">>,
                  <<"http://www.w3.org/2005/Atom">>}],
                  []}]}]}]},
         {xmlel,<<"headers">>,
           [{<<"xmlns">>,<<"http://jabber.org/protocol/shim">>}],
           []}]}]},
   [{pep_SUITE,'-unsubscribe_after_presence_unsubscription/1-fun-0-',2,
      [{file,"/home/circleci/project/big_tests/tests/pep_SUITE.erl"},
       {line,384}]},
    {escalus_story,story,4,
      [{file,
         "/home/circleci/project/big_tests/_build/default/lib/escalus/src/escalus_story.erl"},
       {line,72}]},
    {test_server,ts_tc,3,[{file,"test_server.erl"},{line,1783}]},
    {test_server,run_test_case_eval1,6,
      [{file,"test_server.erl"},{line,1292}]},
    {test_server,run_test_case_eval,9,
      [{file,"test_server.erl"},{line,1224}]}]}}

Report log

@codecov
Copy link

codecov bot commented May 12, 2022 •
edited
Loading

Codecov Report

Merging #3647 (36e24f4) into pool-config-rework (8316f89) will decrease coverage by 0.03%.
The diff coverage is n/a.

❗ Current head 36e24f4 differs from pull request most recent head f39a1c9. Consider uploading reports for the commit f39a1c9 to get more accurate results

@@                  Coverage Diff                   @@
##           pool-config-rework    #3647      +/-   ##
======================================================
- Coverage               81.04%   81.00%   -0.04%     
======================================================
  Files                     428      428              
  Lines                   31912    31912              
======================================================
- Hits                    25863    25851      -12     
- Misses                   6049     6061      +12
Impacted Files Coverage Δ
src/auth/ejabberd_auth_ldap.erl 70.42% <ø> (ø)
src/eldap_pool.erl 90.47% <ø> (ø)
src/eldap_utils.erl 50.45% <ø> (ø)
src/mod_shared_roster_ldap.erl 62.68% <ø> (ø)
src/mongoose_ldap_worker.erl 41.86% <ø> (ø)
src/vcard/mod_vcard_ldap.erl 92.66% <ø> (ø)
src/elasticsearch/mongoose_elasticsearch.erl 76.92% <0.00%> (-7.70%) ⬇️
src/metrics/mongoose_metrics.erl 86.85% <0.00%> (-5.72%) ⬇️
src/mam/mod_mam_elasticsearch_arch.erl 85.08% <0.00%> (-1.76%) ⬇️
src/inbox/mod_inbox_rdbms_async.erl 71.64% <0.00%> (-1.50%) ⬇️
... and 8 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 8316f89...f39a1c9. Read the comment docs.

@chrzaszcz chrzaszcz marked this pull request as ready for review May 12, 2022 14:00
@mongoose-im
Copy link
Collaborator

mongoose-im commented May 12, 2022 •
edited
Loading

small_tests_23 / small_tests / 36e24f4
Reports root / small

small_tests_24 / small_tests / 36e24f4
Reports root / small

dynamic_domains_pgsql_mnesia_23 / pgsql_mnesia / 36e24f4
Reports root/ big
OK: 2861 / Failed: 0 / User-skipped: 133 / Auto-skipped: 0

ldap_mnesia_23 / ldap_mnesia / 36e24f4
Reports root/ big
OK: 1506 / Failed: 0 / User-skipped: 402 / Auto-skipped: 0

dynamic_domains_pgsql_mnesia_24 / pgsql_mnesia / 36e24f4
Reports root/ big
OK: 2861 / Failed: 0 / User-skipped: 133 / Auto-skipped: 0

dynamic_domains_mysql_redis_24 / mysql_redis / 36e24f4
Reports root/ big
OK: 2856 / Failed: 1 / User-skipped: 150 / Auto-skipped: 0

muc_SUITE:hibernation:hibernated_room_can_be_queried_for_archive 
{error,{{assertion_failed,assert,is_groupchat_message,
              [<<"Restorable message">>],
              undefined,"undefined"},
    [{escalus_new_assert,assert_true,2,
               [{file,"/home/circleci/project/big_tests/_build/default/lib/escalus/src/escalus_new_assert.erl"},
                {line,84}]},
     {muc_SUITE,wait_for_mam_result,3,
          [{file,"/home/circleci/project/big_tests/tests/muc_SUITE.erl"},
           {line,4383}]},
     {muc_SUITE,'-hibernated_room_can_be_queried_for_archive/1-fun-0-',3,
          [{file,"/home/circleci/project/big_tests/tests/muc_SUITE.erl"},
           {line,4124}]},
     {escalus_story,story,4,
            [{file,"/home/circleci/project/big_tests/_build/default/lib/escalus/src/escalus_story.erl"},
             {line,72}]},
     {muc_SUITE,hibernated_room_can_be_queried_for_archive,1,
          [{file,"/home/circleci/project/big_tests/tests/muc_SUITE.erl"},
           {line,4120}]},
     {test_server,ts_tc,3,[{file,"test_server.erl"},{line,1783}]},
     {test_server,run_test_case_eval1,6,
            [{file,"test_server.erl"},{line,1292}]},
     {test_server,run_test_case_eval,9,
            [{file,"test_server.erl"},{line,1224}]}]}}

Report log

dynamic_domains_mssql_mnesia_24 / odbc_mssql_mnesia / 36e24f4
Reports root/ big
OK: 2861 / Failed: 0 / User-skipped: 133 / Auto-skipped: 0

ldap_mnesia_24 / ldap_mnesia / 36e24f4
Reports root/ big
OK: 1506 / Failed: 0 / User-skipped: 402 / Auto-skipped: 0

pgsql_mnesia_23 / pgsql_mnesia / 36e24f4
Reports root/ big
OK: 3235 / Failed: 0 / User-skipped: 142 / Auto-skipped: 0

internal_mnesia_24 / internal_mnesia / 36e24f4
Reports root/ big
OK: 1546 / Failed: 1 / User-skipped: 361 / Auto-skipped: 0

cluster_commands_SUITE:clustered:one_to_one_message 
{error,{{badmatch,[{[global,data,dist],
          {expected_change,[{recv_oct,'>'},{send_oct,'>'}]},
          {before_story,[{connections,2},
                   {recv_oct,0},
                   {recv_cnt,0},
                   {recv_max,0},
                   {send_oct,0},
                   {send_max,0},
                   {send_cnt,0},
                   {send_pend,0}]},
          {after_story,[{connections,2},
                  {recv_oct,0},
                  {recv_cnt,0},
                  {recv_max,0},
                  {send_oct,0},
                  {send_max,0},
                  {send_cnt,0},
                  {send_pend,0}]}}]},
    [{escalus_mongooseim,post_story_check_metrics,1,
               [{file,"/home/circleci/project/big_tests/_build/default/lib/escalus/src/escalus_mongooseim.erl"},
                {line,74}]},
     {escalus_mongooseim,maybe_check_metrics_post_story,1,
               [{file,"/home/circleci/project/big_tests/_build/default/lib/escalus/src/escalus_mongooseim.erl"},
                {line,51}]},
     {escalus_story,story,4,
            [{file,"/home/circleci/project/big_tests/_build/default/lib/escalus/src/escalus_story.erl"},
             {line,75}]},
     {test_server,ts_tc,3,[{file,"test_server.erl"},{line,1783}]},
     {test_server,run_test_case_eval1,6,
            [{file,"test_server.erl"},{line,1292}]},
     {test_server,run_test_case_eval,9,
            [{file,"test_server.erl"},{line,1224}]}]}}

Report log

elasticsearch_and_cassandra_24 / elasticsearch_and_cassandra_mnesia / 36e24f4
Reports root/ big
OK: 1854 / Failed: 0 / User-skipped: 369 / Auto-skipped: 0

pgsql_mnesia_24 / pgsql_mnesia / 36e24f4
Reports root/ big
OK: 3235 / Failed: 0 / User-skipped: 142 / Auto-skipped: 0

mysql_redis_24 / mysql_redis / 36e24f4
Reports root/ big
OK: 3230 / Failed: 0 / User-skipped: 147 / Auto-skipped: 0

mssql_mnesia_24 / odbc_mssql_mnesia / 36e24f4
Reports root/ big
OK: 3235 / Failed: 0 / User-skipped: 142 / Auto-skipped: 0

riak_mnesia_24 / riak_mnesia / 36e24f4
Reports root/ big
OK: 1697 / Failed: 0 / User-skipped: 368 / Auto-skipped: 0

internal_mnesia_24 / internal_mnesia / 36e24f4
Reports root/ big
OK: 1546 / Failed: 1 / User-skipped: 361 / Auto-skipped: 0

cluster_commands_SUITE:clustered:one_to_one_message 
{error,{{badmatch,[{[global,data,dist],
          {expected_change,[{recv_oct,'>'},{send_oct,'>'}]},
          {before_story,[{connections,2},
                   {recv_oct,0},
                   {recv_cnt,0},
                   {recv_max,0},
                   {send_oct,0},
                   {send_max,0},
                   {send_cnt,0},
                   {send_pend,0}]},
          {after_story,[{connections,2},
                  {recv_oct,0},
                  {recv_cnt,0},
                  {recv_max,0},
                  {send_oct,0},
                  {send_max,0},
                  {send_cnt,0},
                  {send_pend,0}]}}]},
    [{escalus_mongooseim,post_story_check_metrics,1,
               [{file,"/home/circleci/project/big_tests/_build/default/lib/escalus/src/escalus_mongooseim.erl"},
                {line,74}]},
     {escalus_mongooseim,maybe_check_metrics_post_story,1,
               [{file,"/home/circleci/project/big_tests/_build/default/lib/escalus/src/escalus_mongooseim.erl"},
                {line,51}]},
     {escalus_story,story,4,
            [{file,"/home/circleci/project/big_tests/_build/default/lib/escalus/src/escalus_story.erl"},
             {line,75}]},
     {test_server,ts_tc,3,[{file,"test_server.erl"},{line,1783}]},
     {test_server,run_test_case_eval1,6,
            [{file,"test_server.erl"},{line,1292}]},
     {test_server,run_test_case_eval,9,
            [{file,"test_server.erl"},{line,1224}]}]}}

Report log

Premwoik
Premwoik approved these changes May 13, 2022
View reviewed changes
Copy link
Contributor

@Premwoik Premwoik left a comment

Choose a reason for hiding this comment

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

Looks good!

Base automatically changed from pool-config-rework to master May 13, 2022 12:05
@Premwoik Premwoik merged commit 74bf246 into master May 13, 2022
@Premwoik Premwoik deleted the eldap-fix branch May 13, 2022 12:07
@Premwoik Premwoik added this to the 5.1.0 milestone May 25, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Premwoik Premwoik Premwoik approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
5.1.0
Development

Successfully merging this pull request may close these issues.
3 participants
@chrzaszcz @mongoose-im @Premwoik