Merge develop into mls by pcapriotti · Pull Request #3597 · wireapp/wire-server

pcapriotti · 2023-09-21T13:54:09Z

No description provided.

…otifications (#3515)

* background-worker: Make push backoff times configurable * brig/getFederationStatus: Always return NonConnectedBackends as empty when fed policy is AllowAll * integration: Use separate vHosts for backendA and B. * integration/RunServices: Add hack to make federation work * integration: Add test to verify behaviour with offline backends * helm-var-integration: Workaround bug with federation * integration-test.sh: Run new integration test suite first --------- Co-authored-by: Marko Dimjašević <marko.dimjasevic@wire.com>

)

* WPB-3842: Improving checks for adding users to a conversation. Added a check to `ensureAllowed` that checks for full federation connections for domains in a conversation, including the domains for new users. * WPB-3842: Adding the changelog * WPB-3842: Moving where the extra domain checks are being performed. Updating integration tests to reflect the updated semantics of conversation join semantics. Many of them weren't expecting errors relating to unreachable domains, and had to be updated to reflect this. * Fix asserted domains in an integration test * Integration test: assert on non-federating domains * WPB-3842: Changing parallel testing to sequential testing --------- Co-authored-by: Marko Dimjašević <marko.dimjasevic@wire.com>

* WPB-3798: Updating code and tests after renaming fields * WPB-3798: More updates to names after finding more JSON prefix mangling * WPB-3798: Fixing schema instances for SAML data * WPB-3798: Fixing instances that had errors, found by tests * WPB-3798: Adding changelogs * WPB-3798: PR feedback. * WPB-3798: Fixing an error with a field called `data'` The trailing ' would end up in the JSON representation. I've changed it to use a leading `_` like other structures, and wrote a newtype to handle the minimal prefix stripping. Also cleaning up the diff in regards to imports. * WPB-3798: Cleaning up imports to minimise the diff

* Remove unneeded -Wwarn (re-enabeling -Werror in those modules). * Makefile: fix hspec_options overloading in .envrc.local.

