v2.0.0 release

Author: brandold

README.md

@@ -10,8 +10,8 @@ You can deploy MIE in your AWS account with the following Cloud Formation templa
 
 Region| Launch
 ------|-----
-US East (N. Virginia) | [![Launch in us-east-1](doc/images/launch-stack.png)](https://console.aws.amazon.com/cloudformation/home?region=us-east-1#/stacks/new?stackName=mie&templateURL=https://rodeolabz-us-east-1.s3.amazonaws.com/media_insights_engine/v1.0.0/cf/media-insights-stack.template)
-US West (Oregon) | [![Launch in us-west-2](doc/images/launch-stack.png)](https://console.aws.amazon.com/cloudformation/home?region=us-west-2#/stacks/new?stackName=mie&templateURL=https://rodeolabz-us-west-2.s3.us-west-2.amazonaws.com/media_insights_engine/v1.0.0/cf/media-insights-stack.template)
+US East (N. Virginia) | [![Launch in us-east-1](doc/images/launch-stack.png)](https://console.aws.amazon.com/cloudformation/home?region=us-east-1#/stacks/new?stackName=mie&templateURL=https://rodeolabz-us-east-1.s3.amazonaws.com/media_insights_engine/v2.0.0/cf/media-insights-stack.template)
+US West (Oregon) | [![Launch in us-west-2](doc/images/launch-stack.png)](https://console.aws.amazon.com/cloudformation/home?region=us-west-2#/stacks/new?stackName=mie&templateURL=https://rodeolabz-us-west-2.s3.us-west-2.amazonaws.com/media_insights_engine/v2.0.0/cf/media-insights-stack.template)
 
 The Cloud Formation options for these one-click deploys are described in the [installation parameters](#installation-parameters) section.
 
@@ -95,6 +95,7 @@ You can deploy MIE and the demo GUI in your AWS account with the [one-click depl
 * **DeployAnalyticsPipeline**: If set to true, deploys a Kinesis data stream that can be used by front-end applications to obtain the data generated by workflows. Defaults to `true`.
 * **DeployOperatorLibrary**: If set to true, deploys operators for MediaConvert, Rekognition, Transcribe, Translate, et al. Defaults to `true`.
 * **DeployTestWorkflow**: If set to true, deploys test workflow which contains operator, stage and workflow stubs for integration testing. Defaults to `false`.
+* **EnableXrayTrace**: If set to true, xray tracing is enabled for all supported services in the stack.  Defaults to `false`
 
 # Developers
 

deployment/build-s3-dist.sh

@@ -86,7 +86,7 @@ fi
 VENV=$(mktemp -d)
 python3 -m venv "$VENV"
 source "$VENV"/bin/activate
-pip install --quiet boto3 chalice docopt pyyaml jsonschema
+pip install --quiet boto3 chalice docopt pyyaml jsonschema aws_xray_sdk
 export PYTHONPATH="$PYTHONPATH:$source_dir/lib/MediaInsightsEngineLambdaHelper/"
 echo "PYTHONPATH=$PYTHONPATH"
 if [ $? -ne 0 ]; then
@@ -592,6 +592,11 @@ if ! [ -x "$(command -v chalice)" ]; then
   echo 'Chalice is not installed. It is required for this solution. Exiting.'
   exit 1
 fi
+
+# Remove chalice deployments to force redeploy when there are changes to configuration only
+# Otherwise, chalice will use the existing deployment package 
+[ -e .chalice/deployments ] && rm -rf .chalice/deployments
+
 echo "running chalice..."
 chalice package --merge-template external_resources.json dist
 echo "...chalice done"
@@ -621,6 +626,11 @@ if ! [ -x "$(command -v chalice)" ]; then
   echo 'Chalice is not installed. It is required for this solution. Exiting.'
   exit 1
 fi
+
+# Remove chalice deployments to force redeploy when there are changes to configuration only
+# Otherwise, chalice will use the existing deployment package 
+[ -e .chalice/deployments ] && rm -rf .chalice/deployments
+
 chalice package --merge-template external_resources.json dist
 echo "cp ./dist/sam.json $dist_dir/media-insights-dataplane-api-stack.template"
 cp dist/sam.json "$dist_dir"/media-insights-dataplane-api-stack.template
@@ -673,7 +683,7 @@ echo "--------------------------------------------------------------------------
 
 echo ""
 echo "Template to deploy:"
-echo https://"$bucket"."$s3domain"/media_insights_engine/"$version"/cf/media-insights-stack.template
+echo "TEMPLATE='"https://"$bucket"."$s3domain"/media_insights_engine/"$version"/cf/media-insights-stack.template"'"
 
 echo "------------------------------------------------------------------------------"
 echo "Done"

deployment/chalice-fix-inputs.py

@@ -1,5 +1,7 @@
 boto3
 requests
-urllib3
-pymediainfo
+urllib3==1.25.4
+pymediainfo==4.2.1
+jsonpickle==1.3.0
+aws-xray-sdk==2.6.0
 /packages/Media_Insights_Engine_Lambda_Helper-0.0.3-py3-none-any.whl

deployment/lambda_layer_factory/requirements.txt

@@ -14,10 +14,10 @@ Parameters:
 
 Mappings:
   SourceCode:
-        General:
-            S3Bucket: '%%BUCKET_NAME%%'
-            KeyPrefix: "media_insights_engine/%%VERSION%%/code"
-            TemplateKeyPrefix: "media_insights_engine/%%VERSION%%/cf"
+    General:
+        S3Bucket: '%%BUCKET_NAME%%'
+        KeyPrefix: "media_insights_engine/%%VERSION%%/code"
+        TemplateKeyPrefix: "media_insights_engine/%%VERSION%%/cf"
 
 Resources:
 # kinesis data stream
@@ -37,6 +37,8 @@ Resources:
     Properties:
       Handler: "stream.lambda_handler"
       Role: !GetAtt LambdaStreamRole.Arn
+      TracingConfig: 
+          Mode: "PassThrough"
       Code:
         S3Bucket: !FindInMap ["SourceCode", "General", "S3Bucket"]
         S3Key:
@@ -65,6 +67,11 @@ Resources:
 # iam stuff
   LambdaStreamRole:
     Type: "AWS::IAM::Role"
+    Metadata:
+      cfn_nag:
+        rules_to_suppress:
+          - id: W11
+            reason: "The policy applies to all resources - can't be scoped to a specific resource"
     Properties:
       AssumeRolePolicyDocument:
         Version: 2012-10-17
@@ -97,6 +104,11 @@ Resources:
                   - "dynamodb:GetShardIterator"
                   - "dynamodb:ListStreams"
                 Resource: !Ref DynamoStreamArn
+              - Effect: Allow
+                Action:
+                  - "xray:PutTraceSegments"
+                  - "xray:PutTelemetryRecords"
+                Resource: "*"
               # TODO: Security - Scope this down
               - Effect: Allow
                 Action: