Move api gateway and api gateway to events folder

__tests__/old-unit/LambdaProxyIntegrationEventTest.js

@@ -1,5 +1,5 @@
 import RequestBuilder from './support/RequestBuilder.js'
-import LambdaProxyIntegrationEvent from '../../src/api-gateway/lambda-events/LambdaProxyIntegrationEvent.js'
+import LambdaProxyIntegrationEvent from '../../src/events/api-gateway/lambda-events/LambdaProxyIntegrationEvent.js'
 
 const { isArray } = Array
 const { keys } = Object

__tests__/old-unit/authCanExecuteResourceTest.js

@@ -1,4 +1,4 @@
-import authCanExecuteResource from '../../src/api-gateway/authCanExecuteResource.js'
+import authCanExecuteResource from '../../src/events/api-gateway/authCanExecuteResource.js'
 
 describe('authCanExecuteResource', () => {
   describe('when the policy has one Statement in an array', () => {

__tests__/old-unit/authFunctionNameExtractorTest.js

@@ -1,4 +1,4 @@
-import authFunctionNameExtractor from '../../src/api-gateway/authFunctionNameExtractor.js'
+import authFunctionNameExtractor from '../../src/events/api-gateway/authFunctionNameExtractor.js'
 
 describe('authFunctionNameExtractor', () => {
   const dummyLogging = (arrayStore) => (message) => {

__tests__/old-unit/authMatchPolicyResourceTest.js

@@ -1,4 +1,4 @@
-import authMatchPolicyResource from '../../src/api-gateway/authMatchPolicyResource.js'
+import authMatchPolicyResource from '../../src/events/api-gateway/authMatchPolicyResource.js'
 
 describe('authMatchPolicyResource', () => {
   describe('when resource has no wildcards', () => {

__tests__/old-unit/velocityContextTest.js

@@ -1,4 +1,4 @@
-import VelocityContext from '../../src/api-gateway/lambda-events/VelocityContext.js'
+import VelocityContext from '../../src/events/api-gateway/lambda-events/VelocityContext.js'
 
 describe('#urlDecode', () => {
   test('should decode url query parameters', () => {

rollup.config.js

@@ -63,7 +63,7 @@ export default [
       rollupPluginCopy({
         targets: [
           {
-            src: 'src/api-gateway/templates/*.vm',
+            src: 'src/events/api-gateway/templates/*.vm',
             dest: 'dist/templates',
           },
           { src: 'src/lambda/handler-runner/*.{py,rb}', dest: 'dist' },

src/ServerlessOffline.js

@@ -125,7 +125,9 @@ export default class ServerlessOffline {
   }
 
   async _createApiGateway() {
-    const { default: ApiGateway } = await import('./api-gateway/index.js')
+    const { default: ApiGateway } = await import(
+      './events/api-gateway/index.js'
+    )
 
     this._apiGateway = new ApiGateway(
       this._service,
@@ -142,7 +144,7 @@ export default class ServerlessOffline {
 
   async _createApiGatewayWebSocket() {
     const { default: ApiGatewayWebSocket } = await import(
-      './api-gateway-websocket/index.js'
+      './events/api-gateway-websocket/index.js'
     )
 
     this._apiGatewayWebSocket = new ApiGatewayWebSocket(

src/api-gateway-websocket/HttpServer.js → src/events/api-gateway-websocket/HttpServer.js

@@ -1,6 +1,6 @@
 import { Server } from '@hapi/hapi'
 import { catchAllRoute, connectionsRoutes } from './http-routes/index.js'
-import serverlessLog from '../serverlessLog.js'
+import serverlessLog from '../../serverlessLog.js'
 
 export default class HttpServer {
   constructor(options, webSocketClients) {

src/api-gateway-websocket/WebSocketClients.js → src/events/api-gateway-websocket/WebSocketClients.js

@@ -4,13 +4,13 @@ import {
   WebSocketDisconnectEvent,
   WebSocketEvent,
 } from './lambda-events/index.js'
-import debugLog from '../debugLog.js'
-import serverlessLog from '../serverlessLog.js'
+import debugLog from '../../debugLog.js'
+import serverlessLog from '../../serverlessLog.js'
 import {
   DEFAULT_WEBSOCKETS_API_ROUTE_SELECTION_EXPRESSION,
   DEFAULT_WEBSOCKETS_ROUTE,
-} from '../config/index.js'
-import { createUniqueId, jsonPath } from '../utils/index.js'
+} from '../../config/index.js'
+import { createUniqueId, jsonPath } from '../../utils/index.js'
 
 const { parse, stringify } = JSON
 

src/api-gateway-websocket/WebSocketServer.js → src/events/api-gateway-websocket/WebSocketServer.js

@@ -1,7 +1,7 @@
 import { Server } from 'ws'
-import debugLog from '../debugLog.js'
-import serverlessLog from '../serverlessLog.js'
-import { createUniqueId } from '../utils/index.js'
+import debugLog from '../../debugLog.js'
+import serverlessLog from '../../serverlessLog.js'
+import { createUniqueId } from '../../utils/index.js'
 
 export default class WebSocketServer {
   constructor(options, webSocketClients, sharedServer) {

src/api-gateway-websocket/http-routes/_catchAll/catchAllRoute.js → src/events/api-gateway-websocket/http-routes/_catchAll/catchAllRoute.js

@@ -1,4 +1,4 @@
-import debugLog from '../../../debugLog.js'
+import debugLog from '../../../../debugLog.js'
 
 export default function catchAllRoute() {
   return {

src/api-gateway-websocket/http-routes/connections/connectionsRoutes.js → src/events/api-gateway-websocket/http-routes/connections/connectionsRoutes.js

@@ -1,5 +1,5 @@
 import ConnectionsController from './ConnectionsController.js'
-import debugLog from '../../../debugLog.js'
+import debugLog from '../../../../debugLog.js'
 
 export default function connectionsRoutes(webSocketClients) {
   const connectionsController = new ConnectionsController(webSocketClients)

src/api-gateway-websocket/lambda-events/WebSocketConnectEvent.js → src/events/api-gateway-websocket/lambda-events/WebSocketConnectEvent.js

@@ -4,7 +4,7 @@ import {
   parseMultiValueHeaders,
   parseMultiValueQueryStringParameters,
   parseQueryStringParameters,
-} from '../../utils/index.js'
+} from '../../../utils/index.js'
 
 export default class WebSocketConnectEvent {
   constructor(connectionId, request, options) {

src/api-gateway-websocket/lambda-events/WebSocketDisconnectEvent.js → src/events/api-gateway-websocket/lambda-events/WebSocketDisconnectEvent.js

@@ -1,5 +1,5 @@
 import WebSocketRequestContext from './WebSocketRequestContext.js'
-import { parseHeaders, parseMultiValueHeaders } from '../../utils/index.js'
+import { parseHeaders, parseMultiValueHeaders } from '../../../utils/index.js'
 
 export default class WebSocketDisconnectEvent {
   constructor(connectionId) {

src/api-gateway-websocket/lambda-events/WebSocketRequestContext.js → src/events/api-gateway-websocket/lambda-events/WebSocketRequestContext.js

@@ -1,4 +1,4 @@
-import { createUniqueId, formatToClfTime } from '../../utils/index.js'
+import { createUniqueId, formatToClfTime } from '../../../utils/index.js'
 
 const { now } = Date
 

src/api-gateway/Endpoint.js → src/events/api-gateway/Endpoint.js

@@ -1,7 +1,7 @@
 import { existsSync, readFileSync } from 'fs'
 import { resolve } from 'path'
-import debugLog from '../debugLog.js'
 import OfflineEndpoint from './OfflineEndpoint.js'
+import debugLog from '../../debugLog.js'
 
 function readFile(filePath) {
   return readFileSync(filePath, 'utf8')

src/api-gateway/HttpServer.js → src/events/api-gateway/HttpServer.js

@@ -17,14 +17,14 @@ import {
   VelocityContext,
 } from './lambda-events/index.js'
 import parseResources from './parseResources.js'
-import debugLog from '../debugLog.js'
-import serverlessLog, { logRoute } from '../serverlessLog.js'
+import debugLog from '../../debugLog.js'
+import serverlessLog, { logRoute } from '../../serverlessLog.js'
 import {
   createUniqueId,
   detectEncoding,
   jsonPath,
   splitHandlerPathAndName,
-} from '../utils/index.js'
+} from '../../utils/index.js'
 
 const { parse, stringify } = JSON
 

src/api-gateway/authFunctionNameExtractor.js → src/events/api-gateway/authFunctionNameExtractor.js

@@ -1,4 +1,4 @@
-import serverlessLog from '../serverlessLog.js'
+import serverlessLog from '../../serverlessLog.js'
 
 // FIXME "slessLog" param is only remaining for tests, should be removed
 export default function extract(endpoint, slessLog) {

src/api-gateway/createAuthScheme.js → src/events/api-gateway/createAuthScheme.js

@@ -1,18 +1,18 @@
 import { join } from 'path'
 import Boom from '@hapi/boom'
 import authCanExecuteResource from './authCanExecuteResource.js'
-import debugLog from '../debugLog.js'
-import HandlerRunner from '../lambda/handler-runner/index.js'
-import LambdaContext from '../lambda/LambdaContext.js'
-import serverlessLog from '../serverlessLog.js'
+import debugLog from '../../debugLog.js'
+import HandlerRunner from '../../lambda/handler-runner/index.js'
+import LambdaContext from '../../lambda/LambdaContext.js'
+import serverlessLog from '../../serverlessLog.js'
 import {
   nullIfEmpty,
   parseHeaders,
   parseMultiValueHeaders,
   parseMultiValueQueryStringParameters,
   parseQueryStringParameters,
   splitHandlerPathAndName,
-} from '../utils/index.js'
+} from '../../utils/index.js'
 
 export default function createAuthScheme(
   authFun,

src/api-gateway/http-routes/invoke/InvokeController.js → src/events/api-gateway/http-routes/invoke/InvokeController.js

@@ -1,5 +1,5 @@
-import serverlessLog from '../../../serverlessLog.js'
-import { createUniqueId } from '../../../utils/index.js'
+import serverlessLog from '../../../../serverlessLog.js'
+import { createUniqueId } from '../../../../utils/index.js'
 
 export default class InvokeController {
   constructor(lambda) {

src/api-gateway/lambda-events/LambdaProxyIntegrationEvent.js → src/events/api-gateway/lambda-events/LambdaProxyIntegrationEvent.js

@@ -8,7 +8,7 @@ import {
   parseMultiValueHeaders,
   parseQueryStringParameters,
   parseMultiValueQueryStringParameters,
-} from '../../utils/index.js'
+} from '../../../utils/index.js'
 
 const { parse } = JSON
 

src/api-gateway/lambda-events/VelocityContext.js → src/events/api-gateway/lambda-events/VelocityContext.js

@@ -6,7 +6,7 @@ import {
   isPlainObject,
   jsonPath,
   parseHeaders,
-} from '../../utils/index.js'
+} from '../../../utils/index.js'
 
 const { parse, stringify } = JSON
 const { entries, fromEntries } = Object

src/api-gateway/lambda-events/renderVelocityTemplateObject.js → src/events/api-gateway/lambda-events/renderVelocityTemplateObject.js

@@ -1,7 +1,7 @@
 import { Compile, parse } from 'velocityjs'
 import runInPollutedScope from '../javaHelpers.js'
-import debugLog from '../../debugLog.js'
-import { isPlainObject } from '../../utils/index.js'
+import debugLog from '../../../debugLog.js'
+import { isPlainObject } from '../../../utils/index.js'
 
 const { entries } = Object