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

Support dynamic domains in mod_http_upload #3267

Merged
merged 4 commits into from
Sep 14, 2021

Conversation

Premwoik
Copy link
Contributor

This PR adds missing support for dynamic domains in mod_http_upload and adapts tests. It also replaces host with host_type in service_admin_extra_upload.

@mongoose-im
Copy link
Collaborator

mongoose-im commented Sep 14, 2021

small_tests_24 / small_tests / c781985
Reports root / small


internal_mnesia_24 / internal_mnesia / c781985
Reports root/ big
OK: 1589 / Failed: 0 / User-skipped: 290 / Auto-skipped: 0


small_tests_22 / small_tests / c781985
Reports root / small


small_tests_23 / small_tests / c781985
Reports root / small


dynamic_domains_24 / pgsql_mnesia / c781985
Reports root/ big
OK: 2115 / Failed: 0 / User-skipped: 132 / Auto-skipped: 0


dynamic_domains_23 / pgsql_mnesia / c781985
Reports root/ big
OK: 2115 / Failed: 0 / User-skipped: 132 / Auto-skipped: 0


ldap_mnesia_22 / ldap_mnesia / c781985
Reports root/ big
OK: 1516 / Failed: 0 / User-skipped: 363 / Auto-skipped: 0


ldap_mnesia_24 / ldap_mnesia / c781985
Reports root/ big
OK: 1516 / Failed: 0 / User-skipped: 363 / Auto-skipped: 0


ldap_mnesia_23 / ldap_mnesia / c781985
Reports root/ big
OK: 1516 / Failed: 0 / User-skipped: 363 / Auto-skipped: 0


pgsql_mnesia_22 / pgsql_mnesia / c781985
Reports root/ big
OK: 3091 / Failed: 0 / User-skipped: 184 / Auto-skipped: 0


pgsql_mnesia_23 / pgsql_mnesia / c781985
Reports root/ big
OK: 3091 / Failed: 0 / User-skipped: 184 / Auto-skipped: 0


pgsql_mnesia_24 / pgsql_mnesia / c781985
Reports root/ big
OK: 3091 / Failed: 0 / User-skipped: 184 / Auto-skipped: 0


elasticsearch_and_cassandra_24 / elasticsearch_and_cassandra_mnesia / c781985
Reports root/ big
OK: 1892 / Failed: 0 / User-skipped: 286 / Auto-skipped: 0


mssql_mnesia_24 / odbc_mssql_mnesia / c781985
Reports root/ big
OK: 3090 / Failed: 1 / User-skipped: 184 / Auto-skipped: 0

