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

C2s/merge master #3858

Merged
merged 86 commits into from
Nov 16, 2022
Merged

C2s/merge master #3858

merged 86 commits into from
Nov 16, 2022

Conversation

NelsonVides
Copy link
Collaborator

All conflicts were related to hooks changes and fixes were very straightforward. Only note is in mod_vcard, where an iq handler had defined the extra parameter as gen_hook:extra(), but it is an iq handler, not a hook handler. Confusing enough, but dialyzer complained :)

NelsonVides and others added 30 commits October 24, 2022 20:17
- Subscriptions can be executed only with SSE.
- Queries and mutations can be executed with HTTP or CLI.
This makes it possible to the execute a prepared subscription operation
upon receiving each event.
Also: make it possible to return 'aux' data.
It uses lasse, just like the REST SSE handler
- Handle SSE requests under the '/sse' subpath
- Export utils used by the SSE handler
- Allow passing parameters with GET (qs) or POST (body).
  This follows the GraphQL specs, and allows to handle SSE.
- unsupported operation
- invalid query string
This common code is used by REST and GraphQL SSE handlers.
This is actually used only for building the queries for tests.
The commands will be displayed in the CLI help - we can change this
later if needed.
Put the more generic tests (mostly error handling) in a separate suite.
GraphQL subscriptions for stanzas
Refactored hook handlers in mod_cache_users
chrzaszcz and others added 15 commits November 14, 2022 10:22
Update expected results:
- Errors on duplicate operations
- New error messages
- Deleted domain is not nested
Update expected results:
- Two-element tuples are returned from the external API
- Database errors don't have special handling
- Errors on duplicate operations
- New error messages
Improve error handling in API module last
Refactored hook handlers in mod_keystore
Refactored hook handlers in mod_domain_isolation
Convert mod_mam to gen_hook
@mongoose-im

This comment was marked as outdated.

@codecov
Copy link

codecov bot commented Nov 16, 2022

Codecov Report

Base: 72.09% // Head: 72.24% // Increases project coverage by +0.15% 🎉

Coverage data is based on head (ed65ceb) compared to base (a59c2b3).
Patch coverage: 89.45% of modified lines in pull request are covered.

Additional details and impacted files
@@                   Coverage Diff                    @@
##           feature/mongoose_c2s    #3858      +/-   ##
========================================================
+ Coverage                 72.09%   72.24%   +0.15%     
========================================================
  Files                       534      541       +7     
  Lines                     34009    34198     +189     
========================================================
+ Hits                      24518    24708     +190     
+ Misses                     9491     9490       -1     
Impacted Files Coverage Δ
src/ejabberd_admin.erl 65.62% <ø> (ø)
.../event_pusher/mod_event_pusher_hook_translator.erl 80.55% <ø> (ø)
src/global_distrib/mod_global_distrib_mapping.erl 50.00% <ø> (ø)
src/graphql/mongoose_graphql_enum.erl 87.50% <ø> (+1.78%) ⬆️
src/http_upload/mod_http_upload.erl 97.64% <ø> (ø)
src/inbox/mod_inbox_muc.erl 91.42% <ø> (ø)
src/mam/mod_mam_pm.erl 87.90% <ø> (ø)
src/mod_adhoc.erl 81.03% <ø> (ø)
src/mod_amp.erl 96.51% <ø> (ø)
src/mod_auth_token.erl 83.45% <ø> (ø)
... and 94 more

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report at Codecov.
📢 Do you have feedback about the report comment? Let us know in this issue.

@mongoose-im
Copy link
Collaborator

mongoose-im commented Nov 16, 2022

small_tests_24 / small_tests / ed65ceb
Reports root / small


small_tests_25 / small_tests / ed65ceb
Reports root / small


ldap_mnesia_24 / ldap_mnesia / ed65ceb
Reports root/ big
OK: 1606 / Failed: 0 / User-skipped: 715 / Auto-skipped: 0


ldap_mnesia_25 / ldap_mnesia / ed65ceb
Reports root/ big
OK: 1606 / Failed: 0 / User-skipped: 715 / Auto-skipped: 0


dynamic_domains_pgsql_mnesia_24 / pgsql_mnesia / ed65ceb
Reports root/ big
OK: 3642 / Failed: 0 / User-skipped: 78 / Auto-skipped: 0


pgsql_mnesia_24 / pgsql_mnesia / ed65ceb
Reports root/ big
OK: 3818 / Failed: 0 / User-skipped: 89 / Auto-skipped: 0


internal_mnesia_25 / internal_mnesia / ed65ceb
Reports root/ big
OK: 1699 / Failed: 0 / User-skipped: 622 / Auto-skipped: 0


elasticsearch_and_cassandra_25 / elasticsearch_and_cassandra_mnesia / ed65ceb
Reports root/ big
OK: 2035 / Failed: 0 / User-skipped: 621 / Auto-skipped: 0


dynamic_domains_mysql_redis_25 / mysql_redis / ed65ceb
Reports root/ big
OK: 3616 / Failed: 0 / User-skipped: 104 / Auto-skipped: 0


dynamic_domains_mssql_mnesia_25 / odbc_mssql_mnesia / ed65ceb
Reports root/ big
OK: 3642 / Failed: 0 / User-skipped: 78 / Auto-skipped: 0


pgsql_mnesia_25 / pgsql_mnesia / ed65ceb
Reports root/ big
OK: 3818 / Failed: 0 / User-skipped: 89 / Auto-skipped: 0


riak_mnesia_24 / riak_mnesia / ed65ceb
Reports root/ big
OK: 1881 / Failed: 0 / User-skipped: 607 / Auto-skipped: 0


mysql_redis_25 / mysql_redis / ed65ceb
Reports root/ big
OK: 3804 / Failed: 0 / User-skipped: 103 / Auto-skipped: 0


dynamic_domains_pgsql_mnesia_25 / pgsql_mnesia / ed65ceb
Reports root/ big
OK: 3642 / Failed: 0 / User-skipped: 78 / Auto-skipped: 0


mssql_mnesia_25 / odbc_mssql_mnesia / ed65ceb
Reports root/ big
OK: 3818 / Failed: 0 / User-skipped: 89 / Auto-skipped: 0

@NelsonVides NelsonVides marked this pull request as ready for review November 16, 2022 10:51
Copy link
Contributor

@kamilwaz kamilwaz 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 👍

@kamilwaz kamilwaz merged commit a354678 into feature/mongoose_c2s Nov 16, 2022
@kamilwaz kamilwaz deleted the c2s/merge_master branch November 16, 2022 13:21
@jacekwegr jacekwegr added this to the 6.1.0 milestone Apr 27, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants