Skip to content

Comments

Merge develop into mls-olaf#3317

Merged
smatting merged 25 commits intomls-olaffrom
mls-olaf-pending-merge
May 26, 2023
Merged

Merge develop into mls-olaf#3317
smatting merged 25 commits intomls-olaffrom
mls-olaf-pending-merge

Conversation

@smatting
Copy link
Contributor

@smatting smatting commented May 25, 2023

There were a couple of merge conflicts.

lepsa and others added 25 commits May 9, 2023 13:10
… errors (#3229)

* FS-1467: Updates to allow partial success and tests

* FS-1467 Setting which conversation actions should be fault tolerant

* FS-1467: Fixing tests for unavailable federator

* FS-1467: Formatting and linting

* FS-1467: Adding changelog

* FS-1467: Swapping out a bool for a more descriptive type

* FS-1467: Updates from PR comments

---------

Co-authored-by: Marko Dimjašević <marko.dimjasevic@wire.com>
Co-authored-by: Igor Ranieri <igor@elland.me>
* Deprecate start-services-only.sh

* Fix outdated docs on how to run swagger docs locally.
* Initial import of MLS test framework

* Add subconversation utilities to integration suite

* Add more utilities

* Add self conversation utilities

---------

Co-authored-by: Stefan Berthold <stefan.berthold@wire.com>
* Add convenience getJSON and getBody functions

These can be used to extract the body from a response and check the
status code at the same time.

* baseRequest now adds Z headers automatically

* Added liftIO versions of putStrLn etc

* Add Show instances for MLSState

---------

Co-authored-by: Stefan Matting <stefan@wire.com>
* Refactoring: make UnreachableUsers a NonEmpty
As agreed with client devs on Apr 4, 2023 in the Squad - Federation
chat, the absence of the `failed_to_send` field in response to an MLS
message send request has the same meaning as an empty list provided in
the same field.
* executeProposalAction: return failed-to-add users
* Move and generalise mockUnreachableFor
* Introduce failed to remove (via failed to fetch client info)
* Propagate FailedToProcess across federation API arising from conversation updates
* Use a V4 add members endpoint in tests
* Rethrow the invalid-domain exception
* Rethrow federation-not-available error
* Fix a golden test for LeaveConversationResponse
* Golden tests for MLSMessageSendingStatus
* Clean up conv action federation failure handling
* Move unreachability stuff into its own module
 Delete the FederationFailEarly type
* Replace tuple with multiple arguments
* Use feature singletons in TeamFeatureStore

This introduces a `FeatureSingleton` GADT, which is then used by the
Cassandra interpretation of `TeamFeatureStore` to determine how to read
and write into the database.

Feature singletons avoids having to pass a database-specific constraint
to the effect itself, and as a consequence makes it possible to remove
the `db` type variable from all the code that uses the `TeamFeature`
effect.

* Update new feature checklist
This is mostly inspired by our restund Helm chart. max-allocate-lifetime has been removed as it represented the default value. The current config settings were reviewed with Scott.

N.B. the CA-file setting is mandatory to use federated certificate whitelisting.


Co-authored-by: jschaul <jschaul@users.noreply.github.com>
Introduces a new service: background-worker. The worker watches backend-notification queues corresponding to all the remote domains and pushes the notifications one-by-one.

https://wearezeta.atlassian.net/browse/FS-1940

Co-authored-by: Akshay Mankar <akshay@wire.com>
It is only required when federation is enabled.
@CLAassistant
Copy link

CLA assistant check
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.
9 out of 10 committers have signed the CLA.

✅ lepsa
✅ battermann
✅ pcapriotti
✅ smatting
✅ elland
✅ comawill
✅ mdimjasevic
✅ supersven
✅ akshaymankar
❌ fisx
You have signed the CLA already but the status is still pending? Let us recheck it.

@zebot zebot added the ok-to-test Approved for running tests in CI, overrides not-ok-to-test if both labels exist label May 25, 2023
@smatting smatting merged commit 1c41035 into mls-olaf May 26, 2023
@smatting smatting deleted the mls-olaf-pending-merge branch May 26, 2023 12:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

ok-to-test Approved for running tests in CI, overrides not-ok-to-test if both labels exist

Projects

None yet

Development

Successfully merging this pull request may close these issues.