Merge pull request serverless-heaven#95 from zachboyd/sns-subscriptio…

…n-fix Added support to have an alias subscribe to an existing SNS topic serverless-heaven#94
1stdibs · Jan 25, 2018 · 0c6451a · 0c6451a
2 parents 2e5da17 + 639c0c4
commit 0c6451a
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 0 deletions.
diff --git a/lib/stackops/snsEvents.js b/lib/stackops/snsEvents.js
@@ -46,6 +46,23 @@ module.exports = function(currentTemplate, aliasStackTemplates, currentAliasStac
  delete stageStack.Resources[name];
  });
 
+ const snsSubscriptions =
+ _.assign({},
+ _.pickBy(stageStack.Resources, [ 'Type', 'AWS::SNS::Subscription' ]));
+
+ _.forOwn(snsSubscriptions, (subscription, name) => {
+
+ 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));
+
+ subscription.Properties.Endpoint = { Ref: aliasName };
+ subscription.DependsOn = [ versionName, aliasName ];
+
+ delete stageStack.Resources[name];
+ });
+
  // Fetch lambda permissions. These have to be updated later to allow the aliased functions.
  const snsLambdaPermissions =
  _.assign({},
@@ -71,6 +88,7 @@ module.exports = function(currentTemplate, aliasStackTemplates, currentAliasStac
 
  // Add all alias stack owned resources
  aliasResources.push(snsTopics);
+ aliasResources.push(snsSubscriptions);
  aliasResources.push(snsLambdaPermissions);
 
  _.forEach(aliasResources, resource => _.assign(aliasStack.Resources, resource));

diff --git a/test/data/sns-stack.json b/test/data/sns-stack.json
@@ -250,6 +250,24 @@
  ]
  }
  },
+ "SNSTopicSubscriptionSlstestprojecttopic": {
+ "Type" : "AWS::SNS::Subscription",
+ "Properties": {
+ "Endpoint": {
+ "Fn::GetAtt": [
+ "Testfct1LambdaFunction",
+ "Arn"
+ ]
+ },
+ "Protocol": "lambda",
+ "TopicArn": {
+ "Fn::GetAtt": [
+ "SNSTopicSlstestprojecttopic",
+ "Arn"
+ ]
+ }
+ }
+ },
  "Testfct1LambdaPermissionSlstestprojecttopicSNS": {
  "Type": "AWS::Lambda::Permission",
  "Properties": {

diff --git a/test/stackops/snsEvents.test.js b/test/stackops/snsEvents.test.js
@@ -75,8 +75,10 @@ describe('SNS Events', () => {
  return expect(awsAlias.aliasHandleSNSEvents({}, [], {})).to.be.fulfilled
  .then(() => BbPromise.all([
  expect(snsStack).to.not.have.a.nested.property('Resources.SNSTopicSlstestprojecttopic'),
+ expect(snsStack).to.not.have.a.nested.property('Resources.SNSTopicSubscriptionSlstestprojecttopic'),
  expect(snsStack).to.not.have.a.nested.property('Resources.Testfct1LambdaPermissionSlstestprojecttopicSNS'),
  expect(aliasStack).to.have.a.nested.property('Resources.SNSTopicSlstestprojecttopic'),
+ expect(aliasStack).to.have.a.nested.property('Resources.SNSTopicSubscriptionSlstestprojecttopic'),
  expect(aliasStack).to.have.a.nested.property('Resources.Testfct1LambdaPermissionSlstestprojecttopicSNS'),
  ]));
  });