Merge pull request #3 from aws-samples/s3-improvements

S3 improvements

Author: hi4rahul

README.md

@@ -77,14 +77,14 @@ The demo application is deployed as an [AWS CloudFormation](https://aws.amazon.c
 #### Accessing the Application
 
 After deployment, the application can be used by configuring the following services.
-1. The event that triggers the Step Machine is defaulted to run every hour and is set to "Enabled" at the start. This event can be modified and set to "Disabled" if the use case does not need to trigger the step machine automatically. The default hourly run schedule can also be modified as per use case. When modifying the run schedule, a key point to bear in mind will be to check the pricing for Amazon Rekognition Custom Labels - which is currently priced per hour. The step machine is configured to shut down the model after 1 hour by default.
-2. The Source S3 bucket should be used as the destination bucket for all the images to be used for inferencing. 
+1. The event that triggers the Step Machine is defaulted to run every 2 hours and is set to "Enabled" at the start. This event can be modified and set to "Disabled" if the use case does not need to trigger the step machine automatically. The default 2 hours run schedule can also be modified as per use case. When modifying the run schedule, a key point to bear in mind will be to check the pricing for Amazon Rekognition Custom Labels - which is currently priced per hour. The step machine is configured to shut down the model after 1 hour by default.
+2. The Source S3 bucket should be used as the destination bucket for all the images to be used for inferencing. As the images get processed, they will be deleted from the source bucket.
 3. The Final S3 bucket holds the images that have been processed along with the inferenced custom label jsons.
 
 
 ### Remove the application
 
-To remove the application open the AWS CloudFormation Console, click on the name of the project, right-click and select "_Delete Stack_". Your stack will take some time to be deleted. You can track its progress in the "Events" tab. When it is done, the status will change from "_DELETE_IN_PROGRESS_" to "_DELETE_COMPLETE_". It will then disappear from the list. Please note that the Amazon S3 buckets will only be deleted if they are empty.
+To remove the application open the AWS CloudFormation Console, click on the name of the project, right-click and select "_Delete Stack_". Your stack will take some time to be deleted. You can track its progress in the "Events" tab. When it is done, the status will change from "_DELETE_IN_PROGRESS_" to "_DELETE_COMPLETE_". It will then disappear from the list. Please note that the Amazon S3 buckets and their content will be retained.
 
 
 ## License

template.yaml

@@ -12,12 +12,17 @@ Parameters:
 Mappings:
   Solution:
     Constants:
-      Version: 'v0.5'
+      Version: 'v0.6'
 
 Resources:
   SourceS3Bucket:
     Type: AWS::S3::Bucket
+    DeletionPolicy: Retain
     Properties:
+      BucketEncryption:
+        ServerSideEncryptionConfiguration:
+        - ServerSideEncryptionByDefault:
+            SSEAlgorithm: AES256
       NotificationConfiguration:
         QueueConfigurations:
           - Event: s3:ObjectCreated:*
@@ -127,7 +132,7 @@ Resources:
           Properties:
             Description: Schedule to run the state machine every hour
             Enabled: True # This schedule can be disabled based on the use case to avoid incurring charges.
-            Schedule: "rate(1 hour)"
+            Schedule: "rate(2 hours)"
       Policies: # Find out more about SAM policy templates: https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/serverless-policy-templates.html
         - LambdaInvokePolicy:
             FunctionName: !Ref SQSPollerFunction
@@ -230,6 +235,12 @@ Resources:
 
   FinalS3Bucket:
     Type: "AWS::S3::Bucket"
+    DeletionPolicy: Retain
+    Properties:
+      BucketEncryption:
+        ServerSideEncryptionConfiguration:
+        - ServerSideEncryptionByDefault:
+            SSEAlgorithm: AES256
 
   AnalyseImageFunction:
     Type: AWS::Serverless::Function # More info about Function Resource: https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/sam-resource-function.html