v2.0.2 release (#348)

Co-authored-by: GitHub Actions <[email protected]>

.github/workflows/pr-workflow.yml

@@ -33,8 +33,9 @@ jobs:
           REGION=us-west-2
           VERSION="pr${SHORT_SHA}"
           DIST_OUTPUT_BUCKET=mie-dev
-          ./build-s3-dist-no-layer-build.sh $DIST_OUTPUT_BUCKET-$REGION $VERSION $REGION
-          read -r TEMPLATE < dist/templateUrl.txt
+          TEMPLATE_OUTPUT_BUCKET=mie-dev-us-west-2
+          ./build-s3-dist.sh --no-layer --template-bucket $TEMPLATE_OUTPUT_BUCKET --code-bucket $DIST_OUTPUT_BUCKET --version $VERSION --region $REGION
+          read -r TEMPLATE < templateUrl.txt
           aws cloudformation create-stack --stack-name $MIE_STACK_NAME --template-url $TEMPLATE --region $REGION --parameters ParameterKey=DeployTestResources,ParameterValue=true ParameterKey=MaxConcurrentWorkflows,ParameterValue=10 ParameterKey=DeployAnalyticsPipeline,ParameterValue=true ParameterKey=EnableXrayTrace,ParameterValue=true --capabilities CAPABILITY_IAM CAPABILITY_NAMED_IAM CAPABILITY_AUTO_EXPAND --disable-rollback
 
       - name: Wait for deploy to complete before progressing

.github/workflows/release-workflow.yml

@@ -53,8 +53,9 @@ jobs:
           REGION=us-west-2
           VERSION=v${{ github.event.inputs.version }}
           DIST_OUTPUT_BUCKET=mie-dev
-          ./build-s3-dist-no-layer-build.sh $DIST_OUTPUT_BUCKET-$REGION $VERSION $REGION
-          read -r TEMPLATE < dist/templateUrl.txt
+          TEMPLATE_OUTPUT_BUCKET=mie-dev-$REGION
+          ./build-s3-dist.sh --no-layer --template-bucket $TEMPLATE_OUTPUT_BUCKET --code-bucket $DIST_OUTPUT_BUCKET --version $VERSION --region $REGION
+          read -r TEMPLATE < templateUrl.txt
           aws cloudformation create-stack --stack-name $MIE_STACK_NAME --template-url $TEMPLATE --region $REGION --parameters ParameterKey=DeployTestResources,ParameterValue=true ParameterKey=MaxConcurrentWorkflows,ParameterValue=10 ParameterKey=DeployAnalyticsPipeline,ParameterValue=true ParameterKey=EnableXrayTrace,ParameterValue=true --capabilities CAPABILITY_IAM CAPABILITY_NAMED_IAM CAPABILITY_AUTO_EXPAND --disable-rollback
       - name: Wait for deploy to complete before progressing
         uses: jakejarvis/wait-action@master
@@ -84,8 +85,9 @@ jobs:
           REGION=us-east-1
           VERSION=v${{ github.event.inputs.version }}
           DIST_OUTPUT_BUCKET=mie-dev
-          ./build-s3-dist-no-layer-build.sh $DIST_OUTPUT_BUCKET-$REGION $VERSION $REGION
-          read -r TEMPLATE < dist/templateUrl.txt
+          TEMPLATE_OUTPUT_BUCKET=mie-dev-$REGION
+          ./build-s3-dist.sh --no-layer --template-bucket $TEMPLATE_OUTPUT_BUCKET --code-bucket $DIST_OUTPUT_BUCKET --version $VERSION --region $REGION
+          read -r TEMPLATE < templateUrl.txt
           aws cloudformation create-stack --stack-name $MIE_STACK_NAME --template-url $TEMPLATE --region $REGION --parameters ParameterKey=DeployTestResources,ParameterValue=true ParameterKey=MaxConcurrentWorkflows,ParameterValue=10 ParameterKey=DeployAnalyticsPipeline,ParameterValue=true ParameterKey=EnableXrayTrace,ParameterValue=true --capabilities CAPABILITY_IAM CAPABILITY_NAMED_IAM CAPABILITY_AUTO_EXPAND --disable-rollback
       - name: Wait for deploy to complete before progressing
         uses: jakejarvis/wait-action@master
@@ -224,7 +226,8 @@ jobs:
           REGION=us-west-2
           VERSION=v${{ github.event.inputs.version }}
           DIST_OUTPUT_BUCKET=rodeolabz
-          ./build-s3-dist-no-layer-build.sh $DIST_OUTPUT_BUCKET-$REGION $VERSION $REGION
+          TEMPLATE_OUTPUT_BUCKET=rodeolabz-$REGION
+          ./build-s3-dist.sh --no-layer --template-bucket $TEMPLATE_OUTPUT_BUCKET --code-bucket $DIST_OUTPUT_BUCKET --version $VERSION --region $REGION
 
   deploy-us-east-1:
     needs: update-version-in-docs
@@ -248,8 +251,8 @@ jobs:
           REGION=us-east-1
           VERSION=v${{ github.event.inputs.version }}
           DIST_OUTPUT_BUCKET=rodeolabz
-          ./build-s3-dist-no-layer-build.sh $DIST_OUTPUT_BUCKET-$REGION $VERSION $REGION
-
+          TEMPLATE_OUTPUT_BUCKET=rodeolabz-$REGION
+          ./build-s3-dist.sh --no-layer --template-bucket $TEMPLATE_OUTPUT_BUCKET --code-bucket $DIST_OUTPUT_BUCKET --version $VERSION --region $REGION
 
   create-git-staging-branch:
     needs:

.github/workflows/scheduled-workflow.yml

@@ -33,7 +33,8 @@ jobs:
           REGION=us-west-2
           VERSION=$SHORT_SHA
           DIST_OUTPUT_BUCKET=mie-dev
-          ./build-s3-dist-no-layer-build.sh $DIST_OUTPUT_BUCKET-$REGION $VERSION $REGION
+          TEMPLATE_OUTPUT_BUCKET=mie-dev
+          ./build-s3-dist.sh --no-layer --template-bucket $TEMPLATE_OUTPUT_BUCKET --code-bucket $DIST_OUTPUT_BUCKET --version $VERSION --region $REGION 
           aws cloudformation deploy --stack-name $MIE_STACK_NAME --template-file dist/media-insights-stack.template --s3-bucket $DIST_OUTPUT_BUCKET-$REGION --s3-prefix media_insights_engine/$VERSION --parameter-overrides DeployTestResources=true MaxConcurrentWorkflows=10 DeployAnalyticsPipeline=true EnableXrayTrace=true --capabilities CAPABILITY_IAM CAPABILITY_NAMED_IAM CAPABILITY_AUTO_EXPAND --force-upload
 
   test-us-west-2:

.gitignore

@@ -1,6 +1,8 @@
 deployment/media-analysis-dataplane-api-stack.yaml
 venv/
 **/dist
+global-s3-assets/
+regional-s3-assets/
 package/
 node_modules/
 source/web_site/build/
@@ -32,9 +34,6 @@ deployment/lambda_layer_factory/*.whl
 deployment/lambda_layer_factory/python/**
 deployment/lambda_layer_factory/python 2/**
 
-# documentation build
-doc/sphinx/output/
-
 # explicitly named "private" files
 **/private*webapp/README.md
 private/

README.md

@@ -1,24 +1,23 @@
-![MIE logo](doc/images/MIE_logo.png)
+![MIE logo](docs/assets/images/MIE_logo.png)
 
 Media Insights Engine (MIE) is a development framework for building serverless applications that process video, images, audio, and text  on AWS. This repository contains the MIE back-end framework. Users interact with MIE through REST APIs or by invoking MIE Lambda functions directly. You will not find a graphical user interface (GUI) in this repository, but a reference application for MIE that includes a GUI is in the [Media Insights](https://github.com/awslabs/aws-media-insights) repository. 
 
 For a high level summary of MIE and its use cases, please read, [How to Rapidly Prototype Multimedia Applications on AWS with the Media Insights Engine](https://aws.amazon.com/blogs/media/how-to-rapidly-prototype-multimedia-applications-on-aws-with-the-media-insights-engine/) on the AWS Media blog.
 
 # Installation
 
-
 You can deploy MIE in your AWS account with the following Cloud Formation templates:
 
 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/v2.0.1/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.1/cf/media-insights-stack.template)
+US East (N. Virginia) | [![Launch in us-east-1](docs/assets/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.2/media-insights-stack.template)
+US West (Oregon) | [![Launch in us-west-2](docs/assets/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.2/media-insights-stack.template)
 
 The Cloud Formation options for these one-click deploys are described in the [installation parameters](#installation-parameters) section.
 
 After the stack finished deploying then you should see the following nested stacks (with slightly different names than shown below):
 
-<img src="doc/images/stack_resources.png" width=300>
+<img src="docs/assets/images/stack_resources.png" width=300>
 
 ## Build from scratch:
 
@@ -66,7 +65,7 @@ MIE provides the following three fundamental constructs for building multimedia
 
  The following diagram shows how operators, workflows, and data persistence fit in the MIE architecture:
 
-![](doc/images/MIE-execute-workflow-architecture.png)
+![](docs/assets/images/MIE-execute-workflow-architecture.png)
 
 ### Architecture components:
 
@@ -117,7 +116,7 @@ For instructions on how to extend MIE, read the API reference and builder's guid
 
 MIE uses AWS_IAM to authorize REST API requests. The following screenshot shows how to test authentication to the MIE API using Postman. Be sure to specify the AccessKey and SecretKey for your own AWS environment.
 
-<img src="doc/images/sample_postman.png" width=600>
+<img src="docs/assets/images/sample_postman.png" width=600>
 
 For more information, see the [Implementation Guide](https://github.com/awslabs/aws-media-insights/blob/master/IMPLEMENTATION_GUIDE.md).
 
@@ -131,7 +130,7 @@ See the [CONTRIBUTING](CONTRIBUTING.md) file for how to contribute.
 
 # Logo
 
-The [MIE logo](doc/images/MIE_logo.png) features a clapperboard representing *multimedia*, centered inside a crosshair representing *under scrutiny*. 
+The [MIE logo](docs/assets/images/MIE_logo.png) features a clapperboard representing *multimedia*, centered inside a crosshair representing *under scrutiny*. 
 
 # License