Merge branch 'master' into fix-per-function-role

Author: Enase

.gitignore

@@ -1,6 +1,4 @@
 /node_modules
-/coverage
-/.nyc_output
 
 # Jetbrains IDEs
 .idea/

lib/stackops/apiGateway.js

@@ -186,7 +186,7 @@ module.exports = function(currentTemplate, aliasStackTemplates, currentAliasStac
 			this.options.verbose && this._serverless.cli.log('Configuring stage');
 			const stageResource = internal.createStageResource.call(this, `${stackName}-ApiGatewayRestApi`, deploymentName);
 			aliasResources.push({ ApiGatewayStage: stageResource });
-			
+
 			const baseMapping = _.assign({}, _.pickBy(stageStack.Resources, ['Type', 'AWS::ApiGateway::BasePathMapping']));
 			if (!_.isEmpty(baseMapping)) {
 				const baseMappingName = _.keys(baseMapping)[0];
@@ -198,7 +198,7 @@ module.exports = function(currentTemplate, aliasStackTemplates, currentAliasStac
 				aliasResources.push(baseMapping);
 				delete stageStack.Resources[baseMappingName];
 			}
-		}	
+		}
 
 		// Fetch lambda permissions, methods and resources. These have to be updated later to allow the aliased functions.
 		const apiLambdaPermissions =
