Merge branch 'master' into lambda

Author: mwunderl

.ebextensions/env.config

@@ -1,6 +1,10 @@
+Parameters:
+  EmailAddress:
+    Type: String
+    Default: UPDATEME
+
 option_settings:
-  aws:elasticbeanstalk:customoption:
-    NotificationEmail: [email protected]
   aws:elasticbeanstalk:application:environment:
     AWS_REGION: '`{"Ref" : "AWS::Region"}`'
     NOTIFICATION_TOPIC: '`{"Ref" : "NotificationTopic"}`'
+    NOTIFICATION_EMAIL: '`{"Ref" : "EmailAddress"}`'

.ebextensions/sns-topic.config

@@ -1,8 +1,3 @@
 Resources:
   NotificationTopic:
     Type: AWS::SNS::Topic
-    Properties:
-      Subscription:
-      - Endpoint:
-          Fn::GetOptionSetting: {DefaultValue: [email protected], OptionName: NotificationEmail}
-        Protocol: email

README.md

@@ -96,7 +96,7 @@ Deploy the source code for the project to your Elastic Beanstalk environment.
 
 *To deploy the source code*
 
-1. Download the source bundle: [eb-java-scorekeep-v1.zip](https://github.com/awslabs/eb-java-scorekeep/releases/download/v1.1/eb-java-scorekeep-v1.zip)
+1. Download the source bundle: [eb-java-scorekeep-v1.zip](https://github.com/awslabs/eb-java-scorekeep/releases/download/v1.3/eb-java-scorekeep-v1.zip)
 2. Open the [Elastic Beanstalk Management Console](console.aws.amazon.com/elasticbeanstalk/home).
 3. Click your environment's name to open the Dashboard.
 4. Click **Upload and Deploy**.
@@ -108,13 +108,13 @@ Deploy the source code for the project to your Elastic Beanstalk environment.
 Click through the app to explore its functionality. Use the network console in your browser to see the HTTP requests that it sends to the API to read and write users, sessions, games, moves and game state to DynamoDB via the API.
 
 ## Configure Notifications
-The API uses Amazon SNS to send a notification email whenever a game ends. Configure your email address in the source code and redeploy to enable notifications.
+The API uses Amazon SNS to send a notification email when a game ends. To enable notifications, configure your email address in an environment variable.
 
 *To enable notifications*
-1. Clone this repository
-2. Add your email address to the `env.config` configuration file in the `.ebextensions` folder.
-3. [Create a source bundle](https://docs.aws.amazon.com/elasticbeanstalk/latest/dg/applications-sourcebundle.html).
-4. [Deploy the source bundle](http://docs.aws.amazon.com/elasticbeanstalk/latest/dg/using-features.deploy-existing-version.html#deployments-newversion).
+1. Open your environment's page in the [environment management console](https://docs.aws.amazon.com/elasticbeanstalk/latest/dg/environments-console.html).
+2. Choose **Configuration**.
+3. Choose **Software Configuration**
+4. Under **Environment Properties**, set **NOTIFICATION_TOPIC** to your email address.
 5. Check your email for a subscription confirmation.
 6. Complete a game to trigger a notification.
 

src/main/java/scorekeep/Utils.java

@@ -5,7 +5,7 @@
 import com.amazonaws.services.sns.AmazonSNSClientBuilder;
 import com.amazonaws.services.sns.model.PublishRequest;
 import com.amazonaws.services.sns.model.PublishResult;
-
+import com.amazonaws.services.sns.model.SubscribeRequest;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -23,4 +23,15 @@ public static void sendNotification(String subject, String body) {
     PublishResult publishResult = snsclient.publish(publishRequest);
     logger.info("Email sent: " + publishResult.getMessageId());
   }
+
+  /*
+   * Create an SNS subscription.
+   */
+  public static void createSubscription() {
+    String topicarn = System.getenv("NOTIFICATION_TOPIC");
+    String emailaddress = System.getenv("NOTIFICATION_EMAIL");
+    SubscribeRequest subRequest = new SubscribeRequest(topicarn, "email", emailaddress);
+    snsclient.subscribe(subRequest);
+  }
+
 }

src/main/java/scorekeep/WebConfig.java

@@ -3,11 +3,21 @@
 import org.springframework.context.annotation.Bean;
 import javax.servlet.Filter;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 @Configuration
 public class WebConfig {
+  private static final Logger logger = LoggerFactory.getLogger(WebConfig.class);
 
   @Bean
   public Filter SimpleCORSFilter() {
     return new SimpleCORSFilter();
   }
-}
+
+  static {
+    if ( System.getenv("NOTIFICATION_EMAIL") != null ){
+      Utils.createSubscription();
+    }
+  }
+}