…tificationsForOfflineBackends (#3529) * integration: Fix testAddingUserNonFullyConnectedFederation * integration: Don't allow adding users to conv when one of the pariticipating backends is down * integration: Add retries to get around problem of federation domain sync threads

* Introduce development version 5 * Specialise API to a specific version * Use versioned swagger for galley * Use version swagger for all other services * Collect all service Swaggers into a typeclass * Fix swagger integration tests * Revert any changes to API versions before 5 * Remove promotion of isDevelopmentVersion * Add CHANGELOG entry

* stern: Fetch only the notifications that are needed * stern: Fetch only the conversations that are needed

…#3538)

* brig-integration: Don't assume only 1 result in search by display name Display names are random strings from 2 to 128 characters. If a 2 string name gets generated it is likely that it matches some name generated in another test. * brig-integration: Mark test not flaky It didn't fail after runnning it 1000 times.

…#3543)

* Check validity of notification IDs * Add CHANGELOG entry * fixup! Add CHANGELOG entry * fixup! fixup! Add CHANGELOG entry

* WPB-1214: Servantify Brig/Provider.Service API - Moving the routes over to servant, and removing the old routing code. - Adding new instances to types that needed them for servant. * WPB-663: Removing a redundant TODO comment, adding changelog

This reverts commit 3653d56.

… setup phase (#3523)

Revert "WPB-633 Servantify Brig/Provider.Service API"

Backticks execute the command even when they are in quotes.

* Remove MLS endpoints from the API They will be reintroduced when merging the mls branch. These endpoints are not currently functional on develop, so removing them from here will reduce the amount of conflicts. * Finalise v4 * Add CHANGELOG entry * Add pregenerated swagger for v4 * Delete MLS tests in brig * Remove more MLS endpoints from v4 * Set default API version to 5 in integration tests * Update the documentation on API versioning --------- Co-authored-by: Marko Dimjašević <marko.dimjasevic@wire.com>

) --------- Co-authored-by: Sven Tennie <sven.tennie@gmail.com>

see WPB-3599

… in charts only

…ommit to develop instead of to the proper branch

* Update sftd docs: include uri scheme in allowOrigin * fixup

…ers is from an offline backend (#3585)

https://wearezeta.atlassian.net/browse/WPB-4668 Co-authored-by: Akshay Mankar <akshay@wire.com>

…m conversation when reachable again (#3537) * Formatting * Test utilities for changing a conv name * Add a test confirming the bug report * An action to enqueue notifications concurrently * Enqueue member removal notification for remotes * Add a changelog * Test case formatting * Migrate test roleUpdateWithRemotesUnavailable * Migrate test putReceiptModeWithRemotesOk * Migrate test putReceiptModeWithRemotesUnavailable * Migrate test testRoleUpdateWithRemotesOk * Migrate test roleUpdateRemoteMember * Migrate test putQualifiedConvRenameWithRemotesUnavailable This one is already covered by testSynchroniseUserRemovalNotification * Migrate test putQualifiedConvRenameWithRemotesOk * Migrate test deleteLocalMemberConvLocalQualifiedOk * Migrate test deleteRemoteMemberConvLocalQualifiedOk * Migrate test deleteUnavailableRemoteMemberConvLocalQualifiedOk * Add the copyright header to a test module * Move a test utility (allPreds) * Test utility: create a team with members * Migrate test testAccessUpdateGuestRemoved * Migrate test messageTimerChangeWithRemotes * Migrate test messageTimerUnavailableRemotes * Migrate test testAccessUpdateGuestRemovedRemotesUnavailable * Migrate test accessUpdateWithRemotes * Migrate test testAddRemoteMember * Migrate test testDeleteTeamConversationWithRemoteMembers * Migrate test testDeleteTeamConversationWithUnavailableRemoteMembers * Move a test utility (assertLeaveNotification) * Migrate test "POST /federation/leave-conversation : Success" * Migrate test "POST /federation/on-user-deleted-conversations : Remove deleted remote user from local conversations" * Migrate test updateConversationByRemoteAdmin * Tests: support giving a role when adding * Use cannon API for notifications when possible * Use startDynamicBackends when possible * Fix assertion * Migrate test testAddRemoteUsersToLocalConv * Test add member endpoint at version 1 * Add return value to enqueueNotification * Use cannon assertions in offline backends test * Check that remote notifications are received * Test removal of users from unreachable backends * Use correct domains for default backends Taking the domains in the `backendA` and `backendB` resources only works locally. * fixup! Use cannon assertions in offline backends test --------- Co-authored-by: Paolo Capriotti <paolo@capriotti.io> Co-authored-by: Akshay Mankar <akshay@wire.com>

--------- Co-authored-by: Igor Ranieri Elland <54423+elland@users.noreply.github.com> Co-authored-by: Igor Ranieri <igor@elland.me>

CLAassistant · 2023-09-21T13:54:20Z

Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
10 out of 11 committers have signed the CLA.

✅ pcapriotti
✅ akshaymankar
✅ lepsa
✅ fisx
✅ smatting
✅ elland
✅ arthurwolf
✅ atomrc
✅ mdimjasevic
✅ battermann
❌ jappeace
_{You have signed the CLA already but the status is still pending? Let us recheck it.}

smatting and others added 30 commits August 18, 2023 14:08

Fix bug: federatorInternal host not set for background-worker (#3516)

02bbf2a

WPB-3916: Filtering out duplicate members when sending defederation n…

13e3f09

…otifications (#3515)

Distinguish between update and upsert cassandra commands (#3513)

0cf66be

Remove billing-team-member-backfill tool (#3520)

0691a69

dockerephemeral: Increase nofile ulimits for ES and Fake DynamoDB (#3521

ae46d4c

)

nit-picks (#3519)

db05435

* Remove unneeded -Wwarn (re-enabeling -Werror in those modules). * Makefile: fix hspec_options overloading in .envrc.local.

stern: Optimize RAM usage of /i/users/meta-info (#3522)

e0ea81e

* stern: Fetch only the notifications that are needed * stern: Fetch only the conversations that are needed

Integration tests: use static ports (#3536)

119fe8a

[WPB-3799] cannot fetch conversation details after connection request (…

bec112a

…#3538)

Integration suite: Fix bug in local setup: wrong port for nginz http2 (…

bb4d4df

…#3543)

[WPB-662] servantify brig provider bot api (#3540)

2de7d9c

Fix broken "we are hiring" link (#3549)

5f66f8a

Multi-ingress guest links (#3546)

c96a826

Check validity of notification IDs (#3550)

d1d85b2

* Check validity of notification IDs * Add CHANGELOG entry * fixup! Add CHANGELOG entry * fixup! fixup! Add CHANGELOG entry

Fix ES migration script. (#3558)

3774303

Revert "WPB-633 Servantify Brig/Provider.Service API (#3554)"

c29cb19

This reverts commit 3653d56.

Integration tests: delete all rabbitmq queues during dynamic backends…

10de29f

… setup phase (#3523)

Merge pull request #3560 from wireapp/revert-3554-WPB-663

a56a18a

Revert "WPB-633 Servantify Brig/Provider.Service API"

[WPB-4406] federator improve logging (#3556)

e859176

Makefile: Avoid executing the hint (#3564)

c5a3f5c

Backticks execute the command even when they are in quotes.

Fix: SCIM user lookup after changing IdP issuer ID (#3473)

6ba6cca

doc: document webapp configuration for multi-ingress environments (#3569

b7213e3

) --------- Co-authored-by: Sven Tennie <sven.tennie@gmail.com>

battermann and others added 15 commits September 8, 2023 14:12

[WPB-4361] upgrade jwt-tools (#3559)

bed7c08

cassandra: Add column and table names in parsing error messages (#3555)

2dfc268

s/CORS/CSP/ as mentionned by Sven in WPB-2912

2b7a0f6

Replace broken integrations with links

8e4fd6c

see WPB-3599

replace all instances of example.com with wire.example as per wpb-2621,…

56335a2

… in charts only

change back from wire.example to example.com as this was mistakenly c…

c0a0617

…ommit to develop instead of to the proper branch

add documentation on creating a first user

9373c9a

reverting previous commit as sent to wrong branch

4860c4e

Update sftd docs: include uri scheme in allowOrigin (#3584)

a3ba8ef

* Update sftd docs: include uri scheme in allowOrigin * fixup

WPB-4629 impossible to add users to a conversation if one of the memb…

805f1ff

…ers is from an offline backend (#3585)

fake-aws-s3 chart: Upgrade to minio 5.0.13 (#3565)

fd258a9

Disable de-federation to avoid running into a scalability issue (#3582)

3f88513

https://wearezeta.atlassian.net/browse/WPB-4668 Co-authored-by: Akshay Mankar <akshay@wire.com>

WPB-4240: Migrate from swagger2 to openapi3 (#3570)

2e3a6ec

--------- Co-authored-by: Igor Ranieri Elland <54423+elland@users.noreply.github.com> Co-authored-by: Igor Ranieri <igor@elland.me>

Merge 'origin/develop' into mls

dd7718c

zebot added the ok-to-test Approved for running tests in CI, overrides not-ok-to-test if both labels exist label Sep 21, 2023

pcapriotti added 3 commits September 21, 2023 16:46

Remove mocked MLS member add test

527e45d

Resolve conflict in pregenerated swagger

6ab15b8

Remove MLS end2end tests

9a4739e

pcapriotti marked this pull request as ready for review September 26, 2023 07:33

pcapriotti merged commit 40a4adc into mls Sep 27, 2023

pcapriotti deleted the mls-merge branch September 27, 2023 06:58

echoes-hq bot added the echoes: technical-roadmap/technical-debt More specific category, to highlight Technical Debt being tackled. label Jul 1, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge develop into mls#3597

Merge develop into mls#3597
pcapriotti merged 48 commits intomlsfrom
mls-merge

pcapriotti commented Sep 21, 2023

Uh oh!

CLAassistant commented Sep 21, 2023 •

edited

Loading

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

12 participants

Conversation

pcapriotti commented Sep 21, 2023

Uh oh!

CLAassistant commented Sep 21, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

12 participants

CLAassistant commented Sep 21, 2023 •

edited

Loading