Merge pull request serverless-heaven#90 from sanukerinc/master

Enhance alias logs function serverless-heaven#89 serverless-heaven#62

Author: HyperBrain

index.js

@@ -177,6 +177,9 @@ class AwsAlias {
 			logCommand.options.alias = {
 				usage: 'Alias'
 			};
+			logCommand.options.version = {
+				usage: 'Logs a specific version of the function'
+			};
 			logCommand.commands = _.assign({}, logCommand.commands, {
 				api: {
 					usage: 'Output the logs of a deployed APIG stage (alias)',

lib/logs.js

@@ -55,15 +55,21 @@ module.exports = {
 			orderBy: 'LastEventTime',
 		};
 
+		let aliasGetAliasFunctionVersion;
+		// Check if --version is specified
+		if (this._options.version) {
+			aliasGetAliasFunctionVersion = BbPromise.resolve(this._options.version);
+		} else {
+			aliasGetAliasFunctionVersion = this.aliasGetAliasLatestFunctionVersionByFunctionName(this._alias, this._lambdaName);
+		}
 		// Get currently deployed function version for the alias to
 		// setup the stream filter correctly
-		return this.aliasGetAliasFunctionVersions(this._alias)
-		.then(versions => {
-			return _.map(
-				_.filter(versions, [ 'functionName', this._lambdaName ]),
-				version => version.functionVersion);
-		})
+		return aliasGetAliasFunctionVersion
 		.then(version => {
+			if (!version) {
+				return BbPromise.reject(new this.serverless.classes.Error('Function alias not found.'));
+			}
+
 			return this.provider
 				.request('CloudWatchLogs',
 					'describeLogStreams',
@@ -75,13 +81,16 @@ module.exports = {
 						throw new this.serverless.classes
 							.Error('No existing streams for the function alias');
 					}
-
-					return _.map(
+					const logStreamNames = _.map(
 						_.filter(reply.logStreams, stream => _.includes(stream.logStreamName, `[${version}]`)),
 						stream => stream.logStreamName);
+
+					if (_.isEmpty(logStreamNames)) {
+						return BbPromise.reject(new this.serverless.classes.Error('No existing streams for this function version. If you want to view logs of a specific function version, please use --version'));
+					}
+					return logStreamNames;
 				});
 		});
-
 	},
 
 	apiLogsGetLogStreams() {

lib/stackInformation.js

@@ -181,4 +181,13 @@ module.exports = {
 		});
 	},
 
+	aliasGetAliasLatestFunctionVersionByFunctionName(aliasName, functionName) {
+		return this._provider.request('Lambda',
+			'getAlias',
+			{ FunctionName: functionName, Name: aliasName },
+			this._options.stage,
+			this._options.region)
+			.then(result => _.get(result, 'FunctionVersion', null));
+	},
+
 };

test/logs.test.js

@@ -23,7 +23,7 @@ describe('logs', () => {
 	let sandbox;
 	let providerRequestStub;
 	let logStub;
-	let aliasGetAliasFunctionVersionsStub;
+	let aliasGetAliasLatestFunctionVersionByFunctionNameStub;
 	let aliasStacksDescribeResourceStub;
 
 	before(() => {
@@ -45,7 +45,7 @@ describe('logs', () => {
 		awsAlias = new AWSAlias(serverless, options);
 		providerRequestStub = sandbox.stub(awsAlias._provider, 'request');
 		logStub = sandbox.stub(serverless.cli, 'log');
-		aliasGetAliasFunctionVersionsStub = sandbox.stub(awsAlias, 'aliasGetAliasFunctionVersions');
+		aliasGetAliasLatestFunctionVersionByFunctionNameStub = sandbox.stub(awsAlias, 'aliasGetAliasLatestFunctionVersionByFunctionName');
 		aliasStacksDescribeResourceStub = sandbox.stub(awsAlias, 'aliasStacksDescribeResource');
 
 		logStub.returns();
@@ -206,12 +206,7 @@ describe('logs', () => {
 				],
 			};
 			providerRequestStub.resolves(streamReply);
-			aliasGetAliasFunctionVersionsStub.returns(BbPromise.resolve([
-				{
-					functionName: 'func1',
-					functionVersion: '20'
-				}
-			]));
+			aliasGetAliasLatestFunctionVersionByFunctionNameStub.returns(BbPromise.resolve('20'));
 			awsAlias._lambdaName = 'func1';
 
 			return expect(awsAlias.logsGetLogStreams()).to.be.fulfilled
@@ -239,7 +234,7 @@ describe('logs', () => {
 
 		it('should throw error if no log streams found', () => {
 			providerRequestStub.resolves();
-			aliasGetAliasFunctionVersionsStub.returns(BbPromise.resolve([]));
+			aliasGetAliasLatestFunctionVersionByFunctionNameStub.returns(BbPromise.resolve(null));
 
 			return expect(awsAlias.logsGetLogStreams()).to.be.rejectedWith("");
 		});