Skip to content

internal endpoints swagger additional endpoints #3007

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
supersven merged 12 commits into from
Feb 17, 2023
Merged

internal endpoints swagger additional endpoints #3007

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
ad5b524
Expose swagger docs for brig's internal (servantified) endpoints
supersven Jan 16, 2023
b22753b
Delete unused import
supersven Feb 15, 2023
085bf0b
Kill one orphan
supersven Feb 15, 2023
74c32a8
Cleanup
supersven Feb 15, 2023
1942770
Better name
supersven Feb 15, 2023
8624fe8
Remove done todo
supersven Feb 15, 2023
13e157a
Play safe: Use the existing JSON representation of LegalholdProtectee
supersven Feb 16, 2023
f1b6fd2
Add some JSON roundtrip tests
supersven Feb 16, 2023
30b80ef
Tag all Swagger paths
supersven Feb 16, 2023
0c5e9dc
Add changelog
supersven Feb 16, 2023
b5cf422
Add copyright notices
supersven Feb 16, 2023
61e3d44
hi ci
supersven Feb 16, 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
1 change: 1 addition & 0 deletions changelog.d/2-features/add-missing-internal-endpoints-to-swagger
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Add internal endpoints of `cargohold`, `galley`, `legalhold` and `spar` to the Swagger docs for internal endpoints.
2 changes: 0 additions & 2 deletions libs/galley-types/galley-types.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,10 @@ library
Galley.Types
Galley.Types.Bot
Galley.Types.Bot.Service
Galley.Types.Conversations.Intra
Galley.Types.Conversations.Members
Galley.Types.Conversations.One2One
Galley.Types.Conversations.Roles
Galley.Types.Teams
Galley.Types.Teams.Intra

other-modules: Paths_galley_types
hs-source-dirs: src
Expand Down
2 changes: 0 additions & 2 deletions libs/galley-types/test/unit/Test/Galley/Types.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ import Control.Lens
import Data.Set hiding (drop)
import qualified Data.Set as Set
import Galley.Types.Teams
import Galley.Types.Teams.Intra (GuardLegalholdPolicyConflicts)
import Imports
import Test.Galley.Roundtrip (testRoundTrip)
import qualified Test.QuickCheck as QC
Expand All @@ -49,7 +48,6 @@ tests =
assertBool "owner.self" ((rolePermissions r2 ^. self) `isSubsetOf` (rolePermissions r1 ^. self))
assertBool "owner.copy" ((rolePermissions r2 ^. copy) `isSubsetOf` (rolePermissions r1 ^. copy)),
testRoundTrip @FeatureFlags,
testRoundTrip @GuardLegalholdPolicyConflicts,
testGroup
"permissionsRole, rolePermissions"
[ testCase "'Role' maps to expected permissions" $ do
Expand Down
15 changes: 14 additions & 1 deletion libs/wire-api/src/Wire/API/Routes/Internal/Cargohold.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,21 @@

module Wire.API.Routes.Internal.Cargohold where

import Control.Lens
import Data.Swagger
import Imports
import Servant
import Servant.Swagger
import Wire.API.Routes.MultiVerb
import Wire.API.SwaggerServant

type InternalAPI =
"i" :> "status" :> MultiVerb 'GET '() '[RespondEmpty 200 "OK"] ()
SwaggerTag "cargohold"
:> "i"
:> "status"
:> MultiVerb 'GET '() '[RespondEmpty 200 "OK"] ()

swaggerDoc :: Swagger
swaggerDoc =
toSwagger (Proxy @InternalAPI)
& info . title .~ "Wire-Server internal cargohold API"
Loading