From ef2fffe130b005da28375da27c2df87dc910eed8 Mon Sep 17 00:00:00 2001 From: "Eslam A. Hefnawy" Date: Thu, 16 Jun 2016 21:24:09 +0200 Subject: [PATCH] refatored aws plugins structure --- lib/plugins/Plugins.json | 14 +++--- .../compile/events/apiGateway/index.js} | 10 ++-- .../events/apiGateway/lib/deployment.js} | 0 .../compile/events/apiGateway/lib/methods.js} | 0 .../events/apiGateway/lib/permissions.js} | 0 .../events/apiGateway/lib/resources.js} | 0 .../compile/events/apiGateway/lib/restApi.js} | 0 .../compile/events/apiGateway/tests/all.js | 8 +++ .../events/apiGateway/tests/deployment.js} | 4 +- .../compile/events/apiGateway/tests/index.js} | 4 +- .../events/apiGateway/tests/methods.js} | 4 +- .../events/apiGateway/tests/permissions.js} | 4 +- .../events/apiGateway/tests/resources.js} | 4 +- .../events/apiGateway/tests/restApi.js} | 4 +- .../deploy/compile/events/s3/index.js} | 0 .../deploy/compile/events/s3/tests/index.js} | 4 +- .../deploy/compile/events/schedule/index.js} | 0 .../compile/events/schedule/tests/index.js} | 4 +- .../deploy/compile/functions/index.js} | 0 .../deploy/compile/functions/tests/index.js} | 4 +- .../awsDeploy.js => aws/deploy/index.js} | 2 +- .../deploy}/lib/createStack.js | 0 .../deploy}/lib/deployFunctions.js | 0 .../deploy}/lib/initializeResources.js | 0 .../deploy}/lib/updateStack.js | 0 .../deploy/lib/validate.js} | 0 .../{awsDeploy => aws/deploy}/tests/all.js | 4 +- .../deploy}/tests/createStack.js | 4 +- .../deploy}/tests/deployFunctions.js | 2 +- .../deploy/tests/index.js} | 4 +- .../deploy}/tests/initializeResources.js | 4 +- .../deploy}/tests/updateStack.js | 4 +- .../deploy/tests/validate.js} | 4 +- .../awsInvoke.js => aws/invoke/index.js} | 0 .../invoke/tests/index.js} | 4 +- .../awsRemove.js => aws/remove/index.js} | 6 +-- .../remove/lib/bucket.js} | 0 .../remove/lib/stack.js} | 0 .../remove/lib/validate.js} | 0 lib/plugins/aws/remove/tests/all.js | 6 +++ .../remove/tests/bucket.js} | 4 +- .../remove/tests/index.js} | 4 +- .../remove/tests/stack.js} | 4 +- .../remove/tests/validate.js} | 4 +- .../awsCompileApigEvents/lib/compileStage.js | 29 ----------- lib/plugins/awsCompileApigEvents/tests/all.js | 8 --- .../tests/compileStage.js | 50 ------------------- lib/plugins/awsRemove/tests/all.js | 6 --- lib/plugins/deploy/deploy.js | 2 +- tests/all.js | 17 ++++--- 50 files changed, 82 insertions(+), 158 deletions(-) rename lib/plugins/{awsCompileApigEvents/awsCompileApigEvents.js => aws/deploy/compile/events/apiGateway/index.js} (81%) rename lib/plugins/{awsCompileApigEvents/lib/compileDeployment.js => aws/deploy/compile/events/apiGateway/lib/deployment.js} (100%) rename lib/plugins/{awsCompileApigEvents/lib/compileMethods.js => aws/deploy/compile/events/apiGateway/lib/methods.js} (100%) rename lib/plugins/{awsCompileApigEvents/lib/compilePermissions.js => aws/deploy/compile/events/apiGateway/lib/permissions.js} (100%) rename lib/plugins/{awsCompileApigEvents/lib/compileResources.js => aws/deploy/compile/events/apiGateway/lib/resources.js} (100%) rename lib/plugins/{awsCompileApigEvents/lib/compileRestApi.js => aws/deploy/compile/events/apiGateway/lib/restApi.js} (100%) create mode 100644 lib/plugins/aws/deploy/compile/events/apiGateway/tests/all.js rename lib/plugins/{awsCompileApigEvents/tests/compileDeployment.js => aws/deploy/compile/events/apiGateway/tests/deployment.js} (91%) rename lib/plugins/{awsCompileApigEvents/tests/awsCompileApigEvents.js => aws/deploy/compile/events/apiGateway/tests/index.js} (95%) rename lib/plugins/{awsCompileApigEvents/tests/compileMethods.js => aws/deploy/compile/events/apiGateway/tests/methods.js} (96%) rename lib/plugins/{awsCompileApigEvents/tests/compilePermissions.js => aws/deploy/compile/events/apiGateway/tests/permissions.js} (90%) rename lib/plugins/{awsCompileApigEvents/tests/compileResources.js => aws/deploy/compile/events/apiGateway/tests/resources.js} (94%) rename lib/plugins/{awsCompileApigEvents/tests/compileRestApi.js => aws/deploy/compile/events/apiGateway/tests/restApi.js} (91%) rename lib/plugins/{awsCompileS3Events/awsCompileS3Events.js => aws/deploy/compile/events/s3/index.js} (100%) rename lib/plugins/{awsCompileS3Events/tests/awsCompileS3Events.js => aws/deploy/compile/events/s3/tests/index.js} (98%) rename lib/plugins/{awsCompileScheduledEvents/awsCompileScheduledEvents.js => aws/deploy/compile/events/schedule/index.js} (100%) rename lib/plugins/{awsCompileScheduledEvents/tests/awsCompileScheduledEvents.js => aws/deploy/compile/events/schedule/tests/index.js} (94%) rename lib/plugins/{awsCompileFunctions/awsCompileFunctions.js => aws/deploy/compile/functions/index.js} (100%) rename lib/plugins/{awsCompileFunctions/tests/awsCompileFunctions.js => aws/deploy/compile/functions/tests/index.js} (95%) rename lib/plugins/{awsDeploy/awsDeploy.js => aws/deploy/index.js} (96%) rename lib/plugins/{awsDeploy => aws/deploy}/lib/createStack.js (100%) rename lib/plugins/{awsDeploy => aws/deploy}/lib/deployFunctions.js (100%) rename lib/plugins/{awsDeploy => aws/deploy}/lib/initializeResources.js (100%) rename lib/plugins/{awsDeploy => aws/deploy}/lib/updateStack.js (100%) rename lib/plugins/{awsDeploy/lib/validateInput.js => aws/deploy/lib/validate.js} (100%) rename lib/plugins/{awsDeploy => aws/deploy}/tests/all.js (71%) rename lib/plugins/{awsDeploy => aws/deploy}/tests/createStack.js (98%) rename lib/plugins/{awsDeploy => aws/deploy}/tests/deployFunctions.js (99%) rename lib/plugins/{awsDeploy/tests/awsDeploy.js => aws/deploy/tests/index.js} (96%) rename lib/plugins/{awsDeploy => aws/deploy}/tests/initializeResources.js (88%) rename lib/plugins/{awsDeploy => aws/deploy}/tests/updateStack.js (98%) rename lib/plugins/{awsDeploy/tests/validateInput.js => aws/deploy/tests/validate.js} (94%) rename lib/plugins/{awsInvoke/awsInvoke.js => aws/invoke/index.js} (100%) rename lib/plugins/{awsInvoke/tests/awsInvoke.js => aws/invoke/tests/index.js} (98%) rename lib/plugins/{awsRemove/awsRemove.js => aws/remove/index.js} (85%) rename lib/plugins/{awsRemove/lib/emptyS3Bucket.js => aws/remove/lib/bucket.js} (100%) rename lib/plugins/{awsRemove/lib/removeStack.js => aws/remove/lib/stack.js} (100%) rename lib/plugins/{awsRemove/lib/validateInput.js => aws/remove/lib/validate.js} (100%) create mode 100644 lib/plugins/aws/remove/tests/all.js rename lib/plugins/{awsRemove/tests/emptyS3Bucket.js => aws/remove/tests/bucket.js} (94%) rename lib/plugins/{awsRemove/tests/awsRemove.js => aws/remove/tests/index.js} (93%) rename lib/plugins/{awsRemove/tests/removeStack.js => aws/remove/tests/stack.js} (95%) rename lib/plugins/{awsRemove/tests/validateInput.js => aws/remove/tests/validate.js} (85%) delete mode 100644 lib/plugins/awsCompileApigEvents/lib/compileStage.js delete mode 100644 lib/plugins/awsCompileApigEvents/tests/all.js delete mode 100644 lib/plugins/awsCompileApigEvents/tests/compileStage.js delete mode 100644 lib/plugins/awsRemove/tests/all.js diff --git a/lib/plugins/Plugins.json b/lib/plugins/Plugins.json index 469e52d92..eff3757c7 100644 --- a/lib/plugins/Plugins.json +++ b/lib/plugins/Plugins.json @@ -4,13 +4,13 @@ "./deploy/deploy.js", "./invoke/invoke.js", "./remove/remove.js", - "./awsCompileFunctions/awsCompileFunctions.js", - "./awsCompileS3Events/awsCompileS3Events.js", - "./awsCompileScheduledEvents/awsCompileScheduledEvents.js", - "./awsCompileApigEvents/awsCompileApigEvents.js", - "./awsDeploy/awsDeploy.js", - "./awsInvoke/awsInvoke.js", - "./awsRemove/awsRemove.js", + "./aws/deploy/index.js", + "./aws/invoke/index.js", + "./aws/remove/index.js", + "./aws/deploy/compile/functions/index.js", + "./aws/deploy/compile/events/schedule/index.js", + "./aws/deploy/compile/events/s3/index.js", + "./aws/deploy/compile/events/apiGateway/index.js", "./helloWorld/helloWorld.js" ] } diff --git a/lib/plugins/awsCompileApigEvents/awsCompileApigEvents.js b/lib/plugins/aws/deploy/compile/events/apiGateway/index.js similarity index 81% rename from lib/plugins/awsCompileApigEvents/awsCompileApigEvents.js rename to lib/plugins/aws/deploy/compile/events/apiGateway/index.js index 97e4dc7c9..6fa8de8e3 100644 --- a/lib/plugins/awsCompileApigEvents/awsCompileApigEvents.js +++ b/lib/plugins/aws/deploy/compile/events/apiGateway/index.js @@ -3,11 +3,11 @@ const BbPromise = require('bluebird'); const forEach = require('lodash').forEach; -const compileRestApi = require('./lib/compileRestApi'); -const compileResources = require('./lib/compileResources'); -const compileMethods = require('./lib/compileMethods'); -const compileDeployment = require('./lib/compileDeployment'); -const compilePermissions = require('./lib/compilePermissions'); +const compileRestApi = require('./lib/restApi'); +const compileResources = require('./lib/resources'); +const compileMethods = require('./lib/methods'); +const compileDeployment = require('./lib/deployment'); +const compilePermissions = require('./lib/permissions'); class AwsCompileApigEvents { constructor(serverless, options) { diff --git a/lib/plugins/awsCompileApigEvents/lib/compileDeployment.js b/lib/plugins/aws/deploy/compile/events/apiGateway/lib/deployment.js similarity index 100% rename from lib/plugins/awsCompileApigEvents/lib/compileDeployment.js rename to lib/plugins/aws/deploy/compile/events/apiGateway/lib/deployment.js diff --git a/lib/plugins/awsCompileApigEvents/lib/compileMethods.js b/lib/plugins/aws/deploy/compile/events/apiGateway/lib/methods.js similarity index 100% rename from lib/plugins/awsCompileApigEvents/lib/compileMethods.js rename to lib/plugins/aws/deploy/compile/events/apiGateway/lib/methods.js diff --git a/lib/plugins/awsCompileApigEvents/lib/compilePermissions.js b/lib/plugins/aws/deploy/compile/events/apiGateway/lib/permissions.js similarity index 100% rename from lib/plugins/awsCompileApigEvents/lib/compilePermissions.js rename to lib/plugins/aws/deploy/compile/events/apiGateway/lib/permissions.js diff --git a/lib/plugins/awsCompileApigEvents/lib/compileResources.js b/lib/plugins/aws/deploy/compile/events/apiGateway/lib/resources.js similarity index 100% rename from lib/plugins/awsCompileApigEvents/lib/compileResources.js rename to lib/plugins/aws/deploy/compile/events/apiGateway/lib/resources.js diff --git a/lib/plugins/awsCompileApigEvents/lib/compileRestApi.js b/lib/plugins/aws/deploy/compile/events/apiGateway/lib/restApi.js similarity index 100% rename from lib/plugins/awsCompileApigEvents/lib/compileRestApi.js rename to lib/plugins/aws/deploy/compile/events/apiGateway/lib/restApi.js diff --git a/lib/plugins/aws/deploy/compile/events/apiGateway/tests/all.js b/lib/plugins/aws/deploy/compile/events/apiGateway/tests/all.js new file mode 100644 index 000000000..669fc52f3 --- /dev/null +++ b/lib/plugins/aws/deploy/compile/events/apiGateway/tests/all.js @@ -0,0 +1,8 @@ +'use strict'; + +require('./index'); +require('./permissions'); +require('./restApi'); +require('./deployment'); +require('./resources'); +require('./methods'); diff --git a/lib/plugins/awsCompileApigEvents/tests/compileDeployment.js b/lib/plugins/aws/deploy/compile/events/apiGateway/tests/deployment.js similarity index 91% rename from lib/plugins/awsCompileApigEvents/tests/compileDeployment.js rename to lib/plugins/aws/deploy/compile/events/apiGateway/tests/deployment.js index 3879f4e94..daef27a05 100644 --- a/lib/plugins/awsCompileApigEvents/tests/compileDeployment.js +++ b/lib/plugins/aws/deploy/compile/events/apiGateway/tests/deployment.js @@ -1,8 +1,8 @@ 'use strict'; const expect = require('chai').expect; -const AwsCompileApigEvents = require('../awsCompileApigEvents'); -const Serverless = require('../../../Serverless'); +const AwsCompileApigEvents = require('../index'); +const Serverless = require('../../../../../../../Serverless'); describe('#compileDeployment()', () => { let serverless; diff --git a/lib/plugins/awsCompileApigEvents/tests/awsCompileApigEvents.js b/lib/plugins/aws/deploy/compile/events/apiGateway/tests/index.js similarity index 95% rename from lib/plugins/awsCompileApigEvents/tests/awsCompileApigEvents.js rename to lib/plugins/aws/deploy/compile/events/apiGateway/tests/index.js index 007a4159b..3e213b22e 100644 --- a/lib/plugins/awsCompileApigEvents/tests/awsCompileApigEvents.js +++ b/lib/plugins/aws/deploy/compile/events/apiGateway/tests/index.js @@ -3,8 +3,8 @@ const expect = require('chai').expect; const sinon = require('sinon'); const BbPromise = require('bluebird'); -const AwsCompileApigEvents = require('../awsCompileApigEvents'); -const Serverless = require('../../../Serverless'); +const AwsCompileApigEvents = require('../index'); +const Serverless = require('../../../../../../../Serverless'); describe('AwsCompileApigEvents', () => { const serverless = new Serverless(); diff --git a/lib/plugins/awsCompileApigEvents/tests/compileMethods.js b/lib/plugins/aws/deploy/compile/events/apiGateway/tests/methods.js similarity index 96% rename from lib/plugins/awsCompileApigEvents/tests/compileMethods.js rename to lib/plugins/aws/deploy/compile/events/apiGateway/tests/methods.js index 6424f75d7..e967377c4 100644 --- a/lib/plugins/awsCompileApigEvents/tests/compileMethods.js +++ b/lib/plugins/aws/deploy/compile/events/apiGateway/tests/methods.js @@ -1,8 +1,8 @@ 'use strict'; const expect = require('chai').expect; -const AwsCompileApigEvents = require('../awsCompileApigEvents'); -const Serverless = require('../../../Serverless'); +const AwsCompileApigEvents = require('../index'); +const Serverless = require('../../../../../../../Serverless'); describe('#compileMethods()', () => { let serverless; diff --git a/lib/plugins/awsCompileApigEvents/tests/compilePermissions.js b/lib/plugins/aws/deploy/compile/events/apiGateway/tests/permissions.js similarity index 90% rename from lib/plugins/awsCompileApigEvents/tests/compilePermissions.js rename to lib/plugins/aws/deploy/compile/events/apiGateway/tests/permissions.js index 65ded4b03..ade43b5d2 100644 --- a/lib/plugins/awsCompileApigEvents/tests/compilePermissions.js +++ b/lib/plugins/aws/deploy/compile/events/apiGateway/tests/permissions.js @@ -1,8 +1,8 @@ 'use strict'; const expect = require('chai').expect; -const AwsCompileApigEvents = require('../awsCompileApigEvents'); -const Serverless = require('../../../Serverless'); +const AwsCompileApigEvents = require('../index'); +const Serverless = require('../../../../../../../Serverless'); describe('#awsCompilePermissions()', () => { let serverless; diff --git a/lib/plugins/awsCompileApigEvents/tests/compileResources.js b/lib/plugins/aws/deploy/compile/events/apiGateway/tests/resources.js similarity index 94% rename from lib/plugins/awsCompileApigEvents/tests/compileResources.js rename to lib/plugins/aws/deploy/compile/events/apiGateway/tests/resources.js index c8ceee80f..2406460a4 100644 --- a/lib/plugins/awsCompileApigEvents/tests/compileResources.js +++ b/lib/plugins/aws/deploy/compile/events/apiGateway/tests/resources.js @@ -1,8 +1,8 @@ 'use strict'; const expect = require('chai').expect; -const AwsCompileApigEvents = require('../awsCompileApigEvents'); -const Serverless = require('../../../Serverless'); +const AwsCompileApigEvents = require('../index'); +const Serverless = require('../../../../../../../Serverless'); describe('#compileResources()', () => { let serverless; diff --git a/lib/plugins/awsCompileApigEvents/tests/compileRestApi.js b/lib/plugins/aws/deploy/compile/events/apiGateway/tests/restApi.js similarity index 91% rename from lib/plugins/awsCompileApigEvents/tests/compileRestApi.js rename to lib/plugins/aws/deploy/compile/events/apiGateway/tests/restApi.js index 9605d8f61..761641833 100644 --- a/lib/plugins/awsCompileApigEvents/tests/compileRestApi.js +++ b/lib/plugins/aws/deploy/compile/events/apiGateway/tests/restApi.js @@ -1,8 +1,8 @@ 'use strict'; const expect = require('chai').expect; -const AwsCompileApigEvents = require('../awsCompileApigEvents'); -const Serverless = require('../../../Serverless'); +const AwsCompileApigEvents = require('../index'); +const Serverless = require('../../../../../../../Serverless'); describe('#compileRestApi()', () => { let serverless; diff --git a/lib/plugins/awsCompileS3Events/awsCompileS3Events.js b/lib/plugins/aws/deploy/compile/events/s3/index.js similarity index 100% rename from lib/plugins/awsCompileS3Events/awsCompileS3Events.js rename to lib/plugins/aws/deploy/compile/events/s3/index.js diff --git a/lib/plugins/awsCompileS3Events/tests/awsCompileS3Events.js b/lib/plugins/aws/deploy/compile/events/s3/tests/index.js similarity index 98% rename from lib/plugins/awsCompileS3Events/tests/awsCompileS3Events.js rename to lib/plugins/aws/deploy/compile/events/s3/tests/index.js index 7fc00eeab..c2fc879ad 100644 --- a/lib/plugins/awsCompileS3Events/tests/awsCompileS3Events.js +++ b/lib/plugins/aws/deploy/compile/events/s3/tests/index.js @@ -1,8 +1,8 @@ 'use strict'; const expect = require('chai').expect; -const AwsCompileS3Events = require('../awsCompileS3Events'); -const Serverless = require('../../../Serverless'); +const AwsCompileS3Events = require('../index'); +const Serverless = require('../../../../../../../Serverless'); describe('awsCompileS3Events', () => { let serverless; diff --git a/lib/plugins/awsCompileScheduledEvents/awsCompileScheduledEvents.js b/lib/plugins/aws/deploy/compile/events/schedule/index.js similarity index 100% rename from lib/plugins/awsCompileScheduledEvents/awsCompileScheduledEvents.js rename to lib/plugins/aws/deploy/compile/events/schedule/index.js diff --git a/lib/plugins/awsCompileScheduledEvents/tests/awsCompileScheduledEvents.js b/lib/plugins/aws/deploy/compile/events/schedule/tests/index.js similarity index 94% rename from lib/plugins/awsCompileScheduledEvents/tests/awsCompileScheduledEvents.js rename to lib/plugins/aws/deploy/compile/events/schedule/tests/index.js index eccfd554e..dacad1c67 100644 --- a/lib/plugins/awsCompileScheduledEvents/tests/awsCompileScheduledEvents.js +++ b/lib/plugins/aws/deploy/compile/events/schedule/tests/index.js @@ -1,8 +1,8 @@ 'use strict'; const expect = require('chai').expect; -const AwsCompileScheduledEvents = require('../awsCompileScheduledEvents'); -const Serverless = require('../../../Serverless'); +const AwsCompileScheduledEvents = require('../index'); +const Serverless = require('../../../../../../../Serverless'); describe('awsCompileScheduledEvents', () => { let serverless; diff --git a/lib/plugins/awsCompileFunctions/awsCompileFunctions.js b/lib/plugins/aws/deploy/compile/functions/index.js similarity index 100% rename from lib/plugins/awsCompileFunctions/awsCompileFunctions.js rename to lib/plugins/aws/deploy/compile/functions/index.js diff --git a/lib/plugins/awsCompileFunctions/tests/awsCompileFunctions.js b/lib/plugins/aws/deploy/compile/functions/tests/index.js similarity index 95% rename from lib/plugins/awsCompileFunctions/tests/awsCompileFunctions.js rename to lib/plugins/aws/deploy/compile/functions/tests/index.js index 321f43798..06a5d6d01 100644 --- a/lib/plugins/awsCompileFunctions/tests/awsCompileFunctions.js +++ b/lib/plugins/aws/deploy/compile/functions/tests/index.js @@ -1,8 +1,8 @@ 'use strict'; const expect = require('chai').expect; -const AwsCompileFunctions = require('../awsCompileFunctions'); -const Serverless = require('../../../Serverless'); +const AwsCompileFunctions = require('../index'); +const Serverless = require('../../../../../../Serverless'); describe('awsCompileFunctions', () => { let serverless; diff --git a/lib/plugins/awsDeploy/awsDeploy.js b/lib/plugins/aws/deploy/index.js similarity index 96% rename from lib/plugins/awsDeploy/awsDeploy.js rename to lib/plugins/aws/deploy/index.js index 2147d8bb3..2960e1cea 100644 --- a/lib/plugins/awsDeploy/awsDeploy.js +++ b/lib/plugins/aws/deploy/index.js @@ -1,7 +1,7 @@ 'use strict'; const BbPromise = require('bluebird'); -const validateInput = require('./lib/validateInput'); +const validateInput = require('./lib/validate'); const initializeResources = require('./lib/initializeResources'); const createStack = require('./lib/createStack'); const deployFunctions = require('./lib/deployFunctions'); diff --git a/lib/plugins/awsDeploy/lib/createStack.js b/lib/plugins/aws/deploy/lib/createStack.js similarity index 100% rename from lib/plugins/awsDeploy/lib/createStack.js rename to lib/plugins/aws/deploy/lib/createStack.js diff --git a/lib/plugins/awsDeploy/lib/deployFunctions.js b/lib/plugins/aws/deploy/lib/deployFunctions.js similarity index 100% rename from lib/plugins/awsDeploy/lib/deployFunctions.js rename to lib/plugins/aws/deploy/lib/deployFunctions.js diff --git a/lib/plugins/awsDeploy/lib/initializeResources.js b/lib/plugins/aws/deploy/lib/initializeResources.js similarity index 100% rename from lib/plugins/awsDeploy/lib/initializeResources.js rename to lib/plugins/aws/deploy/lib/initializeResources.js diff --git a/lib/plugins/awsDeploy/lib/updateStack.js b/lib/plugins/aws/deploy/lib/updateStack.js similarity index 100% rename from lib/plugins/awsDeploy/lib/updateStack.js rename to lib/plugins/aws/deploy/lib/updateStack.js diff --git a/lib/plugins/awsDeploy/lib/validateInput.js b/lib/plugins/aws/deploy/lib/validate.js similarity index 100% rename from lib/plugins/awsDeploy/lib/validateInput.js rename to lib/plugins/aws/deploy/lib/validate.js diff --git a/lib/plugins/awsDeploy/tests/all.js b/lib/plugins/aws/deploy/tests/all.js similarity index 71% rename from lib/plugins/awsDeploy/tests/all.js rename to lib/plugins/aws/deploy/tests/all.js index 049dbc3fd..a82a09764 100644 --- a/lib/plugins/awsDeploy/tests/all.js +++ b/lib/plugins/aws/deploy/tests/all.js @@ -1,8 +1,8 @@ 'use strict'; -require('./validateInput'); +require('./validate'); require('./initializeResources'); require('./createStack'); require('./deployFunctions'); require('./updateStack'); -require('./awsDeploy'); +require('./index'); diff --git a/lib/plugins/awsDeploy/tests/createStack.js b/lib/plugins/aws/deploy/tests/createStack.js similarity index 98% rename from lib/plugins/awsDeploy/tests/createStack.js rename to lib/plugins/aws/deploy/tests/createStack.js index 0f168cd4d..dc809d8db 100644 --- a/lib/plugins/awsDeploy/tests/createStack.js +++ b/lib/plugins/aws/deploy/tests/createStack.js @@ -6,8 +6,8 @@ const os = require('os'); const path = require('path'); const AWS = require('aws-sdk'); const BbPromise = require('bluebird'); -const AwsDeploy = require('../awsDeploy'); -const Serverless = require('../../../Serverless'); +const AwsDeploy = require('../index'); +const Serverless = require('../../../../Serverless'); describe('createStack', () => { let serverless; diff --git a/lib/plugins/awsDeploy/tests/deployFunctions.js b/lib/plugins/aws/deploy/tests/deployFunctions.js similarity index 99% rename from lib/plugins/awsDeploy/tests/deployFunctions.js rename to lib/plugins/aws/deploy/tests/deployFunctions.js index 6a5b2ef5d..5303c6351 100644 --- a/lib/plugins/awsDeploy/tests/deployFunctions.js +++ b/lib/plugins/aws/deploy/tests/deployFunctions.js @@ -4,7 +4,7 @@ const expect = require('chai').expect; const path = require('path'); const os = require('os'); const deployFunctions = require('../lib/deployFunctions'); -const Serverless = require('../../../Serverless'); +const Serverless = require('../../../../Serverless'); const Zip = require('node-zip'); const sinon = require('sinon'); const AWS = require('aws-sdk'); diff --git a/lib/plugins/awsDeploy/tests/awsDeploy.js b/lib/plugins/aws/deploy/tests/index.js similarity index 96% rename from lib/plugins/awsDeploy/tests/awsDeploy.js rename to lib/plugins/aws/deploy/tests/index.js index 5f93104c1..8e0ef824f 100644 --- a/lib/plugins/awsDeploy/tests/awsDeploy.js +++ b/lib/plugins/aws/deploy/tests/index.js @@ -1,7 +1,7 @@ 'use strict'; -const AwsDeploy = require('../awsDeploy'); -const Serverless = require('../../../Serverless'); +const AwsDeploy = require('../index'); +const Serverless = require('../../../../Serverless'); const expect = require('chai').expect; const BbPromise = require('bluebird'); const sinon = require('sinon'); diff --git a/lib/plugins/awsDeploy/tests/initializeResources.js b/lib/plugins/aws/deploy/tests/initializeResources.js similarity index 88% rename from lib/plugins/awsDeploy/tests/initializeResources.js rename to lib/plugins/aws/deploy/tests/initializeResources.js index 2cebd734e..be8bd87b3 100644 --- a/lib/plugins/awsDeploy/tests/initializeResources.js +++ b/lib/plugins/aws/deploy/tests/initializeResources.js @@ -1,8 +1,8 @@ 'use strict'; const expect = require('chai').expect; -const AwsDeploy = require('../awsDeploy'); -const Serverless = require('../../../Serverless'); +const AwsDeploy = require('../index'); +const Serverless = require('../../../../Serverless'); describe('#initializeResources()', () => { const serverless = new Serverless(); diff --git a/lib/plugins/awsDeploy/tests/updateStack.js b/lib/plugins/aws/deploy/tests/updateStack.js similarity index 98% rename from lib/plugins/awsDeploy/tests/updateStack.js rename to lib/plugins/aws/deploy/tests/updateStack.js index 30bdc17cd..c503ca507 100644 --- a/lib/plugins/awsDeploy/tests/updateStack.js +++ b/lib/plugins/aws/deploy/tests/updateStack.js @@ -6,8 +6,8 @@ const os = require('os'); const path = require('path'); const AWS = require('aws-sdk'); const BbPromise = require('bluebird'); -const AwsDeploy = require('../awsDeploy'); -const Serverless = require('../../../Serverless'); +const AwsDeploy = require('../index'); +const Serverless = require('../../../../Serverless'); describe('updateStack', () => { let serverless; diff --git a/lib/plugins/awsDeploy/tests/validateInput.js b/lib/plugins/aws/deploy/tests/validate.js similarity index 94% rename from lib/plugins/awsDeploy/tests/validateInput.js rename to lib/plugins/aws/deploy/tests/validate.js index 5287cbcc1..e5f16e87a 100644 --- a/lib/plugins/awsDeploy/tests/validateInput.js +++ b/lib/plugins/aws/deploy/tests/validate.js @@ -1,8 +1,8 @@ 'use strict'; const expect = require('chai').expect; -const AwsDeploy = require('../awsDeploy'); -const Serverless = require('../../../Serverless'); +const AwsDeploy = require('../index'); +const Serverless = require('../../../../Serverless'); describe('#validateInput()', () => { let serverless; diff --git a/lib/plugins/awsInvoke/awsInvoke.js b/lib/plugins/aws/invoke/index.js similarity index 100% rename from lib/plugins/awsInvoke/awsInvoke.js rename to lib/plugins/aws/invoke/index.js diff --git a/lib/plugins/awsInvoke/tests/awsInvoke.js b/lib/plugins/aws/invoke/tests/index.js similarity index 98% rename from lib/plugins/awsInvoke/tests/awsInvoke.js rename to lib/plugins/aws/invoke/tests/index.js index e37892ca1..0762ebef9 100644 --- a/lib/plugins/awsInvoke/tests/awsInvoke.js +++ b/lib/plugins/aws/invoke/tests/index.js @@ -4,8 +4,8 @@ const expect = require('chai').expect; const sinon = require('sinon'); const path = require('path'); const os = require('os'); -const AwsInvoke = require('../awsInvoke'); -const Serverless = require('../../../Serverless'); +const AwsInvoke = require('../'); +const Serverless = require('../../../../Serverless'); const BbPromise = require('bluebird'); const AWS = require('aws-sdk'); diff --git a/lib/plugins/awsRemove/awsRemove.js b/lib/plugins/aws/remove/index.js similarity index 85% rename from lib/plugins/awsRemove/awsRemove.js rename to lib/plugins/aws/remove/index.js index ac0a3f9aa..800debd25 100644 --- a/lib/plugins/awsRemove/awsRemove.js +++ b/lib/plugins/aws/remove/index.js @@ -1,9 +1,9 @@ 'use strict'; const BbPromise = require('bluebird'); -const validateInput = require('./lib/validateInput'); -const emptyS3Bucket = require('./lib/emptyS3Bucket'); -const removeStack = require('./lib/removeStack'); +const validateInput = require('./lib/validate'); +const emptyS3Bucket = require('./lib/bucket'); +const removeStack = require('./lib/stack'); const AWS = require('aws-sdk'); diff --git a/lib/plugins/awsRemove/lib/emptyS3Bucket.js b/lib/plugins/aws/remove/lib/bucket.js similarity index 100% rename from lib/plugins/awsRemove/lib/emptyS3Bucket.js rename to lib/plugins/aws/remove/lib/bucket.js diff --git a/lib/plugins/awsRemove/lib/removeStack.js b/lib/plugins/aws/remove/lib/stack.js similarity index 100% rename from lib/plugins/awsRemove/lib/removeStack.js rename to lib/plugins/aws/remove/lib/stack.js diff --git a/lib/plugins/awsRemove/lib/validateInput.js b/lib/plugins/aws/remove/lib/validate.js similarity index 100% rename from lib/plugins/awsRemove/lib/validateInput.js rename to lib/plugins/aws/remove/lib/validate.js diff --git a/lib/plugins/aws/remove/tests/all.js b/lib/plugins/aws/remove/tests/all.js new file mode 100644 index 000000000..75f6bad30 --- /dev/null +++ b/lib/plugins/aws/remove/tests/all.js @@ -0,0 +1,6 @@ +'use strict'; + +require('./'); +require('./stack'); +require('./bucket'); +require('./validate'); diff --git a/lib/plugins/awsRemove/tests/emptyS3Bucket.js b/lib/plugins/aws/remove/tests/bucket.js similarity index 94% rename from lib/plugins/awsRemove/tests/emptyS3Bucket.js rename to lib/plugins/aws/remove/tests/bucket.js index d4b7d60fb..e042cf2e0 100644 --- a/lib/plugins/awsRemove/tests/emptyS3Bucket.js +++ b/lib/plugins/aws/remove/tests/bucket.js @@ -2,8 +2,8 @@ const expect = require('chai').expect; const sinon = require('sinon'); -const AwsRemove = require('../awsRemove'); -const Serverless = require('../../../Serverless'); +const AwsRemove = require('../'); +const Serverless = require('../../../../Serverless'); const BbPromise = require('bluebird'); const AWS = require('aws-sdk'); diff --git a/lib/plugins/awsRemove/tests/awsRemove.js b/lib/plugins/aws/remove/tests/index.js similarity index 93% rename from lib/plugins/awsRemove/tests/awsRemove.js rename to lib/plugins/aws/remove/tests/index.js index 8d664507e..aa0fbb41f 100644 --- a/lib/plugins/awsRemove/tests/awsRemove.js +++ b/lib/plugins/aws/remove/tests/index.js @@ -3,8 +3,8 @@ const expect = require('chai').expect; const BbPromise = require('bluebird'); const sinon = require('sinon'); -const AwsRemove = require('../awsRemove'); -const Serverless = require('../../../Serverless'); +const AwsRemove = require('../'); +const Serverless = require('../../../../Serverless'); describe('AwsRemove', () => { const serverless = new Serverless(); diff --git a/lib/plugins/awsRemove/tests/removeStack.js b/lib/plugins/aws/remove/tests/stack.js similarity index 95% rename from lib/plugins/awsRemove/tests/removeStack.js rename to lib/plugins/aws/remove/tests/stack.js index c075e3ce0..df5b3af6f 100644 --- a/lib/plugins/awsRemove/tests/removeStack.js +++ b/lib/plugins/aws/remove/tests/stack.js @@ -2,8 +2,8 @@ const expect = require('chai').expect; const sinon = require('sinon'); -const AwsRemove = require('../awsRemove'); -const Serverless = require('../../../Serverless'); +const AwsRemove = require('../'); +const Serverless = require('../../../../Serverless'); const BbPromise = require('bluebird'); const AWS = require('aws-sdk'); diff --git a/lib/plugins/awsRemove/tests/validateInput.js b/lib/plugins/aws/remove/tests/validate.js similarity index 85% rename from lib/plugins/awsRemove/tests/validateInput.js rename to lib/plugins/aws/remove/tests/validate.js index 6d166e8e6..21c99ccd3 100644 --- a/lib/plugins/awsRemove/tests/validateInput.js +++ b/lib/plugins/aws/remove/tests/validate.js @@ -1,8 +1,8 @@ 'use strict'; const expect = require('chai').expect; -const AwsRemove = require('../awsRemove'); -const Serverless = require('../../../Serverless'); +const AwsRemove = require('../'); +const Serverless = require('../../../../Serverless'); describe('#validateInput()', () => { const serverless = new Serverless(); diff --git a/lib/plugins/awsCompileApigEvents/lib/compileStage.js b/lib/plugins/awsCompileApigEvents/lib/compileStage.js deleted file mode 100644 index 5c9451f7a..000000000 --- a/lib/plugins/awsCompileApigEvents/lib/compileStage.js +++ /dev/null @@ -1,29 +0,0 @@ -'use strict'; - -const merge = require('lodash').merge; -const BbPromise = require('bluebird'); - -module.exports = { - compileStage() { - this.serverless.service.getAllFunctions().forEach(() => { - const stageTemplate = ` - { - "Type" : "AWS::ApiGateway::Stage", - "Properties" : { - "DeploymentId": { "Ref": "DeploymentApigEvent" }, - "RestApiId" : { "Ref": "RestApiApigEvent" }, - "StageName" : "${this.options.stage}" - } - } - `; - - const newStageObject = { - StageApigEvent: JSON.parse(stageTemplate), - }; - - merge(this.serverless.service.resources.aws.Resources, newStageObject); - }); - - return BbPromise.resolve(); - }, -}; diff --git a/lib/plugins/awsCompileApigEvents/tests/all.js b/lib/plugins/awsCompileApigEvents/tests/all.js deleted file mode 100644 index a9db12903..000000000 --- a/lib/plugins/awsCompileApigEvents/tests/all.js +++ /dev/null @@ -1,8 +0,0 @@ -'use strict'; - -require('./awsCompileApigEvents'); -require('./compilePermissions'); -require('./compileRestApi'); -require('./compileDeployment'); -require('./compileResources'); -require('./compileMethods'); diff --git a/lib/plugins/awsCompileApigEvents/tests/compileStage.js b/lib/plugins/awsCompileApigEvents/tests/compileStage.js deleted file mode 100644 index 752928529..000000000 --- a/lib/plugins/awsCompileApigEvents/tests/compileStage.js +++ /dev/null @@ -1,50 +0,0 @@ -'use strict'; - -const expect = require('chai').expect; -const AwsCompileApigEvents = require('../awsCompileApigEvents'); -const Serverless = require('../../../Serverless'); - -describe('#compileStage()', () => { - let serverless; - let awsCompileApigEvents; - - const serviceResourcesAwsResourcesObjectMock = { - Resources: { - Type: 'AWS::ApiGateway::Stage', - Properties: { - DeploymentId: { Ref: 'helloDeploymentApigEvent' }, - RestApiId: { Ref: 'RestApiApigEvent' }, - StageName: 'dev', - }, - }, - }; - - beforeEach(() => { - serverless = new Serverless(); - serverless.init(); - serverless.service.resources = { aws: { Resources: {} } }; - const options = { - stage: 'dev', - region: 'us-east-1', - }; - awsCompileApigEvents = new AwsCompileApigEvents(serverless, options); - awsCompileApigEvents.serverless.service.functions = { - hello: { - events: { - aws: { - http_endpoints: { - post: 'foo/bar', - }, - }, - }, - }, - }; - }); - - it('should create a stage resource', () => { - awsCompileApigEvents.compileStage().then(() => { - expect(JSON.stringify(awsCompileApigEvents.serverless.service.resources.aws.Resources)) - .to.equal(JSON.stringify(serviceResourcesAwsResourcesObjectMock.Resources)); - }); - }); -}); diff --git a/lib/plugins/awsRemove/tests/all.js b/lib/plugins/awsRemove/tests/all.js deleted file mode 100644 index 85970ac21..000000000 --- a/lib/plugins/awsRemove/tests/all.js +++ /dev/null @@ -1,6 +0,0 @@ -'use strict'; - -require('./awsRemove'); -require('./removeStack'); -require('./emptyS3Bucket'); -require('./validateInput'); diff --git a/lib/plugins/deploy/deploy.js b/lib/plugins/deploy/deploy.js index 6a2fbb2ff..98d331a79 100644 --- a/lib/plugins/deploy/deploy.js +++ b/lib/plugins/deploy/deploy.js @@ -29,4 +29,4 @@ class Deploy { } } -module.exports = Deploy; +module.exports = Deploy; \ No newline at end of file diff --git a/tests/all.js b/tests/all.js index d62c0e61a..ec8154a09 100644 --- a/tests/all.js +++ b/tests/all.js @@ -17,10 +17,13 @@ require('../lib/plugins/create/tests/create'); require('../lib/plugins/deploy/tests/deploy'); require('../lib/plugins/invoke/tests/invoke'); require('../lib/plugins/remove/tests/remove'); -require('../lib/plugins/awsDeploy/tests/all'); -require('../lib/plugins/awsRemove/tests/all'); -require('../lib/plugins/awsInvoke/tests/awsInvoke'); -require('../lib/plugins/awsCompileFunctions/tests/awsCompileFunctions'); -require('../lib/plugins/awsCompileS3Events/tests/awsCompileS3Events'); -require('../lib/plugins/awsCompileScheduledEvents/tests/awsCompileScheduledEvents'); -require('../lib/plugins/awsCompileApigEvents/tests/all'); + +// AWS Plugins Tests +require('../lib/plugins/aws/deploy/tests/all'); +require('../lib/plugins/aws/deploy/compile/functions/tests'); +require('../lib/plugins/aws/deploy/compile/events/s3/tests'); +require('../lib/plugins/aws/deploy/compile/events/schedule/tests'); +require('../lib/plugins/aws/deploy/compile/events/apiGateway/tests'); +require('../lib/plugins/aws/invoke/tests'); +require('../lib/plugins/aws/remove/tests/all'); +