Add support for referenced custom authorizer lambdas

Author: Aleksander Dikanski

lib/stackops/apiGateway.js

@@ -225,7 +225,8 @@ module.exports = function(currentTemplate, aliasStackTemplates, currentAliasStac
 			const authorizerType = _.get(authorizer, 'Properties.Type');
 			if (authorizerType === 'TOKEN' || authorizerType === 'REQUEST') {
 				const uriParts = authorizer.Properties.AuthorizerUri['Fn::Join'][1];
-				const funcIndex = _.findIndex(uriParts, part => _.has(part, 'Fn::GetAtt'));
+                                const funcIndex = _.findIndex(uriParts, part => 
+                                    _.has(part, 'Fn::GetAtt') || (part.startsWith && part.startsWith('arn:aws:lambda')));
 
 				// Use the SERVERLESS_ALIAS stage variable to determine the called function alias
 				uriParts.splice(funcIndex + 1, 0, ':${stageVariables.SERVERLESS_ALIAS}');
@@ -267,7 +268,7 @@ module.exports = function(currentTemplate, aliasStackTemplates, currentAliasStac
 			const aliasName = _.find(_.keys(aliases), alias => _.startsWith(alias, functionName));
 
 			// Adjust references and alias permissions
-			permission.Properties.FunctionName = { Ref: aliasName };
+			permission.Properties.FunctionName = aliasName ? { Ref: aliasName } : permission.Properties.FunctionName;
 			if (permission.Properties.SourceArn) {
 				// Authorizers do not set the SourceArn property
 				permission.Properties.SourceArn = {
@@ -287,7 +288,7 @@ module.exports = function(currentTemplate, aliasStackTemplates, currentAliasStac
 			}
 
 			// Add dependency on function version
-			permission.DependsOn = [ versionName, aliasName ];
+                        permission.DependsOn = [ versionName, aliasName ].filter(name => name);
 
 			delete stageStack.Resources[name];
 		});