Skip to content

Nit picks #3211

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.

Sign up for GitHub

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

Merged
fisx merged 3 commits into from
Mar 31, 2023
Merged

Nit picks #3211

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c8d9984
Make cassandra table dump update rule faster.
fisx Mar 31, 2023
81c0849
Correct code comments.
fisx Mar 31, 2023
436c0c3
Make falky test potentially slightly less flaky.
fisx Mar 31, 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
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ upload-hoogle-image:
## cassandra management

.PHONY: git-add-cassandra-schema
git-add-cassandra-schema: db-reset git-add-cassandra-schema-impl
git-add-cassandra-schema: db-migrate git-add-cassandra-schema-impl

.PHONY: git-add-cassandra-schema-impl
git-add-cassandra-schema-impl:
Expand Down
2 changes: 1 addition & 1 deletion services/brig/src/Brig/Options.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -556,7 +556,7 @@ data Settings = Settings
-- It should also match the SRV DNS records under which other wire-server installations can find this backend:
-- _wire-server-federator._tcp.<federationDomain>
-- Once set, DO NOT change it: if you do, existing users may have a broken experience and/or stop working
-- Remember to keep it the same in Galley.
-- Remember to keep it the same in all services.
-- Example:
-- allowedDomains:
-- - wire.com
Expand Down
5 changes: 3 additions & 2 deletions services/brig/test/integration/API/OAuth.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -459,8 +459,9 @@ testRefreshTokenMaxActiveTokens opts db brig =
let accessTokenRequest = OAuthAccessTokenRequest OAuthGrantTypeAuthorizationCode cid verifier code redirectUrl
resp <- createOAuthAccessToken brig accessTokenRequest
rid <- extractRefreshTokenId jwk resp.refreshToken
tokens <- C.runClient db (lookupOAuthRefreshTokens uid)
liftIO $ assertBool testMsg $ [rid2, rid] `hasSameElems` (refreshTokenId <$> tokens)
recoverN 3 $ do
tokens <- C.runClient db (lookupOAuthRefreshTokens uid)
liftIO $ assertBool testMsg $ [rid2, rid] `hasSameElems` (refreshTokenId <$> tokens)
pure rid
delayOneSec
do
Expand Down
2 changes: 1 addition & 1 deletion services/cargohold/src/CargoHold/Options.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ data Settings = Settings
-- It should also match the SRV DNS records under which other wire-server installations can find this backend:
-- _wire-server-federator._tcp.<federationDomain>
-- Once set, DO NOT change it: if you do, existing users may have a broken experience and/or stop working
-- Remember to keep it the same in Galley and in Brig.
-- Remember to keep it the same in all services.
-- This is referred to as the 'backend domain' in the public documentation; See
-- https://docs.wire.com/how-to/install/configure-federation.html#choose-a-backend-domain-name
_setFederationDomain :: !Domain,
Expand Down
2 changes: 1 addition & 1 deletion services/galley/src/Galley/Options.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ data Settings = Settings
-- It should also match the SRV DNS records under which other wire-server installations can find this backend:
-- _wire-server-federator._tcp.<federationDomain>
-- Once set, DO NOT change it: if you do, existing users may have a broken experience and/or stop working
-- Remember to keep it the same in Galley.
-- Remember to keep it the same in all services.
-- Example:
-- allowedDomains:
-- - wire.com
Expand Down