dynamic_domains_SUITE:with_mod_dynamic_domains_test:iq_handling_for_subdomain
{error,
  {{assertion_failed,assert,is_iq_result,
     [{xmlel,<<"iq">>,
        [{<<"to">>,<<"subdomain2.example.test">>},
         {<<"type">>,<<"get">>},
         {<<"id">>,<<"a7a7fd2275f0982bca949caeb8f7cc55">>}],
        [{xmlel,<<"query">>,[{<<"xmlns">>,<<"dummy.namespace">>}],[]}]}],
     {xmlel,<<"iq">>,
       [{<<"from">>,<<"subdomain2.example.test">>},
        {<<"to">>,<<"[email protected]/res1">>},
        {<<"type">>,<<"error">>},
        {<<"xml:lang">>,<<"en">>},
        {<<"id">>,<<"a7a7fd2275f0982bca949caeb8f7cc55">>}],
       [{xmlel,<<"query">>,[{<<"xmlns">>,<<"dummy.namespace">>}],[]},
        {xmlel,<<"error">>,
          [{<<"code">>,<<"404">>},{<<"type">>,<<"cancel">>}],
          [{xmlel,<<"remote-server-not-found">>,
             [{<<"xmlns">>,
             <<"urn:ietf:params:xml:ns:xmpp-stanzas">>}],
             []},
           {xmlel,<<"text">>,
             [{<<"xmlns">>,
             <<"urn:ietf:params:xml:ns:xmpp-stanzas">>}],
             [{xmlcdata,<<"From s2s (waiting)">>}]}]}]},
     "<iq from='subdomain2.example.test' to='[email protected]/res1' type='error' xml:lang='en' id='a7a7fd2275f0982bca949caeb8f7cc55'><query xmlns='dummy.namespace'/><error code='404' type='cancel'><remote-server-not-found xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'/><text xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'>From s2s (waiting)</text></error></iq>"},
   [{escalus_new_assert,assert_true,2,
      [{file,
         "/home/circleci/app/big_tests/_build/default/lib...

Report log


mysql_redis_24 / mysql_redis / c781985
Reports root/ big
OK: 3074 / Failed: 0 / User-skipped: 201 / Auto-skipped: 0


riak_mnesia_24 / riak_mnesia / c781985
Reports root/ big
OK: 1745 / Failed: 1 / User-skipped: 289 / Auto-skipped: 0

mod_ping_SUITE:server_ping:server_ping_pong
{error,{{badmatch,[{[<<"localhost">>,mod_ping,ping_response],
          {expected_diff,5},
          {before_story,0},
          {after_story,4}}]},
    [{escalus_mongooseim,post_story_check_metrics,1,
               [{file,"/home/circleci/app/big_tests/_build/default/lib/escalus/src/escalus_mongooseim.erl"},
                {line,74}]},
     {escalus_mongooseim,maybe_check_metrics_post_story,1,
               [{file,"/home/circleci/app/big_tests/_build/default/lib/escalus/src/escalus_mongooseim.erl"},
                {line,51}]},
     {escalus_story,story,4,
            [{file,"/home/circleci/app/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


mssql_mnesia_24 / odbc_mssql_mnesia / c781985
Reports root/ big
OK: 3091 / Failed: 0 / User-skipped: 184 / Auto-skipped: 0

@codecov
Copy link

codecov bot commented Sep 14, 2021

Codecov Report

Merging #3267 (c781985) into master (7942d44) will increase coverage by 0.02%.
The diff coverage is 93.93%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #3267      +/-   ##
==========================================
+ Coverage   80.20%   80.23%   +0.02%     
==========================================
  Files         398      398              
  Lines       32562    32563       +1     
==========================================
+ Hits        26117    26126       +9     
+ Misses       6445     6437       -8     
Impacted Files Coverage Δ
src/http_upload/mod_http_upload.erl 94.62% <93.54%> (+0.05%) ⬆️
src/admin_extra/service_admin_extra_upload.erl 93.33% <100.00%> (ø)
src/event_pusher/mod_event_pusher_sns.erl 84.21% <0.00%> (-5.27%) ⬇️
src/jingle_sip/mod_jingle_sip_backend.erl 80.00% <0.00%> (-5.00%) ⬇️
src/muc_light/mod_muc_light_utils.erl 90.00% <0.00%> (-1.00%) ⬇️
src/inbox/mod_inbox_rdbms.erl 92.50% <0.00%> (-0.63%) ⬇️
src/ejabberd_sm.erl 84.26% <0.00%> (-0.33%) ⬇️
src/mod_bosh_socket.erl 78.88% <0.00%> (-0.32%) ⬇️
src/pubsub/mod_pubsub.erl 73.17% <0.00%> (-0.18%) ⬇️
src/mod_muc_room.erl 77.12% <0.00%> (-0.06%) ⬇️
... and 6 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 7942d44...c781985. Read the comment docs.

@Premwoik Premwoik marked this pull request as ready for review September 14, 2021 09:05
Copy link
Collaborator

@NelsonVides NelsonVides left a comment

Choose a reason for hiding this comment

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

👌🏽

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 good!

@chrzaszcz chrzaszcz merged commit 5ffcb4b into master Sep 14, 2021
@chrzaszcz chrzaszcz deleted the support-dynamic-domains-in-mod_http_upload branch September 14, 2021 13:55
@Premwoik Premwoik added this to the 5.0.0 milestone Oct 5, 2021
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.

4 participants