feat: remove more serverless v2 logging

dherault · Jun 1, 2022 · 6b101aa · 6b101aa
1 parent 404093c
commit 6b101aa
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 44 deletions.
diff --git a/src/debugLog.js b/src/debugLog.js
diff --git a/src/events/http/HttpServer.js b/src/events/http/HttpServer.js
@@ -19,7 +19,6 @@ import {
 import LambdaProxyIntegrationEventV2 from './lambda-events/LambdaProxyIntegrationEventV2.js'
 import parseResources from './parseResources.js'
 import payloadSchemaValidator from './payloadSchemaValidator.js'
-import debugLog from '../../debugLog.js'
 import serverlessLog, { logRoutes } from '../../serverlessLog.js'
 import {
   detectEncoding,
@@ -581,7 +580,7 @@ export default class HttpServer {
 
         if (requestToken) {
           if (requestToken !== this.#options.apiKey) {
-            debugLog(
+            this.log.debug(
               `Method ${method} of function ${functionKey} token ${requestToken} not valid`,
             )
 
@@ -595,7 +594,7 @@ export default class HttpServer {
           const { usageIdentifierKey } = request.auth.credentials
 
           if (usageIdentifierKey !== this.#options.apiKey) {
-            debugLog(
+            this.log.debug(
               `Method ${method} of function ${functionKey} token ${usageIdentifierKey} not valid`,
             )
 

diff --git a/src/events/http/createAuthScheme.js b/src/events/http/createAuthScheme.js
@@ -1,7 +1,6 @@
 import Boom from '@hapi/boom'
 import authCanExecuteResource from '../authCanExecuteResource.js'
 import authValidateContext from '../authValidateContext.js'
-import debugLog from '../../debugLog.js'
 import serverlessLog from '../../serverlessLog.js'
 import {
   nullIfEmpty,
@@ -106,13 +105,7 @@ export default function createAuthScheme(
           identityValidationExpression.test(authorization)
         const finalAuthorization = matchedAuthorization ? authorization : ''
 
-        if (log) {
-          log.debug(
-            `Retrieved ${identityHeader} header "${finalAuthorization}"`,
-          )
-        } else {
-          debugLog(`Retrieved ${identityHeader} header "${finalAuthorization}"`)
-        }
+        log.debug(`Retrieved ${identityHeader} header "${finalAuthorization}"`)
 
         event = {
           ...event,

diff --git a/src/events/http/lambda-events/renderVelocityTemplateObject.js b/src/events/http/lambda-events/renderVelocityTemplateObject.js
@@ -1,6 +1,5 @@
 import velocityjs from 'velocityjs'
 import runInPollutedScope from '../javaHelpers.js'
-import debugLog from '../../../debugLog.js'
 import { isPlainObject } from '../../../utils/index.js'
 
 const { parse } = JSON
@@ -30,11 +29,7 @@ function renderVelocityString(velocityString, context, v3Utils) {
     }).render(context, null, true),
   )
 
-  if (log) {
-    log.debug('Velocity rendered:', renderResult || 'undefined')
-  } else {
-    debugLog('Velocity rendered:', renderResult || 'undefined')
-  }
+  log.debug('Velocity rendered:', renderResult || 'undefined')
 
   // Haaaa Velocity... this language sure loves strings a lot
   switch (renderResult) {
@@ -76,11 +71,7 @@ export default function renderVelocityTemplateObject(
   // Let's check again
   if (isPlainObject(toProcess)) {
     entries(toProcess).forEach(([key, value]) => {
-      if (log) {
-        log.debug('Processing key:', key, '- value:', value)
-      } else {
-        debugLog('Processing key:', key, '- value:', value)
-      }
+      log.debug('Processing key:', key, '- value:', value)
 
       if (typeof value === 'string') {
         result[key] = renderVelocityString(value, context, v3Utils)

diff --git a/src/utils/getHttpApiCorsConfig.js b/src/utils/getHttpApiCorsConfig.js
@@ -1,5 +1,3 @@
-import debugLog from '../debugLog.js'
-
 export default function getHttpApiCorsConfig(httpApiCors, { log }) {
   if (httpApiCors === true) {
     // default values that should be set by serverless
@@ -17,18 +15,12 @@ export default function getHttpApiCorsConfig(httpApiCors, { log }) {
       allowedOrigins: ['*'],
     }
 
-    if (log) {
-      log.debug('Using CORS policy', c)
-    } else {
-      debugLog('Using CORS policy', c)
-    }
+    log.debug('Using CORS policy', c)
+
     return c
   }
-  if (log) {
-    log.debug('Using CORS policy', httpApiCors)
-  } else {
-    debugLog('Using CORS policy', httpApiCors)
-  }
+
+  log.debug('Using CORS policy', httpApiCors)
 
   return httpApiCors
 }
diff --git a/src/utils/jsonPath.js b/src/utils/jsonPath.js
@@ -1,9 +1,6 @@
 import { JSONPath } from 'jsonpath-plus'
-// import debugLog from '../debugLog.js'
 
 export default function jsonPath(json, path) {
-  // debugLog('Calling jsonPath:', path)
-
   // NOTE: JSONPath returns undefined if 'json' is e.g. null, undefined, string,
   // number (anything other than JSON)
   const [result] =
@@ -12,7 +9,5 @@ export default function jsonPath(json, path) {
       path,
     }) || []
 
-  // debugLog('jsonPath resolved:', result)
-
   return result
 }