Address TODOs

elastic · Dec 15, 2020 · ff8489f · ff8489f
1 parent b1ed8e7
commit ff8489f
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/src/core/server/http/http_server.test.ts b/src/core/server/http/http_server.test.ts
@@ -1166,7 +1166,7 @@ describe('timeout options', () => {
       router.get(
         {
           path: '/',
-          validate: false, // TODO: Figure out if we can/should use `{ body: schema.any() }` instead
+          validate: { body: schema.maybe(schema.any()) },
         },
         (context, req, res) => {
           return res.ok({
@@ -1199,7 +1199,7 @@ describe('timeout options', () => {
       router.get(
         {
           path: '/',
-          validate: false, // TODO: Figure out if we can/should use `{ body: schema.any() }` instead
+          validate: { body: schema.maybe(schema.any()) },
           options: { timeout: { idleSocket: 12000 } },
         },
         (context, req, res) => {

diff --git a/src/core/server/http/http_server.ts b/src/core/server/http/http_server.ts
@@ -190,11 +190,11 @@ export class HttpServer {
                   output,
                   parse,
                   timeout: timeout?.payload,
-                  multipart: true, // TODO: Figure out what the default value should be
+                  multipart: true,
                 }
               : undefined,
             timeout: {
-              socket: timeout?.idleSocket ?? this.config!.socketTimeout ?? false, // TODO: Do we really want to fall back to NO timeout? Shouldn't we default to the default Node.js timeout of 2 minutes?
+              socket: timeout?.idleSocket ?? this.config!.socketTimeout,
             },
           },
         };

diff --git a/src/core/server/http/router/response_adapter.ts b/src/core/server/http/router/response_adapter.ts
@@ -137,7 +137,7 @@ export class HapiResponseAdapter {
 
     const attributes = getErrorAttributes(payload);
     if (attributes) {
-      // @ts-expect-error `attributes` does not exist on the `Payload` type, however it does exist in real life (https://github.com/hapijs/boom/issues/277)
+      // @ts-expect-error Custom properties on `output.payload` aren't allowed by TS, however, it's the only way to send custom data to the client (https://github.com/hapijs/boom/issues/277).
       error.output.payload.attributes = attributes;
     }
 

diff --git a/src/core/server/saved_objects/export/get_sorted_objects_for_export.ts b/src/core/server/saved_objects/export/get_sorted_objects_for_export.ts
@@ -154,7 +154,7 @@ async function fetchByObjects({
   const erroredObjects = bulkGetResult.saved_objects.filter((obj) => !!obj.error);
   if (erroredObjects.length) {
     const err = Boom.badRequest();
-    // @ts-expect-error `attributes` does not exist on the `Payload` type, however it does exist in real life (https://github.com/hapijs/boom/issues/277)
+    // @ts-expect-error Custom properties on `output.payload` aren't allowed by TS, however, it's the only way to send custom data to the client (https://github.com/hapijs/boom/issues/277).
     err.output.payload.attributes = {
       objects: erroredObjects,
     };

diff --git a/src/core/server/saved_objects/import/validate_references.ts b/src/core/server/saved_objects/import/validate_references.ts
@@ -71,7 +71,7 @@ export async function getNonExistingReferenceAsKeys(
   );
   if (erroredObjects.length) {
     const err = Boom.badRequest();
-    // @ts-expect-error `attributes` does not exist on the `Payload` type, however it does exist in real life (https://github.com/hapijs/boom/issues/277)
+    // @ts-expect-error Custom properties on `output.payload` aren't allowed by TS, however, it's the only way to send custom data to the client (https://github.com/hapijs/boom/issues/277).
     err.output.payload.attributes = {
       objects: erroredObjects,
     };