Merge 9405371 into 6b9d0ac

serverless-heaven · Apr 23, 2019 · c844ac0 · c844ac0
2 parents 6b9d0ac + 9405371
commit c844ac0
Show file tree

Hide file tree

Showing 4 changed files with 467 additions and 11 deletions.
diff --git a/lib/stackops/lambdaRole.js b/lib/stackops/lambdaRole.js
@@ -35,22 +35,26 @@ module.exports = function(currentTemplate, aliasStackTemplates, currentAliasStac
 	const role = stageStack.Resources.IamRoleLambdaExecution;
 
 	// Set role name
-	_.last(role.Properties.RoleName['Fn::Join']).push(this._alias);
+	if (role.Properties.RoleName['Fn::Join']) {
+		_.last(role.Properties.RoleName['Fn::Join']).push(this._alias);
+	}
 
 	stageStack.Resources[roleLogicalId] = stageStack.Resources.IamRoleLambdaExecution;
 	delete stageStack.Resources.IamRoleLambdaExecution;
 
 	// Replace references
 	const functions = _.filter(stageStack.Resources, ['Type', 'AWS::Lambda::Function']);
 	_.forEach(functions, func => {
-		func.Properties.Role = {
-			'Fn::GetAtt': [
-				roleLogicalId,
-				'Arn'
-			]
-		};
-		const dependencyIndex = _.indexOf(func.DependsOn, 'IamRoleLambdaExecution');
-		func.DependsOn[dependencyIndex] = roleLogicalId;
+		if (_.isEqual(func.Properties.Role, { 'Fn::GetAtt': ['IamRoleLambdaExecution', 'Arn' ]})) {
+			func.Properties.Role = {
+				'Fn::GetAtt': [
+					roleLogicalId,
+					'Arn'
+				]
+			};
+			const dependencyIndex = _.indexOf(func.DependsOn, 'IamRoleLambdaExecution');
+			func.DependsOn[dependencyIndex] = roleLogicalId;
+		}
 	});
 
 	if (_.has(currentTemplate, 'Resources.IamRoleLambdaExecution')) {