Merge pull request #1 from bsgip/removedcreaterequest

Removed CreateEndpointRequest

Author: joshvote

src/cactus_client_notifications/schema/__init__.py

@@ -26,13 +26,6 @@
 URI_ENDPOINT = "/webhook/{endpoint_id}"
 
 
-@dataclass(frozen=True)
-class CreateEndpointRequest(JSONWizard):
-    """Used for requesting the generation of a new testing endpoint"""
-
-    test_id: str  # Purely informational
-
-
 @dataclass(frozen=True)
 class CreateEndpointResponse(JSONWizard):
     """Used in response to a CreateEndpointRequest"""

src/cactus_client_notifications/server/handler.py

@@ -7,7 +7,6 @@
     URI_ENDPOINT,
     CollectEndpointResponse,
     ConfigureEndpointRequest,
-    CreateEndpointRequest,
     CreateEndpointResponse,
 )
 from cactus_client_notifications.server.endpoint_store import (
@@ -64,7 +63,7 @@ def generate_public_uri(server_settings: ServerSettings, endpoint_id: str) -> st
 
 
 async def post_manage_endpoint_list(request: web.Request) -> web.Response:
-    """Expects a CreateEndpointResponse to be included in the POST body. Creates a new endpoint
+    """Expects an empty POST body. Creates a new endpoint
 
     Args:
         request: An aiohttp.web.Request instance.
@@ -75,16 +74,8 @@ async def post_manage_endpoint_list(request: web.Request) -> web.Response:
         a 201 (CREATED) on success
         a 507 (INSUFFICIENT_STORAGE) if the webserver has too many notification endpoints at this moment
     """
-    try:
-        raw_json = await request.text()
-    except ContentTypeError:
-        return web.Response(status=http.HTTPStatus.BAD_REQUEST, text="Missing JSON body")
-
-    create_request = CreateEndpointRequest.from_json(raw_json)
-    if isinstance(create_request, list):
-        return web.Response(status=http.HTTPStatus.BAD_REQUEST, text="Singular CreateEndpointRequest is required.")
 
-    logger.info(f"Creating endpoint for Test ID {create_request.test_id} for {request.remote}")
+    logger.info(f"Creating endpoint for {request.remote}")
 
     try:
         endpoint_id = await request.app[APPKEY_NOTIFICATION_STORE].create_endpoint()

tests/integration/test_endpoints.py

@@ -7,13 +7,12 @@
 from cactus_client_notifications.schema import (
     CollectEndpointResponse,
     ConfigureEndpointRequest,
-    CreateEndpointRequest,
     CreateEndpointResponse,
 )
 
 
 async def create_endpoint(client_session: ClientSession, endpoint: str) -> CreateEndpointResponse:
-    result = await client_session.post(endpoint, json=CreateEndpointRequest("abc-123").to_dict())
+    result = await client_session.post(endpoint)
     assert result.status == HTTPStatus.CREATED
     assert result.content_type == "application/json"
     response = CreateEndpointResponse.from_json(await result.text())
@@ -129,7 +128,7 @@ async def test_max_endpoint_limits(client_session: ClientSession):
     await create_endpoint(client_session, "/manage/endpoint")
 
     # Can't create more unless we delete first
-    result = await client_session.post("/manage/endpoint", json=CreateEndpointRequest("abc-123").to_dict())
+    result = await client_session.post("/manage/endpoint")
     assert result.status == HTTPStatus.INSUFFICIENT_STORAGE
     await delete_endpoint(client_session, f"/manage/endpoint/{endpoint2.endpoint_id}")
     await create_endpoint(client_session, "/manage/endpoint")

tests/unit/schema/test_models.py

@@ -13,7 +13,6 @@
         schema.CollectedNotification,
         schema.CollectEndpointResponse,
         schema.ConfigureEndpointRequest,
-        schema.CreateEndpointRequest,
         schema.CreateEndpointResponse,
     ],
 )