Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
186 commits
Select commit Hold shift + click to select a range
37eacf1
FS-1115: Initial effort to get a cross-thread mutable variable for Env.
lepsa Apr 19, 2023
cac0a7a
FS-1115: Simplifing TVar usage
lepsa Apr 19, 2023
e63bcfe
Cassandra schema update.
fisx Apr 19, 2023
2bf18a5
Internal routes for CRUDding the new table.
fisx Apr 19, 2023
01c32e4
Cassandra schema update.
fisx Apr 19, 2023
2bd4c6c
Internal routes for CRUDding the new table.
fisx Apr 19, 2023
6bb1d27
Fixup
fisx Apr 20, 2023
59dcbf0
Integration tests.
fisx Apr 20, 2023
d369479
Simple handlers.
fisx Apr 20, 2023
f8d8b58
Fixup
fisx Apr 20, 2023
d80cef9
Fixup
fisx Apr 20, 2023
6f97972
Merge remote-tracking branch 'origin/dynamic-federator-remotes' into …
lepsa Apr 20, 2023
f40b224
Merge remote-tracking branch 'origin/dynamic-federator-remotes' into …
lepsa Apr 21, 2023
c553c0e
Attempt at making C* full table scan acceptable.
fisx Apr 21, 2023
43e6483
Merge remote-tracking branch 'origin/develop' into FS-1115
lepsa Apr 24, 2023
68deac5
FS-1115: Setting up AMQP messaging for Federator to receive updates
lepsa Apr 24, 2023
7b531ba
FS-1115: Adding env file values for message queues
lepsa Apr 24, 2023
f95c666
wip
lepsa Apr 24, 2023
d5e171b
FS-1115: Ripping out AMQP code and replacing it with a http loop
lepsa Apr 24, 2023
6caed21
Merge remote-tracking branch 'origin/dynamic-federator-remotes' into …
lepsa Apr 26, 2023
e593510
FS-1115: Adding smarts to galley.
lepsa Apr 26, 2023
8a3f4db
WIP
lepsa Apr 27, 2023
6703241
FS-1115: Fixes for some tests
lepsa Apr 28, 2023
c038d0c
Merge remote-tracking branch 'origin/develop' into FS-1115
fisx May 1, 2023
6dc1d4e
Merge config file in with db in `GET /federation/remotes`.
fisx May 1, 2023
af9c127
FS-1115: Fixing build errors, updating tests, formatting
lepsa May 2, 2023
bfa663e
Don't allow removing remote domains from config file via rest api.
fisx May 2, 2023
d9b30c3
FS-1115: Fixing compile errors on a new test
lepsa May 2, 2023
8c7b646
FS-1115: Fixing the federation CRUD test
lepsa May 3, 2023
d9f4298
FS-1115: Adding federation domain updates to brig and cannon
lepsa May 3, 2023
a8e32b4
Merge remote-tracking branch 'origin/develop' into FS-1115
lepsa May 3, 2023
300fc24
Merge remote-tracking branch 'origin/develop' into FS-1115
lepsa May 4, 2023
a815652
Docs (draft), release notes.
fisx May 4, 2023
0ac3682
(Slightly) better api error on fail-to-delete.
fisx May 4, 2023
a478868
Breadcrumbs.
fisx May 4, 2023
dfa644d
Merge remote-tracking branch 'origin/develop' into FS-1115
fisx May 8, 2023
66e6969
Better breadcrumbs.
fisx May 8, 2023
cdf3650
Polish docs.
fisx May 8, 2023
ef149e3
afterthought.
fisx May 8, 2023
f9f0e87
Update services/brig/test/integration/API/Federation.hs
fisx May 8, 2023
1044124
More tests.
fisx May 8, 2023
5c22938
Remove a lying comment.
fisx May 8, 2023
02c1432
Refactor: keep the semantics of `_runSettings` intact.
fisx May 8, 2023
7dfb4e8
Remove a lying comment.
fisx May 8, 2023
6f9b9cf
Fixup / WIP
fisx May 8, 2023
beba208
Fixup
fisx May 8, 2023
0008020
Merge remote-tracking branch 'origin/develop' into FS-1115
fisx May 9, 2023
3b8b383
I take it back!
fisx May 9, 2023
d508cb9
more docs.
fisx May 9, 2023
167083a
rm bogus TODO, add a non-bogus one :)
fisx May 10, 2023
8cd69f1
revert changes of status code in integration tests.
fisx May 10, 2023
0ede02d
Various updates, mainly moving some common code into wire-api and
lepsa May 10, 2023
adbf7d9
FS-1115: More common code for federation domain updates
lepsa May 10, 2023
236c2fd
Use tinylog instead of `print`.
fisx May 10, 2023
1a6a103
sanitize-pr
fisx May 10, 2023
950867e
Use retry instead of threadDelay-loop.
fisx May 10, 2023
676862a
FS-1115: Updating design docs on how update intervals are supplied
lepsa May 11, 2023
fc00935
Clarify source comment.
fisx May 11, 2023
d39dd45
FS-1115: Cleaning up un-needed changes to options
lepsa May 11, 2023
6f5ee22
update docs.wire.com
fisx May 11, 2023
db39702
docs.
fisx May 11, 2023
1a90c97
Merge branch 'develop' into FS-1115
fisx May 12, 2023
3846ae3
docs.
fisx May 12, 2023
8b45f0f
Fix: `/i/user/meta-info` (stern) (#3281)
battermann May 10, 2023
708bec2
Handle race conditions in /integration (#3278)
fisx May 11, 2023
e89b052
Update docs.wire.com (#3284)
fisx May 11, 2023
5638e5e
Restore deleted scripts (#3287)
smatting May 11, 2023
417e368
Refactor federation domain configuration.
fisx May 12, 2023
ce50aa2
Merge remote-tracking branch 'refs/remotes/owen/FS-1115' into FS-1115
fisx May 12, 2023
5bed564
Fixup
fisx May 12, 2023
4199dc5
Complete CRUD api for federator remotes (Update is missing) [WIP].
fisx May 12, 2023
728567a
Complete CRUD api for federator remotes (Update is missing): tests.
fisx May 12, 2023
f5c1b3e
docs.
fisx May 12, 2023
a6e9255
Cleanup
fisx May 12, 2023
1d05c84
Merge remote-tracking branch 'origin/develop' into FS-1115
fisx May 19, 2023
c0df89a
Remove dead code.
fisx May 19, 2023
ea18bcb
nit-pick.
fisx May 19, 2023
4b79d4b
Typo.
fisx May 19, 2023
2f3ec7b
Fine-tune logging.
fisx May 19, 2023
84e78f0
Fix haddocks.
fisx May 19, 2023
6d1f719
Implement put.
fisx May 19, 2023
e85c97d
Clariy updateFrequency everywhere.
fisx May 19, 2023
6327def
nit-pick.
fisx May 19, 2023
5915c82
Fixup
fisx May 19, 2023
f2e998d
Cleanup
fisx May 19, 2023
012f39d
Implement put. (For real this time.)
fisx May 19, 2023
aa52e91
Move integration tests to /integration.
fisx May 19, 2023
3374dd6
...
fisx May 22, 2023
411f03d
wip
lepsa May 22, 2023
96521f5
...
fisx May 22, 2023
e474e0b
FS-1115: Setting up calls to Brig from integration tests.
lepsa May 22, 2023
af21829
...
fisx May 22, 2023
3287003
...
fisx May 22, 2023
166e2ba
...
fisx May 22, 2023
bad86a1
...
fisx May 22, 2023
6390674
...
fisx May 22, 2023
b49a742
...
fisx May 22, 2023
f02819f
Fix
fisx May 22, 2023
15ec903
...
fisx May 22, 2023
dd061ae
WIP: Chasing down cache issues between some bug fixes
lepsa May 23, 2023
a6bab56
...
fisx May 23, 2023
8f553bd
...
fisx May 23, 2023
e44cfe9
...
fisx May 23, 2023
19f2732
...
fisx May 23, 2023
d662c85
Tests are passing!
fisx May 23, 2023
bea0419
Merge remote-tracking branch 'origin/develop' into FS-1115
fisx May 23, 2023
f6ae0c7
process leif's feedback.
fisx May 23, 2023
f0bfa62
...
fisx May 23, 2023
2e959b0
Fixing compile issues after a merge
lepsa May 24, 2023
37b4f09
Updating templates
lepsa May 24, 2023
8f8af7c
Removing a JSON roundtrip, better using aeson.
lepsa May 24, 2023
236f4bb
Moving more of the federation domain update code into wire-api.
lepsa May 24, 2023
fff9883
wip
lepsa May 24, 2023
1a76c9c
Merge remote-tracking branch 'refs/remotes/owen/FS-1115' into FS-1115
fisx May 24, 2023
4efa58e
sanitize-pr
fisx May 24, 2023
0a122f3
Merge branch 'FS-1115' of github.com:lepsa/wire-server into FS-1115
lepsa May 24, 2023
9c68bd8
FS-1115: Updating brig integration config to help tests
lepsa May 24, 2023
c8cac98
s/AllowList/AllowDynamic/g
fisx May 24, 2023
ca572dd
rm trailing whitespace.
fisx May 24, 2023
7c39b34
Merge remote-tracking branch 'origin/develop' into FS-1115
fisx May 24, 2023
d3997dc
docs
fisx May 24, 2023
17ab5da
Updating with PR feedback
lepsa May 25, 2023
fbfac87
Have federation domain tests use MakesValue more
lepsa May 25, 2023
8cdd041
FS-1115: Removing more FedConn type specific code from federation tests
lepsa May 25, 2023
1ffaab2
More code leaning on typeclasses
lepsa May 25, 2023
56f7954
Mark flaky test case.
fisx May 25, 2023
db19f40
Merge remote-tracking branch 'refs/remotes/owen/FS-1115' into FS-1115
fisx May 25, 2023
9c6836d
Merge remote-tracking branch 'origin/develop' into FS-1115
fisx May 25, 2023
01ef6ff
docs.
fisx May 25, 2023
1f0d1ab
Merge remote-tracking branch 'origin/develop' into FS-1115
lepsa May 26, 2023
f2cf2da
Merge branch 'develop' into FS-1115
fisx May 31, 2023
9b44c5e
Merge remote-tracking branch 'refs/remotes/owen/FS-1115' into FS-1115
fisx Jun 2, 2023
689b5e9
Merge remote-tracking branch 'origin/develop' into FS-1115
fisx Jun 4, 2023
0e0487c
Merge remote-tracking branch 'origin/develop' into FS-1115
fisx Jun 4, 2023
28d27d6
docs.
fisx Jun 4, 2023
d334aa6
Changelog.
fisx Jun 4, 2023
171a31e
docs.
fisx Jun 4, 2023
125ba0a
sanitize-pr
fisx Jun 4, 2023
98bf16a
Fixup
fisx Jun 4, 2023
03153e0
Update docs/src/understand/configure-federation.md
fisx Jun 5, 2023
3466906
Update docs/src/developer/developer/federation-design-aspects.md
fisx Jun 5, 2023
9f0a323
Merge remote-tracking branch 'origin/develop' into FS-1115
fisx Jun 6, 2023
ad83b45
Fix cannon config map
fisx Jun 6, 2023
0990d32
whitespace
fisx Jun 6, 2023
b976f94
Merge remote-tracking branch 'origin/develop' into FS-1115
fisx Jun 6, 2023
8e9d364
Merge remote-tracking branch 'origin/develop' into FS-1115
fisx Jun 9, 2023
781cacd
hi ci
fisx Jun 9, 2023
5cd4559
docs.
fisx Jun 9, 2023
61a5c87
docs.
fisx Jun 11, 2023
6c1ecd7
Merge remote-tracking branch 'origin/develop' into FS-1115
battermann Jun 19, 2023
28d87c9
Merge branch 'develop' into FS-1115
battermann Jun 19, 2023
0080e89
hi ci
fisx Jun 20, 2023
ab9c14a
Tweak docs.
fisx Jun 20, 2023
57746ee
Merge remote-tracking branch 'origin/develop' into FS-1115
fisx Jun 20, 2023
046b87b
nit-pick.
fisx Jun 20, 2023
f577998
Mark test case as flaky.
fisx Jun 20, 2023
4f28941
Tweak log levels.
fisx Jun 20, 2023
5908f7a
Tweak log msg.
fisx Jun 20, 2023
582b654
Update libs/wire-api/src/Wire/API/Routes/Internal/Brig.hs
lepsa Jun 21, 2023
a5e4840
Update docs/src/understand/configure-federation.md
lepsa Jun 21, 2023
bb5455c
Update services/brig/src/Brig/API/Internal.hs
lepsa Jun 21, 2023
ac6a5c2
Update services/brig/src/Brig/API/Internal.hs
lepsa Jun 21, 2023
f44ff72
Update services/brig/src/Brig/API/Internal.hs
lepsa Jun 21, 2023
a753af5
Update services/federator/src/Federator/Run.hs
lepsa Jun 21, 2023
b0f24b5
Update services/galley/src/Galley/App.hs
lepsa Jun 21, 2023
c1588b4
FS-1115: PR notes
lepsa Jun 21, 2023
9494a19
try fix helm charts
battermann Jun 21, 2023
d1b4f1c
Merge remote-tracking branch 'origin/develop' into FS-1115
fisx Jun 22, 2023
d649710
hi ci
battermann Jun 22, 2023
0008cf8
changed federation strategy in CI from allowDynamic to allowAll
battermann Jun 22, 2023
37baaf6
Merge branch 'develop' into FS-1115
battermann Jun 22, 2023
8d8242a
correct error in case of allowDynamic
battermann Jun 23, 2023
0a1b730
default case made explicit
battermann Jun 23, 2023
75ec8e6
Merge remote-tracking branch 'refs/remotes/owen/FS-1115' into FS-1115
fisx Jun 23, 2023
81ae556
Merge remote-tracking branch 'origin/develop' into FS-1115
fisx Jun 26, 2023
22e7798
Create use domain names in integration tests.
fisx Jun 26, 2023
866f52b
Better errors in /integration.
fisx Jun 26, 2023
372c71c
nit-picks.
fisx Jun 26, 2023
88bf195
Better errors in /integration.
fisx Jun 26, 2023
2ba8dd6
revert commit noise.
fisx Jun 26, 2023
a20a21a
Fix `make list-flaky-tests`.
fisx Jun 26, 2023
354252d
nit-picks, renames, minor refactorings.
fisx Jun 26, 2023
a2432df
s/type/newtype/
fisx Jun 26, 2023
3318c4a
Polish Wire.API.FederationUpdate (names and declaration order).
fisx Jun 26, 2023
47ae909
Fix: Always cancel `syncFedDomainUpdateThread`.
fisx Jun 26, 2023
a830cdb
hi ci
fisx Jun 26, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ endif
# ci here doesn't refer to continuous integration, but to cabal-run-integration.sh
# Usage: make ci - build & run all tests, excluding integration
# make ci package=all - build & run all tests, including integration
# make ci package=brig - build brig & run "brig-integration"
# make ci package=brig - build brig & run "brig-integration"
# make ci package=integration - build & run "integration"
#
# You can pass environment variables to all the suites, like so
Expand Down Expand Up @@ -128,7 +128,8 @@ sanitize-pr:

list-flaky-tests:
@echo -e "\n\nif you want to run these, set RUN_FLAKY_TESTS=1\n\n"
@git grep -Hn '\bflakyTestCase \"'
@git grep -Hne '\bflakyTestCase \"'
@git grep -Hne '[^^]\bflakyTest\b'

.PHONY: cabal-fmt
cabal-fmt:
Expand Down
Loading