archive-gh-me/serverless
1
0
Fork 0
mirror of https://github.com/serverless/serverless.git synced 2026-01-18 14:58:43 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3156 from serverless/refactor-info-functions-output

Browse Source 
BREAKING - Remove on-the-fly arn generation for displayed functions
This commit is contained in:
Eslam λ Hefnawy 2017-01-27 20:51:52 +07:00 committed by GitHub
commit 78e1fbfa80
5 changed files with 14 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
docs/providers/aws/cli-reference/info.md
View File

@ -47,7 +47,7 @@ api keys:
endpoints:
GET - https://dxaynpuzd4.execute-api.us-east-1.amazonaws.com/dev/users
functions:
my-serverless-service-dev-hello: arn:aws:lambda:us-east-1:377024778620:function:my-serverless-service-dev-hello
my-serverless-service-dev-hello
```
#### Verbose
@ -66,14 +66,11 @@ api keys:
endpoints:
GET - https://dxaynpuzd4.execute-api.us-east-1.amazonaws.com/dev/users
functions:
my-serverless-service-dev-hello: arn:aws:lambda:us-east-1:377024778620:function:my-serverless-service-dev-hello
my-serverless-service-dev-hello
Stack Outputs
CloudFrontUrl: d2d10e2tyk1pei.cloudfront.net
ListScreenshotsLambdaFunctionArn: arn:aws:lambda:us-east-1:377024778620:function:lambda-screenshots-dev-listScreenshots
ScreenshotBucket: dev-svdgraaf-screenshots
CreateThumbnailsLambdaFunctionArn: arn:aws:lambda:us-east-1:377024778620:function:lambda-screenshots-dev-createThumbnails
TakeScreenshotLambdaFunctionArn: arn:aws:lambda:us-east-1:377024778620:function:lambda-screenshots-dev-takeScreenshot
ServiceEndpoint: https://12341jc801.execute-api.us-east-1.amazonaws.com/dev
ServerlessDeploymentBucketName: lambda-screenshots-dev-serverlessdeploymentbucket-15b7pkc04f98a
```

2
lib/plugins/aws/info/display.js
View File

@ -60,7 +60,7 @@ module.exports = {
if (info.functions && info.functions.length > 0) {
info.functions.forEach((f) => {
functionsMessage += `\n ${f.name}: ${f.arn}`;
functionsMessage += `\n ${f.name}`;
});
} else {
functionsMessage += '\n None';

9
lib/plugins/aws/info/display.test.js
View File

@ -154,15 +154,12 @@ describe('#display()', () => {
awsInfo.gatheredData.info.functions = [
{
name: 'function1',
arn: 'arn:aws:iam::12345678:function:function1',
},
{
name: 'function2',
arn: 'arn:aws:iam::12345678:function:function2',
},
{
name: 'function3',
arn: 'arn:aws:iam::12345678:function:function3',
},
];
@ -177,9 +174,9 @@ describe('#display()', () => {
expectedMessage += `\n${chalk.yellow('endpoints:')}`;
expectedMessage += '\n None';
expectedMessage += `\n${chalk.yellow('functions:')}`;
expectedMessage += '\n function1: arn:aws:iam::12345678:function:function1';
expectedMessage += '\n function2: arn:aws:iam::12345678:function:function2';
expectedMessage += '\n function3: arn:aws:iam::12345678:function:function3';
expectedMessage += '\n function1';
expectedMessage += '\n function2';
expectedMessage += '\n function3';
const message = awsInfo.display();
expect(consoleLogStub.calledOnce).to.equal(true);

22
lib/plugins/aws/info/getStackInfo.js
View File

@ -36,6 +36,13 @@ module.exports = {
// Outputs
this.gatheredData.outputs = outputs;
// Functions
this.serverless.service.getAllFunctions().forEach((func) => {
const functionInfo = {};
functionInfo.name = `${this.serverless.service.service}-${this.options.stage}-${func}`;
this.gatheredData.info.functions.push(functionInfo);
});
// Endpoints
outputs.filter(x => x.OutputKey.match(serviceEndpointOutputRegex))
.forEach(x => {
@ -43,21 +50,6 @@ module.exports = {
});
}
return BbPromise.resolve();
})
.then(() => this.provider.getAccountId())
.then((accountId) => {
this.gatheredData.info.functions = [];
this.serverless.service.getAllFunctions().forEach((func) => {
const functionInfo = {};
const name = `${this.serverless.service.service}-${this.options.stage}-${func}`;
const arn = `arn:aws:lambda:${this.options.region}:${accountId}:function:${name}`;
functionInfo.name = name;
functionInfo.arn = arn;
this.gatheredData.info.functions.push(functionInfo);
});
return BbPromise.resolve();
});
},

21
lib/plugins/aws/info/getStackInfo.test.js
View File

@ -11,7 +11,6 @@ describe('#getStackInfo()', () => {
let serverless;
let awsInfo;
let describeStacksStub;
let getAccountIdStub;
beforeEach(() => {
serverless = new Serverless();
@ -28,13 +27,10 @@ describe('#getStackInfo()', () => {
awsInfo = new AwsInfo(serverless, options);
describeStacksStub = sinon.stub(awsInfo.provider, 'request');
getAccountIdStub = sinon.stub(awsInfo.provider, 'getAccountId')
.returns(BbPromise.resolve(12345678));
});
afterEach(() => {
awsInfo.provider.request.restore();
awsInfo.provider.getAccountId.restore();
});
it('attach info from describeStack call to this.gatheredData if result is available', () => {
@ -79,11 +75,9 @@ describe('#getStackInfo()', () => {
info: {
functions: [
{
arn: 'arn:aws:lambda:us-east-1:12345678:function:my-service-dev-hello',
name: 'my-service-dev-hello',
},
{
arn: 'arn:aws:lambda:us-east-1:12345678:function:my-service-dev-world',
name: 'my-service-dev-world',
},
],
@ -123,8 +117,6 @@ describe('#getStackInfo()', () => {
awsInfo.options.region
)).to.equal(true);
expect(getAccountIdStub.calledOnce).to.equal(true);
expect(awsInfo.gatheredData).to.deep.equal(expectedGatheredDataObj);
});
});
@ -136,16 +128,7 @@ describe('#getStackInfo()', () => {
const expectedGatheredDataObj = {
info: {
functions: [
{
arn: 'arn:aws:lambda:us-east-1:12345678:function:my-service-dev-hello',
name: 'my-service-dev-hello',
},
{
arn: 'arn:aws:lambda:us-east-1:12345678:function:my-service-dev-world',
name: 'my-service-dev-world',
},
],
functions: [],
endpoint: '',
service: 'my-service',
stage: 'dev',
@ -166,8 +149,6 @@ describe('#getStackInfo()', () => {
awsInfo.options.region
)).to.equal(true);
expect(getAccountIdStub.calledOnce).to.equal(true);
expect(awsInfo.gatheredData).to.deep.equal(expectedGatheredDataObj);
});
});