Merge f27ceaf into 89de546

serverless-heaven · Feb 15, 2018 · edd4726 · edd4726
2 parents 89de546 + f27ceaf
commit edd4726
Show file tree

Hide file tree

Showing 3 changed files with 481 additions and 6 deletions.
diff --git a/lib/stackops/apiGateway.js b/lib/stackops/apiGateway.js
@@ -225,10 +225,14 @@ 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 isExternalRefAuthorizer = _.every(uriParts, part => !_.startsWith(part, 'arn:aws:lambda'));
+				if (isExternalRefAuthorizer) {
+					const funcIndex = _.findIndex(uriParts, part => 
+						_.has(part, 'Fn::GetAtt') || _.startsWith(part, 'arn:aws:lambda'));
 
-				// Use the SERVERLESS_ALIAS stage variable to determine the called function alias
-				uriParts.splice(funcIndex + 1, 0, ':${stageVariables.SERVERLESS_ALIAS}');
+					// Use the SERVERLESS_ALIAS stage variable to determine the called function alias
+					uriParts.splice(funcIndex + 1, 0, ':${stageVariables.SERVERLESS_ALIAS}');
+				}
 			}
 
 			authorizer.Properties.Name = `${authorizer.Properties.Name}-${this._alias}`;
@@ -265,9 +269,12 @@ module.exports = function(currentTemplate, aliasStackTemplates, currentAliasStac
 			const functionName = _.replace(name, /LambdaPermissionApiGateway$/, '');
 			const versionName = _.find(_.keys(versions), version => _.startsWith(version, functionName));
 			const aliasName = _.find(_.keys(aliases), alias => _.startsWith(alias, functionName));
+			const isExternalRef = _.startsWith(permission.Properties.FunctionName, 'arn:aws:lambda'); 
 
 			// Adjust references and alias permissions
-			permission.Properties.FunctionName = { Ref: aliasName };
+			if (!isExternalRef) {
+				permission.Properties.FunctionName = { Ref: aliasName };
+			}
 			if (permission.Properties.SourceArn) {
 				// Authorizers do not set the SourceArn property
 				permission.Properties.SourceArn = {
@@ -285,9 +292,13 @@ module.exports = function(currentTemplate, aliasStackTemplates, currentAliasStac
 					]
 				};
 			}
-
+			
 			// Add dependency on function version
-			permission.DependsOn = [ versionName, aliasName ];
+			if (!isExternalRef) {	
+				permission.DependsOn = [ versionName, aliasName ];
+			} else {
+				permission.DependsOn = _.compact([ versionName, aliasName ]);
+			}
 
 			delete stageStack.Resources[name];
 		});