@@ -278,9 +278,9 @@ module.exports = function(currentTemplate, aliasStackTemplates, currentAliasStac
 		// Adjust permission to reference the function aliases
 		_.forOwn(apiLambdaPermissions, (permission, name) => {
 			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 = isExternalRefAuthorizerPredicate(permission.Properties.FunctionName); 
+			const versionName = utils.getFunctionVersionName(versions, functionName);
+			const aliasName = utils.getAliasVersionName(aliases, functionName);
+			const isExternalRef = isExternalRefAuthorizerPredicate(permission.Properties.FunctionName);
 
 			// Adjust references and alias permissions
 			if (!isExternalRef) {
@@ -305,9 +305,9 @@ module.exports = function(currentTemplate, aliasStackTemplates, currentAliasStac
 					]
 				};
 			}
-			
+
 			// Add dependency on function version
-			if (!isExternalRef) {	
+			if (!isExternalRef) {
 				permission.DependsOn = [ versionName, aliasName ];
 			} else {
 				permission.DependsOn = _.compact([ versionName, aliasName ]);

lib/stackops/snsEvents.js

@@ -31,8 +31,8 @@ module.exports = function(currentTemplate, aliasStackTemplates, currentAliasStac
 		_.forOwn(lambdaSubscriptions, subscription => {
 			const functionNameRef = utils.findAllReferences(_.get(subscription, 'Endpoint'));
 			const functionName = _.replace(_.get(functionNameRef, '[0].ref', ''), /LambdaFunction$/, '');
-			const versionName = _.find(_.keys(versions), version => _.startsWith(version, functionName));
-			const aliasName = _.find(_.keys(aliases), alias => _.startsWith(alias, functionName));
+			const versionName = utils.getFunctionVersionName(versions, functionName);
+			const aliasName = utils.getAliasVersionName(aliases, functionName);
 
 			subscription.Endpoint = { Ref: aliasName };
 
@@ -54,8 +54,8 @@ module.exports = function(currentTemplate, aliasStackTemplates, currentAliasStac
 
 		const functionNameRef = utils.findAllReferences(_.get(subscription.Properties, 'Endpoint'));
 		const functionName = _.replace(_.get(functionNameRef, '[0].ref', ''), /LambdaFunction$/, '');
-		const versionName = _.find(_.keys(versions), version => _.startsWith(version, functionName));
-		const aliasName = _.find(_.keys(aliases), alias => _.startsWith(alias, functionName));
+		const versionName = utils.getFunctionVersionName(versions, functionName);
+		const aliasName = utils.getAliasVersionName(aliases, functionName);
 
 		subscription.Properties.Endpoint = { Ref: aliasName };
 		subscription.DependsOn = [ versionName, aliasName ];
@@ -72,8 +72,8 @@ module.exports = function(currentTemplate, aliasStackTemplates, currentAliasStac
 	// Adjust permission to reference the function aliases
 	_.forOwn(snsLambdaPermissions, (permission, name) => {
 		const functionName = _.replace(name, /LambdaPermission.*$/, '');
-		const versionName = _.find(_.keys(versions), version => _.startsWith(version, functionName));
-		const aliasName = _.find(_.keys(aliases), alias => _.startsWith(alias, functionName));
+		const versionName = utils.getFunctionVersionName(versions, functionName);
+		const aliasName = utils.getAliasVersionName(aliases, functionName);
 
 		// Adjust references and alias permissions
 		permission.Properties.FunctionName = { Ref: aliasName };

lib/utils.js

@@ -89,7 +89,8 @@ class Utils {
 
 	/**
 	 * Checks if a CF resource permission targets the given service as Principal.
-	 * @param {string} service 
+	 * @param {Object} permission
+	 * @param {string} service
 	 */
 	static hasPermissionPrincipal(permission, service) {
 		const principal = _.get(permission, 'Properties.Principal');
@@ -104,6 +105,23 @@ class Utils {
 		return false;
 	}
 
+	/**
+	 * @param {object} versions
+	 * @param {string} functionName
+	 * @returns {string}
+	 */
+	static getFunctionVersionName(versions, functionName) {
+		return _.find(_.keys(versions), version => version === `${functionName}LambdaVersion`);
+	}
+
+	/**
+	 * @param {object} aliases
+	 * @param {string} functionName
+	 * @returns {string}
+	 */
+	static getAliasVersionName(aliases, functionName) {
+		return _.find(_.keys(aliases), alias => alias === `${functionName}Alias`);
+	}
 }
 
 module.exports = Utils;

test/data/alias-stack-1.json

@@ -9,6 +9,25 @@
         "RetentionInDays": 7
       }
     },
+    "Testfct1WithSuffixAlias": {
+      "Type": "AWS::Lambda::Alias",
+      "Properties": {
+        "Description": "Echo function echoes alias",
+        "FunctionName": {
+          "Fn::ImportValue": "sls-test-project-dev-Testfct1WithSuffix-LambdaFunctionArn"
+        },
+        "FunctionVersion": {
+          "Fn::GetAtt": [
+            "Testfct1WithSuffixLambdaVersionWh5jTkiTR67V05RPWQIlzPI25WiPbdHDYNgbtAMneU",
+            "Version"
+          ]
+        },
+        "Name": "myAlias"
+      },
+      "DependsOn": [
+        "Testfct1WithSuffixLambdaVersionWh5jTkiTR67V05RPWQIlzPI25WiPbdHDYNgbtAMneU"
+      ]
+    },
     "Testfct1Alias": {
       "Type": "AWS::Lambda::Alias",
       "Properties": {
@@ -47,6 +66,17 @@
         "WarmUpPluginLambdaVersionWh5jTkiTR67V05RPWQIlzPI25WiPbdHDYNgbtAMneU"
       ]
     },
+    "Testfct1WithSuffixLambdaVersionWh5jTkiTR67V05RPWQIlzPI25WiPbdHDYNgbtAMneU": {
+      "Type": "AWS::Lambda::Version",
+      "DeletionPolicy": "Delete",
+      "Properties": {
+        "FunctionName": {
+          "Fn::ImportValue": "sls-test-project-dev-Testfct1WithSuffix-LambdaFunctionArn"
+        },
+        "CodeSha256": "Wh5jTkiTR67+V05RPWQIlzPI25WiPbdHDYNgbtAMneU=",
+        "Description": "Echo function echoes alias"
+      }
+    },
     "Testfct1LambdaVersionWh5jTkiTR67V05RPWQIlzPI25WiPbdHDYNgbtAMneU": {
       "Type": "AWS::Lambda::Version",
       "DeletionPolicy": "Delete",
@@ -97,6 +127,40 @@
         "ApiGatewayDeployment1494367071211"
       ]
     },
+    "Testfct1WithSuffixLambdaPermissionApiGateway": {
+      "Type": "AWS::Lambda::Permission",
+      "Properties": {
+        "FunctionName": {
+          "Ref": "Testfct1WithSuffixAlias"
+        },
+        "Action": "lambda:InvokeFunction",
+        "Principal": "apigateway.amazonaws.com",
+        "SourceArn": {
+          "Fn::Join": [
+            "",
+            [
+              "arn:aws:execute-api:",
+              {
+                "Ref": "AWS::Region"
+              },
+              ":",
+              {
+                "Ref": "AWS::AccountId"
+              },
+              ":",
+              {
+                "Fn::ImportValue": "sls-test-project-dev-ApiGatewayRestApi"
+              },
+              "/*/*"
+            ]
+          ]
+        }
+      },
+      "DependsOn": [
+        "Testfct1WithSuffixLambdaVersionWh5jTkiTR67V05RPWQIlzPI25WiPbdHDYNgbtAMneU",
+        "Testfct1WithSuffixAlias"
+      ]
+    },
     "Testfct1LambdaPermissionApiGateway": {
       "Type": "AWS::Lambda::Permission",
       "Properties": {