Making deployment more generic to be able to deploy to multiple stages.

onema · Jan 21, 2019 · 6512da0 · 6512da0
1 parent 0addc35
commit 6512da0
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 17 deletions.
diff --git a/infrastructure/global-values.yml b/infrastructure/global-values.yml
@@ -12,8 +12,8 @@ iamRoleStatements:
       - dynamodb:GetItem
       - dynamodb:Query
     Resource:
-      - Fn::GetAtt: [ DynamoDBTable, Arn ]
-      - Fn::Join: ["/", [ Fn::GetAtt: [DynamoDBTable, Arn], "index", "*"]]
+      - Fn::GetAtt: [ LambdaMailerTable, Arn ]
+      - Fn::Join: ["/", [ Fn::GetAtt: [LambdaMailerTable, Arn], "index", "*"]]
   - Effect: Allow
     Action:
       - ses:SendEmail

diff --git a/infrastructure/mailer-resources_cfn.yml b/infrastructure/mailer-resources_cfn.yml
@@ -1,8 +1,4 @@
 Parameters:
-  TableName:
-    Type: String
-    Default: LambdaMailerSESNotifications
-    Description: The name of the dynamodb table
   PartitionKey:
     Type: String
     Default: MessageId
@@ -30,12 +26,9 @@ Parameters:
 
 Resources:
 
-  DynamoDBTable:
+  LambdaMailerTable:
     Type: AWS::DynamoDB::Table
     Properties:
-      TableName:
-        Ref: TableName
-
       AttributeDefinitions:
       - AttributeName:
           Ref: PartitionKey
@@ -109,21 +102,21 @@ Resources:
 Outputs:
   LambdaMailerTopicArn:
     Value:
-      Ref: SNSTopicDevmailer
+      Ref: SNSTopicMailer
     Export:
       Name:
         Fn::Join: ["-", [Ref: StageName, "lambda-mailer-topic-arn"]]
 
   LambdaMailerBounceTopicArn:
     Value:
-      Ref: SNSTopicDevmailerbounce
+      Ref: SNSTopicMailerbounce
     Export:
       Name:
         Fn::Join: ["-", [Ref: StageName, "lambda-mailer-bounce-topic-arn"]]
 
   EmailBounceAndComplaintTable:
     Value:
-      Ref: DynamoDBTable
+      Ref: LambdaMailerTable
 
   ForwarderS3BucketArn:
     Value:

diff --git a/serverless.yml b/serverless.yml
@@ -44,19 +44,19 @@ functions:
     onError: ${file(infrastructure/global-values.yml):deadLetterQueue}
     environment:
       TABLE_NAME:
-        Ref: TableName
+        Ref: LambdaMailerTable
     events:
-      - sns: ${self:custom.stageName}-mailer-bounce
+      - sns: mailer-bounce
 
   mailer:
     handler: io.onema.mailer.MailerFunction::lambdaHandler
     onError: ${file(infrastructure/global-values.yml):deadLetterQueue}
     environment:
       LOG_EMAIL:  ${env:LOG_EMAIL, 'false'}
       TABLE_NAME:
-        Ref: TableName
+        Ref: LambdaMailerTable
     events:
-      - sns: ${self:custom.stageName}-mailer
+      - sns: mailer
 
   forwarder:
     handler: io.onema.forwarder.ForwarderFunction::lambdaHandler