From df22f45a0676dced63e7d38b9d750dcf31522801 Mon Sep 17 00:00:00 2001 From: Daniel Nalborczyk Date: Sun, 22 Sep 2019 21:22:16 -0400 Subject: [PATCH] Move api gateway and api gateway to events folder --- __tests__/old-unit/LambdaProxyIntegrationEventTest.js | 2 +- __tests__/old-unit/authCanExecuteResourceTest.js | 2 +- __tests__/old-unit/authFunctionNameExtractorTest.js | 2 +- __tests__/old-unit/authMatchPolicyResourceTest.js | 2 +- __tests__/old-unit/velocityContextTest.js | 2 +- rollup.config.js | 2 +- src/ServerlessOffline.js | 6 ++++-- .../api-gateway-websocket/ApiGatewayWebSocket.js | 0 src/{ => events}/api-gateway-websocket/HttpServer.js | 2 +- .../api-gateway-websocket/WebSocketClients.js | 8 ++++---- .../api-gateway-websocket/WebSocketServer.js | 6 +++--- .../http-routes/_catchAll/catchAllRoute.js | 2 +- .../http-routes/_catchAll/index.js | 0 .../http-routes/connections/ConnectionsController.js | 0 .../http-routes/connections/connectionsRoutes.js | 2 +- .../http-routes/connections/index.js | 0 .../api-gateway-websocket/http-routes/index.js | 0 src/{ => events}/api-gateway-websocket/index.js | 0 .../lambda-events/WebSocketConnectEvent.js | 2 +- .../lambda-events/WebSocketDisconnectEvent.js | 2 +- .../lambda-events/WebSocketEvent.js | 0 .../lambda-events/WebSocketRequestContext.js | 2 +- .../api-gateway-websocket/lambda-events/index.js | 0 src/{ => events}/api-gateway/ApiGateway.js | 0 src/{ => events}/api-gateway/Endpoint.js | 2 +- src/{ => events}/api-gateway/HttpServer.js | 6 +++--- src/{ => events}/api-gateway/OfflineEndpoint.js | 0 src/{ => events}/api-gateway/authCanExecuteResource.js | 0 .../api-gateway/authFunctionNameExtractor.js | 2 +- .../api-gateway/authMatchPolicyResource.js | 0 src/{ => events}/api-gateway/createAuthScheme.js | 10 +++++----- src/{ => events}/api-gateway/http-routes/index.js | 0 .../api-gateway/http-routes/invoke/InvokeController.js | 4 ++-- .../api-gateway/http-routes/invoke/index.js | 0 .../api-gateway/http-routes/invoke/invokeRoute.js | 0 src/{ => events}/api-gateway/index.js | 0 src/{ => events}/api-gateway/javaHelpers.js | 0 .../lambda-events/LambdaIntegrationEvent.js | 0 .../lambda-events/LambdaProxyIntegrationEvent.js | 2 +- .../api-gateway/lambda-events/VelocityContext.js | 2 +- src/{ => events}/api-gateway/lambda-events/index.js | 0 .../lambda-events/renderVelocityTemplateObject.js | 4 ++-- src/{ => events}/api-gateway/parseResources.js | 0 .../api-gateway/templates/offline-default.req.vm | 0 .../api-gateway/templates/offline-default.res.vm | 0 45 files changed, 39 insertions(+), 37 deletions(-) rename src/{ => events}/api-gateway-websocket/ApiGatewayWebSocket.js (100%) rename src/{ => events}/api-gateway-websocket/HttpServer.js (96%) rename src/{ => events}/api-gateway-websocket/WebSocketClients.js (96%) rename src/{ => events}/api-gateway-websocket/WebSocketServer.js (87%) rename src/{ => events}/api-gateway-websocket/http-routes/_catchAll/catchAllRoute.js (83%) rename src/{ => events}/api-gateway-websocket/http-routes/_catchAll/index.js (100%) rename src/{ => events}/api-gateway-websocket/http-routes/connections/ConnectionsController.js (100%) rename src/{ => events}/api-gateway-websocket/http-routes/connections/connectionsRoutes.js (96%) rename src/{ => events}/api-gateway-websocket/http-routes/connections/index.js (100%) rename src/{ => events}/api-gateway-websocket/http-routes/index.js (100%) rename src/{ => events}/api-gateway-websocket/index.js (100%) rename src/{ => events}/api-gateway-websocket/lambda-events/WebSocketConnectEvent.js (98%) rename src/{ => events}/api-gateway-websocket/lambda-events/WebSocketDisconnectEvent.js (89%) rename src/{ => events}/api-gateway-websocket/lambda-events/WebSocketEvent.js (100%) rename src/{ => events}/api-gateway-websocket/lambda-events/WebSocketRequestContext.js (94%) rename src/{ => events}/api-gateway-websocket/lambda-events/index.js (100%) rename src/{ => events}/api-gateway/ApiGateway.js (100%) rename src/{ => events}/api-gateway/Endpoint.js (98%) rename src/{ => events}/api-gateway/HttpServer.js (99%) rename src/{ => events}/api-gateway/OfflineEndpoint.js (100%) rename src/{ => events}/api-gateway/authCanExecuteResource.js (100%) rename src/{ => events}/api-gateway/authFunctionNameExtractor.js (97%) rename src/{ => events}/api-gateway/authMatchPolicyResource.js (100%) rename src/{ => events}/api-gateway/createAuthScheme.js (96%) rename src/{ => events}/api-gateway/http-routes/index.js (100%) rename src/{ => events}/api-gateway/http-routes/invoke/InvokeController.js (87%) rename src/{ => events}/api-gateway/http-routes/invoke/index.js (100%) rename src/{ => events}/api-gateway/http-routes/invoke/invokeRoute.js (100%) rename src/{ => events}/api-gateway/index.js (100%) rename src/{ => events}/api-gateway/javaHelpers.js (100%) rename src/{ => events}/api-gateway/lambda-events/LambdaIntegrationEvent.js (100%) rename src/{ => events}/api-gateway/lambda-events/LambdaProxyIntegrationEvent.js (99%) rename src/{ => events}/api-gateway/lambda-events/VelocityContext.js (99%) rename src/{ => events}/api-gateway/lambda-events/index.js (100%) rename src/{ => events}/api-gateway/lambda-events/renderVelocityTemplateObject.js (96%) rename src/{ => events}/api-gateway/parseResources.js (100%) rename src/{ => events}/api-gateway/templates/offline-default.req.vm (100%) rename src/{ => events}/api-gateway/templates/offline-default.res.vm (100%) diff --git a/__tests__/old-unit/LambdaProxyIntegrationEventTest.js b/__tests__/old-unit/LambdaProxyIntegrationEventTest.js index 51416097d..1ff54150f 100644 --- a/__tests__/old-unit/LambdaProxyIntegrationEventTest.js +++ b/__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 diff --git a/__tests__/old-unit/authCanExecuteResourceTest.js b/__tests__/old-unit/authCanExecuteResourceTest.js index c169aae45..8346b199f 100644 --- a/__tests__/old-unit/authCanExecuteResourceTest.js +++ b/__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', () => { diff --git a/__tests__/old-unit/authFunctionNameExtractorTest.js b/__tests__/old-unit/authFunctionNameExtractorTest.js index 59a5bd09f..057b2295f 100644 --- a/__tests__/old-unit/authFunctionNameExtractorTest.js +++ b/__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) => { diff --git a/__tests__/old-unit/authMatchPolicyResourceTest.js b/__tests__/old-unit/authMatchPolicyResourceTest.js index 703691087..11747fd2e 100644 --- a/__tests__/old-unit/authMatchPolicyResourceTest.js +++ b/__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', () => { diff --git a/__tests__/old-unit/velocityContextTest.js b/__tests__/old-unit/velocityContextTest.js index 70083932d..ff0584710 100644 --- a/__tests__/old-unit/velocityContextTest.js +++ b/__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', () => { diff --git a/rollup.config.js b/rollup.config.js index 53cb2bf7a..418156a1d 100644 --- a/rollup.config.js +++ b/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' }, diff --git a/src/ServerlessOffline.js b/src/ServerlessOffline.js index 287a8d364..e4f209ac5 100644 --- a/src/ServerlessOffline.js +++ b/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( diff --git a/src/api-gateway-websocket/ApiGatewayWebSocket.js b/src/events/api-gateway-websocket/ApiGatewayWebSocket.js similarity index 100% rename from src/api-gateway-websocket/ApiGatewayWebSocket.js rename to src/events/api-gateway-websocket/ApiGatewayWebSocket.js diff --git a/src/api-gateway-websocket/HttpServer.js b/src/events/api-gateway-websocket/HttpServer.js similarity index 96% rename from src/api-gateway-websocket/HttpServer.js rename to src/events/api-gateway-websocket/HttpServer.js index dfe261409..444a07471 100644 --- a/src/api-gateway-websocket/HttpServer.js +++ b/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) { diff --git a/src/api-gateway-websocket/WebSocketClients.js b/src/events/api-gateway-websocket/WebSocketClients.js similarity index 96% rename from src/api-gateway-websocket/WebSocketClients.js rename to src/events/api-gateway-websocket/WebSocketClients.js index 19cbad69b..a3ebb52f2 100644 --- a/src/api-gateway-websocket/WebSocketClients.js +++ b/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 diff --git a/src/api-gateway-websocket/WebSocketServer.js b/src/events/api-gateway-websocket/WebSocketServer.js similarity index 87% rename from src/api-gateway-websocket/WebSocketServer.js rename to src/events/api-gateway-websocket/WebSocketServer.js index f7e2d1260..d0e0bd318 100644 --- a/src/api-gateway-websocket/WebSocketServer.js +++ b/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) { diff --git a/src/api-gateway-websocket/http-routes/_catchAll/catchAllRoute.js b/src/events/api-gateway-websocket/http-routes/_catchAll/catchAllRoute.js similarity index 83% rename from src/api-gateway-websocket/http-routes/_catchAll/catchAllRoute.js rename to src/events/api-gateway-websocket/http-routes/_catchAll/catchAllRoute.js index 46ae2b905..d0e1ef5e3 100644 --- a/src/api-gateway-websocket/http-routes/_catchAll/catchAllRoute.js +++ b/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 { diff --git a/src/api-gateway-websocket/http-routes/_catchAll/index.js b/src/events/api-gateway-websocket/http-routes/_catchAll/index.js similarity index 100% rename from src/api-gateway-websocket/http-routes/_catchAll/index.js rename to src/events/api-gateway-websocket/http-routes/_catchAll/index.js diff --git a/src/api-gateway-websocket/http-routes/connections/ConnectionsController.js b/src/events/api-gateway-websocket/http-routes/connections/ConnectionsController.js similarity index 100% rename from src/api-gateway-websocket/http-routes/connections/ConnectionsController.js rename to src/events/api-gateway-websocket/http-routes/connections/ConnectionsController.js diff --git a/src/api-gateway-websocket/http-routes/connections/connectionsRoutes.js b/src/events/api-gateway-websocket/http-routes/connections/connectionsRoutes.js similarity index 96% rename from src/api-gateway-websocket/http-routes/connections/connectionsRoutes.js rename to src/events/api-gateway-websocket/http-routes/connections/connectionsRoutes.js index c3da689a6..90a6a087a 100644 --- a/src/api-gateway-websocket/http-routes/connections/connectionsRoutes.js +++ b/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) diff --git a/src/api-gateway-websocket/http-routes/connections/index.js b/src/events/api-gateway-websocket/http-routes/connections/index.js similarity index 100% rename from src/api-gateway-websocket/http-routes/connections/index.js rename to src/events/api-gateway-websocket/http-routes/connections/index.js diff --git a/src/api-gateway-websocket/http-routes/index.js b/src/events/api-gateway-websocket/http-routes/index.js similarity index 100% rename from src/api-gateway-websocket/http-routes/index.js rename to src/events/api-gateway-websocket/http-routes/index.js diff --git a/src/api-gateway-websocket/index.js b/src/events/api-gateway-websocket/index.js similarity index 100% rename from src/api-gateway-websocket/index.js rename to src/events/api-gateway-websocket/index.js diff --git a/src/api-gateway-websocket/lambda-events/WebSocketConnectEvent.js b/src/events/api-gateway-websocket/lambda-events/WebSocketConnectEvent.js similarity index 98% rename from src/api-gateway-websocket/lambda-events/WebSocketConnectEvent.js rename to src/events/api-gateway-websocket/lambda-events/WebSocketConnectEvent.js index 19d942f97..31c91f9be 100644 --- a/src/api-gateway-websocket/lambda-events/WebSocketConnectEvent.js +++ b/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) { diff --git a/src/api-gateway-websocket/lambda-events/WebSocketDisconnectEvent.js b/src/events/api-gateway-websocket/lambda-events/WebSocketDisconnectEvent.js similarity index 89% rename from src/api-gateway-websocket/lambda-events/WebSocketDisconnectEvent.js rename to src/events/api-gateway-websocket/lambda-events/WebSocketDisconnectEvent.js index ba58b19a0..7bc5b6e07 100644 --- a/src/api-gateway-websocket/lambda-events/WebSocketDisconnectEvent.js +++ b/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) { diff --git a/src/api-gateway-websocket/lambda-events/WebSocketEvent.js b/src/events/api-gateway-websocket/lambda-events/WebSocketEvent.js similarity index 100% rename from src/api-gateway-websocket/lambda-events/WebSocketEvent.js rename to src/events/api-gateway-websocket/lambda-events/WebSocketEvent.js diff --git a/src/api-gateway-websocket/lambda-events/WebSocketRequestContext.js b/src/events/api-gateway-websocket/lambda-events/WebSocketRequestContext.js similarity index 94% rename from src/api-gateway-websocket/lambda-events/WebSocketRequestContext.js rename to src/events/api-gateway-websocket/lambda-events/WebSocketRequestContext.js index e9ffe8168..a74c41818 100644 --- a/src/api-gateway-websocket/lambda-events/WebSocketRequestContext.js +++ b/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 diff --git a/src/api-gateway-websocket/lambda-events/index.js b/src/events/api-gateway-websocket/lambda-events/index.js similarity index 100% rename from src/api-gateway-websocket/lambda-events/index.js rename to src/events/api-gateway-websocket/lambda-events/index.js diff --git a/src/api-gateway/ApiGateway.js b/src/events/api-gateway/ApiGateway.js similarity index 100% rename from src/api-gateway/ApiGateway.js rename to src/events/api-gateway/ApiGateway.js diff --git a/src/api-gateway/Endpoint.js b/src/events/api-gateway/Endpoint.js similarity index 98% rename from src/api-gateway/Endpoint.js rename to src/events/api-gateway/Endpoint.js index fe54426d7..9d1c0912d 100644 --- a/src/api-gateway/Endpoint.js +++ b/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') diff --git a/src/api-gateway/HttpServer.js b/src/events/api-gateway/HttpServer.js similarity index 99% rename from src/api-gateway/HttpServer.js rename to src/events/api-gateway/HttpServer.js index 524fee2a6..29530dc58 100644 --- a/src/api-gateway/HttpServer.js +++ b/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 diff --git a/src/api-gateway/OfflineEndpoint.js b/src/events/api-gateway/OfflineEndpoint.js similarity index 100% rename from src/api-gateway/OfflineEndpoint.js rename to src/events/api-gateway/OfflineEndpoint.js diff --git a/src/api-gateway/authCanExecuteResource.js b/src/events/api-gateway/authCanExecuteResource.js similarity index 100% rename from src/api-gateway/authCanExecuteResource.js rename to src/events/api-gateway/authCanExecuteResource.js diff --git a/src/api-gateway/authFunctionNameExtractor.js b/src/events/api-gateway/authFunctionNameExtractor.js similarity index 97% rename from src/api-gateway/authFunctionNameExtractor.js rename to src/events/api-gateway/authFunctionNameExtractor.js index 86553d85e..0d93a54df 100644 --- a/src/api-gateway/authFunctionNameExtractor.js +++ b/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) { diff --git a/src/api-gateway/authMatchPolicyResource.js b/src/events/api-gateway/authMatchPolicyResource.js similarity index 100% rename from src/api-gateway/authMatchPolicyResource.js rename to src/events/api-gateway/authMatchPolicyResource.js diff --git a/src/api-gateway/createAuthScheme.js b/src/events/api-gateway/createAuthScheme.js similarity index 96% rename from src/api-gateway/createAuthScheme.js rename to src/events/api-gateway/createAuthScheme.js index 4c28eb1f8..f65be0ed9 100644 --- a/src/api-gateway/createAuthScheme.js +++ b/src/events/api-gateway/createAuthScheme.js @@ -1,10 +1,10 @@ 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, @@ -12,7 +12,7 @@ import { parseMultiValueQueryStringParameters, parseQueryStringParameters, splitHandlerPathAndName, -} from '../utils/index.js' +} from '../../utils/index.js' export default function createAuthScheme( authFun, diff --git a/src/api-gateway/http-routes/index.js b/src/events/api-gateway/http-routes/index.js similarity index 100% rename from src/api-gateway/http-routes/index.js rename to src/events/api-gateway/http-routes/index.js diff --git a/src/api-gateway/http-routes/invoke/InvokeController.js b/src/events/api-gateway/http-routes/invoke/InvokeController.js similarity index 87% rename from src/api-gateway/http-routes/invoke/InvokeController.js rename to src/events/api-gateway/http-routes/invoke/InvokeController.js index 499d42f8d..251d58e60 100644 --- a/src/api-gateway/http-routes/invoke/InvokeController.js +++ b/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) { diff --git a/src/api-gateway/http-routes/invoke/index.js b/src/events/api-gateway/http-routes/invoke/index.js similarity index 100% rename from src/api-gateway/http-routes/invoke/index.js rename to src/events/api-gateway/http-routes/invoke/index.js diff --git a/src/api-gateway/http-routes/invoke/invokeRoute.js b/src/events/api-gateway/http-routes/invoke/invokeRoute.js similarity index 100% rename from src/api-gateway/http-routes/invoke/invokeRoute.js rename to src/events/api-gateway/http-routes/invoke/invokeRoute.js diff --git a/src/api-gateway/index.js b/src/events/api-gateway/index.js similarity index 100% rename from src/api-gateway/index.js rename to src/events/api-gateway/index.js diff --git a/src/api-gateway/javaHelpers.js b/src/events/api-gateway/javaHelpers.js similarity index 100% rename from src/api-gateway/javaHelpers.js rename to src/events/api-gateway/javaHelpers.js diff --git a/src/api-gateway/lambda-events/LambdaIntegrationEvent.js b/src/events/api-gateway/lambda-events/LambdaIntegrationEvent.js similarity index 100% rename from src/api-gateway/lambda-events/LambdaIntegrationEvent.js rename to src/events/api-gateway/lambda-events/LambdaIntegrationEvent.js diff --git a/src/api-gateway/lambda-events/LambdaProxyIntegrationEvent.js b/src/events/api-gateway/lambda-events/LambdaProxyIntegrationEvent.js similarity index 99% rename from src/api-gateway/lambda-events/LambdaProxyIntegrationEvent.js rename to src/events/api-gateway/lambda-events/LambdaProxyIntegrationEvent.js index aa04e2633..1b7d8331a 100644 --- a/src/api-gateway/lambda-events/LambdaProxyIntegrationEvent.js +++ b/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 diff --git a/src/api-gateway/lambda-events/VelocityContext.js b/src/events/api-gateway/lambda-events/VelocityContext.js similarity index 99% rename from src/api-gateway/lambda-events/VelocityContext.js rename to src/events/api-gateway/lambda-events/VelocityContext.js index dfdc9e6a4..2910b77f6 100644 --- a/src/api-gateway/lambda-events/VelocityContext.js +++ b/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 diff --git a/src/api-gateway/lambda-events/index.js b/src/events/api-gateway/lambda-events/index.js similarity index 100% rename from src/api-gateway/lambda-events/index.js rename to src/events/api-gateway/lambda-events/index.js diff --git a/src/api-gateway/lambda-events/renderVelocityTemplateObject.js b/src/events/api-gateway/lambda-events/renderVelocityTemplateObject.js similarity index 96% rename from src/api-gateway/lambda-events/renderVelocityTemplateObject.js rename to src/events/api-gateway/lambda-events/renderVelocityTemplateObject.js index 0f9de3252..4ddebf071 100644 --- a/src/api-gateway/lambda-events/renderVelocityTemplateObject.js +++ b/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 diff --git a/src/api-gateway/parseResources.js b/src/events/api-gateway/parseResources.js similarity index 100% rename from src/api-gateway/parseResources.js rename to src/events/api-gateway/parseResources.js diff --git a/src/api-gateway/templates/offline-default.req.vm b/src/events/api-gateway/templates/offline-default.req.vm similarity index 100% rename from src/api-gateway/templates/offline-default.req.vm rename to src/events/api-gateway/templates/offline-default.req.vm diff --git a/src/api-gateway/templates/offline-default.res.vm b/src/events/api-gateway/templates/offline-default.res.vm similarity index 100% rename from src/api-gateway/templates/offline-default.res.vm rename to src/events/api-gateway/templates/offline-default.res.vm