Skip to content

fix: paths in stern #3153

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
battermann merged 1 commit into from
Mar 16, 2023
Merged

fix: paths in stern #3153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion services/run-services
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ class Service:
return self.name
else:
return self._internal_name

def path(self):
return os.path.join(ROOT, "dist", self.name)

Expand Down Expand Up @@ -405,6 +405,7 @@ if __name__ == '__main__':
Instance(CANNON2, 8183),
Instance(CARGOHOLD, 8084),
Instance(SPAR, 8088),
Instance(STERN, 8091),
DummyInstance(PROXY, 8087),
FederatorInstance(8097, 8098),
NginzInstance(
Expand Down
34 changes: 17 additions & 17 deletions tools/stern/src/Stern/Intra.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ putUserStatus status uid = do
"brig"
b
( method PUT
. paths ["/i/users", toByteString' uid, "status"]
. paths ["i", "users", toByteString' uid, "status"]
. lbytes (encode payload)
. contentJson
. expect2xx
Expand Down Expand Up @@ -205,7 +205,7 @@ getUsersConnections uids = do
"brig"
b
( method POST
. path "/i/users/connections-status"
. path "i/users/connections-status"
. Bilge.json reqBody
. expect2xx
)
Expand All @@ -226,7 +226,7 @@ getUserProfiles uidsOrHandles = do
"brig"
b
( method GET
. path "/i/users"
. path "i/users"
. qry
. expect2xx
)
Expand All @@ -249,7 +249,7 @@ getUserProfilesByIdentity emailOrPhone = do
"brig"
b
( method GET
. path "/i/users"
. path "i/users"
. userKeyToParam emailOrPhone
. expect2xx
)
Expand All @@ -267,7 +267,7 @@ getEjpdInfo handles includeContacts = do
"brig"
b
( method POST
. path "/i/ejpd-request"
. path "i/ejpd-request"
. Bilge.json bdy
. (if includeContacts then queryItem "include_contacts" "true" else id)
. expect2xx
Expand Down Expand Up @@ -301,7 +301,7 @@ revokeIdentity emailOrPhone = do
"brig"
b
( method POST
. path "/i/users/revoke-identity"
. path "i/users/revoke-identity"
. userKeyToParam emailOrPhone
. expect2xx
)
Expand All @@ -315,7 +315,7 @@ deleteAccount uid = do
"brig"
b
( method DELETE
. paths ["/i/users", toByteString' uid]
. paths ["i", "users", toByteString' uid]
. expect2xx
)

Expand All @@ -328,7 +328,7 @@ setStatusBindingTeam tid status = do
"galley"
g
( method PUT
. paths ["/i/teams", toByteString' tid, "status"]
. paths ["i", "teams", toByteString' tid, "status"]
. Bilge.json (Team.TeamStatusUpdate status Nothing)
. expect2xx
)
Expand All @@ -342,7 +342,7 @@ deleteBindingTeam tid = do
"galley"
g
( method DELETE
. paths ["/i/teams", toByteString' tid]
. paths ["i", "teams", toByteString' tid]
. expect2xx
)

Expand All @@ -356,7 +356,7 @@ deleteBindingTeamForce tid = do
"galley"
g
( method DELETE
. paths ["/i/teams", toByteString' tid]
. paths ["i", "teams", toByteString' tid]
. queryItem "force" "true"
. expect2xx
)
Expand Down Expand Up @@ -520,7 +520,7 @@ getTeamFeatureFlag tid = do
gly <- view galley
let req =
method GET
. paths ["/i/teams", toByteString' tid, "features", Public.featureNameBS @cfg]
. paths ["i", "teams", toByteString' tid, "features", Public.featureNameBS @cfg]
resp <- catchRpcErrors $ rpc' "galley" gly req
case Bilge.statusCode resp of
200 -> pure $ responseJsonUnsafe @(Public.WithStatus cfg) resp
Expand All @@ -541,7 +541,7 @@ setTeamFeatureFlag tid status = do
gly <- view galley
let req =
method PUT
. paths ["/i/teams", toByteString' tid, "features", Public.featureNameBS @cfg]
. paths ["i", "teams", toByteString' tid, "features", Public.featureNameBS @cfg]
. Bilge.json status
. contentJson
resp <- catchRpcErrors $ rpc' "galley" gly req
Expand All @@ -568,7 +568,7 @@ getSearchVisibility tid = do
"galley"
gly
( method GET
. paths ["/i/teams", toByteString' tid, "search-visibility"]
. paths ["i", "teams", toByteString' tid, "search-visibility"]
. expect2xx
)
where
Expand All @@ -585,7 +585,7 @@ setSearchVisibility tid typ = do
"galley"
gly
( method PUT
. paths ["/i/teams", toByteString' tid, "search-visibility"]
. paths ["i", "teams", toByteString' tid, "search-visibility"]
. lbytes (encode $ TeamSearchVisibilityView typ)
. contentJson
)
Expand Down Expand Up @@ -661,7 +661,7 @@ getEmailConsentLog email = do
"galeb"
g
( method GET
. paths ["/i/consent/logs/emails", toByteString' email]
. paths ["i", "consent", "logs", "emails", toByteString' email]
. expect2xx
)
parseResponse (mkError status502 "bad-upstream") r
Expand Down Expand Up @@ -695,7 +695,7 @@ getMarketoResult email = do
"galeb"
g
( method GET
. paths ["/i/marketo/emails", toByteString' email]
. paths ["i", "marketo", "emails", toByteString' email]
. expectStatus (`elem` [200, 404])
)
-- 404 is acceptable when marketo doesn't know about this user, return an empty result
Expand All @@ -716,7 +716,7 @@ getUserConsentLog uid = do
"galeb"
g
( method GET
. paths ["/i/consent/logs/users", toByteString' uid]
. paths ["i", "consent", "logs", "users", toByteString' uid]
. expect2xx
)
parseResponse (mkError status502 "bad-upstream") r
Expand Down