From 4d8bec0d534b09eba9e4fc08b2ebf7d28d56ea58 Mon Sep 17 00:00:00 2001 From: Philipp Muens Date: Tue, 21 Jun 2016 12:05:34 +0200 Subject: [PATCH] Remove aws.Resources references in READMEs and tests --- lib/plugins/aws/deploy/README.md | 4 ++-- lib/plugins/aws/deploy/compile/events/apiGateway/README.md | 2 +- lib/plugins/aws/deploy/compile/events/s3/README.md | 2 +- lib/plugins/aws/deploy/compile/events/s3/tests/index.js | 2 +- lib/plugins/aws/deploy/compile/events/schedule/README.md | 2 +- lib/plugins/aws/deploy/compile/events/schedule/tests/index.js | 2 +- lib/plugins/aws/deploy/compile/functions/README.md | 2 +- lib/plugins/aws/deploy/compile/functions/tests/index.js | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/plugins/aws/deploy/README.md b/lib/plugins/aws/deploy/README.md index 9dc61abf9..bef2323b4 100644 --- a/lib/plugins/aws/deploy/README.md +++ b/lib/plugins/aws/deploy/README.md @@ -12,7 +12,7 @@ template (this makes sure that custom resources the user has defined inside the The parsed resources are attached to the `Service` class. You can access them like this: ``` -serverless.service.resources.aws.Resources +serverless.service.resources.Resources ``` **Note:** @@ -24,7 +24,7 @@ previously created CloudFormation template to AWS. At the end it hooks into [`deploy:deploy`](/lib/plugins/deploy) lifecycle to zip the lambda function and uploads it to the core S3 bucket (which is defined in the core CloudFormation template). Furthermore it updates the -stack with all the Resources which are defined in `serverless.service.resources.aws.Resources`. +stack with all the Resources which are defined in `serverless.service.resources.Resources`. The stack status is checked every 5 seconds with the help of the CloudFormation API. It will return a success message if the stack status is `CREATE_COMPLETE` or `UPDATE_COMPLETE` (depends if you deploy your service for the first time or diff --git a/lib/plugins/aws/deploy/compile/events/apiGateway/README.md b/lib/plugins/aws/deploy/compile/events/apiGateway/README.md index 380b5893f..e68152e0f 100644 --- a/lib/plugins/aws/deploy/compile/events/apiGateway/README.md +++ b/lib/plugins/aws/deploy/compile/events/apiGateway/README.md @@ -12,7 +12,7 @@ defined, an API Gateway REST API will be created. Furthermore a lambda permission for the current function is created which makes is possible to invoke the function when the endpoint is accessed. -Those resources are then merged into the `serverless.service.resources.aws.Resources` section. +Those resources are then merged into the `serverless.service.resources.Resources` section. ## Universal JSON request template diff --git a/lib/plugins/aws/deploy/compile/events/s3/README.md b/lib/plugins/aws/deploy/compile/events/s3/README.md index 304ce52d1..cf071fe28 100644 --- a/lib/plugins/aws/deploy/compile/events/s3/README.md +++ b/lib/plugins/aws/deploy/compile/events/s3/README.md @@ -15,7 +15,7 @@ events. Furthermore a lambda permission for the current function is created which makes is possible to call the function when the `s3:objectCreated:*` event is fired. -Those two resources are then merged into the `serverless.service.resources.aws.Resources` section. +Those two resources are then merged into the `serverless.service.resources.Resources` section. ## Event syntax diff --git a/lib/plugins/aws/deploy/compile/events/s3/tests/index.js b/lib/plugins/aws/deploy/compile/events/s3/tests/index.js index 34b305186..4720da0af 100644 --- a/lib/plugins/aws/deploy/compile/events/s3/tests/index.js +++ b/lib/plugins/aws/deploy/compile/events/s3/tests/index.js @@ -16,7 +16,7 @@ describe('awsCompileS3Events', () => { }); describe('#compileS3Events()', () => { - it('should throw an error if the aws resource is not available', () => { + it('should throw an error if the resource section is not available', () => { awsCompileS3Events.serverless.service.resources.Resources = false; expect(() => awsCompileS3Events.compileS3Events()).to.throw(Error); }); diff --git a/lib/plugins/aws/deploy/compile/events/schedule/README.md b/lib/plugins/aws/deploy/compile/events/schedule/README.md index 8266cbd6b..a519999ae 100644 --- a/lib/plugins/aws/deploy/compile/events/schedule/README.md +++ b/lib/plugins/aws/deploy/compile/events/schedule/README.md @@ -13,7 +13,7 @@ is defined within. Furthermore a lambda permission for the current function is created which makes is possible to invoke the function at the specified schedule. -Those two resources are then merged into the `serverless.service.resources.aws.Resources` section. +Those two resources are then merged into the `serverless.service.resources.Resources` section. ## Event syntax diff --git a/lib/plugins/aws/deploy/compile/events/schedule/tests/index.js b/lib/plugins/aws/deploy/compile/events/schedule/tests/index.js index 4e56c07cc..76338a602 100644 --- a/lib/plugins/aws/deploy/compile/events/schedule/tests/index.js +++ b/lib/plugins/aws/deploy/compile/events/schedule/tests/index.js @@ -16,7 +16,7 @@ describe('awsCompileScheduledEvents', () => { }); describe('#compileScheduledEvents()', () => { - it('should throw an error if the aws resource is not available', () => { + it('should throw an error if the resource section is not available', () => { awsCompileScheduledEvents.serverless.service.resources.Resources = false; expect(() => awsCompileScheduledEvents.compileScheduledEvents()).to.throw(Error); }); diff --git a/lib/plugins/aws/deploy/compile/functions/README.md b/lib/plugins/aws/deploy/compile/functions/README.md index f57fcb89a..377087c9b 100644 --- a/lib/plugins/aws/deploy/compile/functions/README.md +++ b/lib/plugins/aws/deploy/compile/functions/README.md @@ -9,4 +9,4 @@ This plugins compiles the functions in `serverless.yaml` to CloudFormation resou It loops over all functions which are defined in `serverless.yaml`. Inside the function loop it creates corresponding lambda function resources which will be merged into the -`serverless.service.resources.aws.Resources` section. +`serverless.service.resources.Resources` section. diff --git a/lib/plugins/aws/deploy/compile/functions/tests/index.js b/lib/plugins/aws/deploy/compile/functions/tests/index.js index aed9aabad..a422d667f 100644 --- a/lib/plugins/aws/deploy/compile/functions/tests/index.js +++ b/lib/plugins/aws/deploy/compile/functions/tests/index.js @@ -81,7 +81,7 @@ describe('AwsCompileFunctions', () => { }); describe('#compileFunctions()', () => { - it('should throw an error if the aws resource is not available', () => { + it('should throw an error if the resource section is not available', () => { awsCompileFunctions.serverless.service.resources.Resources = false; expect(() => awsCompileFunctions.compileFunctions()).to.throw(Error); });