Merge pull request #37 from aws-solutions/release/v3.1.4

Update to v3.1.4
aws-solutions-library-samples · Sep 5, 2023 · 0d74318 · 0d74318
2 parents 8753b92 + a2fd18e
commit 0d74318
Show file tree

Hide file tree

Showing 116 changed files with 979 additions and 8,877 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,23 +4,38 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [3.1.4] - 2023-09-05
+
+### Changed
+
+- Updated backend to Nodejs 16
+
+### Fixed
+
+- #20 [Incorrect reading of a parameter in the "deploy-s3-dist.sh" script](https://github.com/aws-solutions/media2cloud-on-aws/issues/20)
+- #23 [Tutorial : Create M2C Stack](https://github.com/aws-solutions/media2cloud-on-aws/issues/23)
+- #31 [Corrected some minor writing errors.](https://github.com/aws-solutions/media2cloud-on-aws/pull/31)
+- #34 [Fixed PDF to PNG Conversion.](https://github.com/aws-solutions/media2cloud-on-aws/issues/34)
+
 ## [3.1.3] - 2023-08-01
 - Fixed an issue where media analysis result is not visible in the web application
 
 ## [3.1.2] - 2023-04-20
 - Updated object ownership configuration on the S3 buckets. 
-- Security patching
+- Deploying previous versions of the solution will fail due to Amazon S3 security changes. More info on this [blog](https://aws.amazon.com/blogs/aws/heads-up-amazon-s3-security-changes-are-coming-in-april-of-2023/)
 
 ## [3.1.1] - 2023-04-3
 ### Added
 - Added package-lock.json files to all lambda packages. 
+
 ## [3.1.0] - 2023-02-28
 ### Added
 - AppRegistry integration
 - SonarQube properties file
 
 ### Changed
 - Code fixes for SonarQube
+- CloudFormation Stack Update is not supported when upgrading from v3.0.0 to v3.1.0. A new stack must be deployed.
 
 ### Contributors
 * @sandimciin

diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
@@ -1,4 +1,4 @@
 ## Code of Conduct
 This project has adopted the [Amazon Open Source Code of Conduct](https://aws.github.io/code-of-conduct).
-For more information see the [Code of Conduct FAQ](https://aws.github.io/code-of-conduct-faq) or contact
+For more information, see the [Code of Conduct FAQ](https://aws.github.io/code-of-conduct-faq) or contact
 [email protected] with any additional questions or comments.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -23,7 +23,7 @@ reported the issue. Please try to include as much information as you can. Detail
 ## Contributing via Pull Requests
 Contributions via pull requests are much appreciated. Before sending us a pull request, please ensure that:
 
-1. You are working against the latest source on the *master* branch.
+1. You are working against the latest source on the *main* branch.
 2. You check existing open, and recently merged, pull requests to make sure someone else hasn't addressed the problem already.
 3. You open an issue to discuss any significant work - we would hate for your time to be wasted.
 
@@ -36,26 +36,26 @@ To send us a pull request, please:
 5. Send us a pull request, answering any default questions in the pull request interface.
 6. Pay attention to any automated CI failures reported in the pull request, and stay involved in the conversation.
 
-GitHub provides additional document on [forking a repository](https://help.github.com/articles/fork-a-repo/) and
+GitHub provides an additional document on [forking a repository](https://help.github.com/articles/fork-a-repo/) and
 [creating a pull request](https://help.github.com/articles/creating-a-pull-request/).
 
 
 ## Finding contributions to work on
-Looking at the existing issues is a great way to find something to contribute on. As our projects, by default, use the default GitHub issue labels ((enhancement/bug/duplicate/help wanted/invalid/question/wontfix), looking at any ['help wanted'](https://github.com/aws-solutions/media2cloud/labels/help%20wanted) issues is a great place to start.
+Looking at the existing issues is a great way to find something to contribute on. As our projects, by default, use the default GitHub issue labels (enhancement/bug/duplicate/help wanted/invalid/question/wontfix), looking at any ['help wanted'](https://github.com/aws-solutions/media2cloud/labels/help%20wanted) issues is a great place to start.
 
 
 ## Code of Conduct
 This project has adopted the [Amazon Open Source Code of Conduct](https://aws.github.io/code-of-conduct).
-For more information see the [Code of Conduct FAQ](https://aws.github.io/code-of-conduct-faq) or contact
+For more information, see the [Code of Conduct FAQ](https://aws.github.io/code-of-conduct-faq), or contact
 [email protected] with any additional questions or comments.
 
 
 ## Security issue notifications
-If you discover a potential security issue in this project we ask that you notify AWS/Amazon Security via our [vulnerability reporting page](http://aws.amazon.com/security/vulnerability-reporting/). Please do **not** create a public github issue.
+If you discover a potential security issue in this project we ask that you notify AWS/Amazon Security via our [vulnerability reporting page](http://aws.amazon.com/security/vulnerability-reporting/). Please do **not** create a public GitHub issue.
 
 
 ## Licensing
 
-See the [LICENSE](https://github.com/aws-solutions/media2cloud/blob/master/LICENSE) file for our project's licensing. We will ask you to confirm the licensing of your contribution.
+See the [LICENSE](https://github.com/aws-solutions/media2cloud/blob/main/LICENSE) file for our project's licensing. We will ask you to confirm the licensing of your contribution.
 
 We may ask you to sign a [Contributor License Agreement (CLA)](http://en.wikipedia.org/wiki/Contributor_License_Agreement) for larger changes.
diff --git a/NOTICE.txt b/NOTICE.txt
@@ -19,7 +19,8 @@ THIRD PARTY COMPONENTS
 **********************
 This software includes third party software subject to the following copyrights:
 
-AWS SDK under the Apache License Version 2.0
+aws-sdk under the Apache License Version 2.0
+aws-xray-sdk under the Apache License Version 2.0
 Amazon Cognito Identity SDK for JavaScript under the Apache License Version 2.0
 AWS IoT SDK for JavaScript under the Apache License Version 2.0
 Elasticsearch Node.js client under the Apache License Version 2.0
@@ -48,3 +49,21 @@ tar-stream under the Massachusetts Institute of Technology (MIT) license
 Jimp under the Massachusetts Institute of Technology (MIT) license
 PDF.JS under the Apache License Version 2.0
 @npcz/magic under the BSD-3-Clause License
+node-webvtt under the Massachusetts Institute of Technology (MIT) license
+@rollup/stream under the Massachusetts Institute of Technology (MIT) license
+glob under the Internet Systems Consortium (ISC) license
+rollup under the Massachusetts Institute of Technology (MIT) license
+terser under the BSD-2-Clause License
+@elastic/elasticsearch under the Apache License Version 2.0
+aws4 under the Massachusetts Institute of Technology (MIT) license
+mime under the Massachusetts Institute of Technology (MIT) license
+rusha under the Massachusetts Institute of Technology (MIT) license
+spark-md5 under the Massachusetts Institute of Technology (MIT) license
+jimp under the Massachusetts Institute of Technology (MIT) license
+pdfjs-dist under the Apache License Version 2.0
+canvas under the Massachusetts Institute of Technology (MIT) license
+amazon-cognito-identity-js under the Apache License Version 2.0
+aws-iot-device-sdk under the Apache License Version 2.0
+cropperjs under the Massachusetts Institute of Technology (MIT) license
+crypto-js under the Massachusetts Institute of Technology (MIT) license
+
diff --git a/README.md b/README.md
@@ -61,7 +61,7 @@ __
 ## Building and customizing the solution
 
 * **Prerequisites:** building the solution requires the following tools to be installed on your system.
-  * [NodeJS 14.x](https://nodejs.org/en/download/)
+  * [NodeJS 16.x](https://nodejs.org/en/download/)
   * [AWS Command Line Interface (CLI)](https://aws.amazon.com/cli/)
   * [jq](https://stedolan.github.io/jq/)
 * Create a bucket in the AWS region you would like to deploy the solution. For example, ```media2cloud-template-us-east-1``` in us-east-1 region.
@@ -142,6 +142,6 @@ __
 
 ## Collection of operational metrics
 
-This solution collects anonymous operational metrics to help AWS improve the
+This solution collects anonymized operational metrics to help AWS improve the
 quality of features of the solution. For more information, including how to disable
 this capability, please see the [implementation guide](https://docs.aws.amazon.com/solutions/latest/media2cloud/collection-of-operational-metrics.html).
diff --git a/deployment/build-s3-dist.sh b/deployment/build-s3-dist.sh
@@ -158,10 +158,10 @@ PKG_CUSTOM_RESOURCES=
 PKG_API=
 PKG_WEBAPP=
 
-## anonymous data setting
-ANONYMOUS_DATA="Yes"
+## anonymized data setting
+ANONYMIZED_DATA="Yes"
 [ "$BUILD_ENV" == "dev" ] && \
-  ANONYMOUS_DATA="No"
+  ANONYMIZED_DATA="No"
 
 
 ## trap exit signal and make sure to remove the TMP_DIR
@@ -1009,8 +1009,8 @@ function build_cloudformation_templates() {
   sed -i'.bak' -e "s|%%PKG_MAIN_S3EVENT%%|${PKG_MAIN_S3EVENT}|g" *.yaml || exit 1
 
   ## Misc.
-  echo "Updating %%ANONYMOUS_DATA%% param in cloudformation templates..."
-  sed -i'.bak' -e "s|%%ANONYMOUS_DATA%%|${ANONYMOUS_DATA}|g" *.yaml || exit 1
+  echo "Updating %%ANONYMIZED_DATA%% param in cloudformation templates..."
+  sed -i'.bak' -e "s|%%ANONYMIZED_DATA%%|${ANONYMIZED_DATA}|g" *.yaml || exit 1
 
   echo "Updating %%SINGLE_REGION%% param in cloudformation templates..."
   sed -i'.bak' -e "s|%%SINGLE_REGION%%|${SINGLE_REGION}|g" *.yaml || exit 1

diff --git a/deployment/deploy-s3-dist.sh b/deployment/deploy-s3-dist.sh
@@ -76,8 +76,7 @@ while [[ $# -gt 0 ]]; do
       ;;
       -r|--single-region)
       SINGLE_REGION=true
-      shift # past argument
-      shift # past value
+      shift # key
       ;;
       -a|--acl)
       ACL_SETTING="$2"
@@ -103,7 +102,7 @@ done
   usage && \
   exit 1
 
-ACCOUNTID=$(aws sts get-caller-identity | jq .Account | tr -d \")
+ACCOUNTID=$(aws sts get-caller-identity --output json | jq .Account | tr -d \")
 [ -z "$ACCOUNTID" ] && \
   echo "error: fail to get AWS Account ID" && \
   exit 1
@@ -126,7 +125,7 @@ function copy_to_bucket() {
   local bucket=$2
   local dest=s3://${bucket}/${SOLUTION}/${VERSION}/
   # get bucket region and ensure bucket is owned by the same AWS account. LocationConstraint returns null if bucket is in us-east-1 region
-  local location=$(aws s3api get-bucket-location --bucket ${bucket} --expected-bucket-owner ${ACCOUNTID} | jq .LocationConstraint | tr -d \")
+  local location=$(aws s3api get-bucket-location --bucket ${bucket} --expected-bucket-owner ${ACCOUNTID} --output json | jq .LocationConstraint | tr -d \")
   [ -z "$location" ] && \
     echo "Bucket '${bucket}' either doesn't exist or doesn't belong to accountId '${ACCOUNTID}'. exiting..." && \
     exit 1

diff --git a/deployment/github-codepipeline.yaml b/deployment/github-codepipeline.yaml
@@ -127,6 +127,8 @@ Resources:
                     -
                       ServerSideEncryptionByDefault:
                           SSEAlgorithm: aws:kms
+            VersioningConfiguration:
+                Status: Enabled
 
     BucketArtifactPolicy:
         Type: AWS::S3::BucketPolicy
@@ -137,8 +139,10 @@ Resources:
                     -
                         Effect: Deny
                         Principal: "*"
-                        Action: "*"
-                        Resource: !Sub "arn:aws:s3:::${BucketArtifact}/*"
+                        Action: "s3:*"
+                        Resource: 
+                            - !Sub "arn:aws:s3:::${BucketArtifact}/*"
+                            - !Sub "arn:aws:s3:::${BucketArtifact}"
                         Condition:
                             Bool:
                                 "aws:SecureTransport": false
@@ -176,6 +180,8 @@ Resources:
                     -
                       ServerSideEncryptionByDefault:
                           SSEAlgorithm: aws:kms
+            VersioningConfiguration:
+                Status: Enabled
 
     BucketOutputPolicy:
         Type: AWS::S3::BucketPolicy
@@ -186,8 +192,10 @@ Resources:
                     -
                         Effect: Deny
                         Principal: "*"
-                        Action: "*"
-                        Resource: !Sub "arn:aws:s3:::${BucketOutput}/*"
+                        Action: "s3:*"
+                        Resource: 
+                            - !Sub "arn:aws:s3:::${BucketOutput}/*"
+                            - !Sub "arn:aws:s3:::${BucketOutput}"
                         Condition:
                             Bool:
                                 "aws:SecureTransport": false
@@ -403,7 +411,7 @@ Resources:
                     phases:
                         install:
                             runtime-versions:
-                                nodejs: 10
+                                nodejs: 16
                             commands:
                                 - echo "== Node Version = `node --version` =="
                         pre_build:
@@ -549,7 +557,7 @@ Resources:
                     phases:
                         install:
                             runtime-versions:
-                                nodejs: 10
+                                nodejs: 16
                             commands:
                                 - echo "== Node Version = `node --version` =="
                         pre_build: