Version v2.2.0

CHANGELOG.md

@@ -4,6 +4,22 @@ 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).
 
+## [2.2.0] - 2020-08-27
+### Added
+- (installed from source) Instructions for using ECS/Fargate rather than Lambda for Automation. See GitHub https://github.com/awslabs/aws-ops-automator/tree/master/source/ecs/README.md
+- S3 access logging to aws-opsautomator-s3-access-logs-\<account\>-\<region\>
+
+### Changed
+- README.md now contains instructions on upgrading Ops Automator 2.x to the latest release.
+- ECS/Fargate option updated to use Python3
+- ECS/Fargate option now uses OpsAutomatorLambdaRole (previously had no role assigned)
+- Updated all Lambda runtimes to Python 3.8
+- Encryption is now enabled by default in Mappings->Settings->Resources->EncryptResourceData. All SNS topics, SQS queue, and DynamoDB tables are encrypted by this setting.
+- S3 buckets are now encrypted using SSE AES256
+
+### Known Issues
+- ECS can be used for the Resource Selection process, but may fail when used for the Execution of actions. Customers should test use of ECS for Execution and use Lambda if unsuccessful.
+
 ## [2.1.0] - 2019-10-06
 ### Added
 - upgraded the solution to Python 3.7

NOTICE.txt

@@ -1,15 +1,15 @@
 AWS Ops Automator
-Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
-Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except
-in compliance with the License. A copy of the License is located at http://www.apache.org/licenses/
-or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, express or implied. See the License for the
-specific language governing permissions and limitations under the License.
+Copyright 2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except 
+in compliance with the License. A copy of the License is located at http://www.apache.org/licenses/ 
+or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, 
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, express or implied. See the License for the 
+specific language governing permissions and limitations under the License. 
 
 ********************** 
 THIRD PARTY COMPONENTS 
 ********************** 
 This software includes third party software subject to the following copyrights: 
 
 AWS SDK under the Apache License Version 2.0 
-pytz under the Massachusetts Institute of Technology (MIT) license 
+pytz under the Massachusetts Institute of Technology (MIT) license 

deployment/build-s3-dist.sh

@@ -15,17 +15,78 @@
 #  - trademarked-solution-name: name of the solution for consistency 
 # 
 #  - version-code: version of the solution 
+function do_cmd { 
+    echo "------ EXEC $*" 
+    $* 
+} 
+function do_replace { 
+    replace="s/$2/$3/g" 
+    file=$1 
+    do_cmd sed -i -e $replace $file 
+} 
 
-if [ -z "$1" ] || [ -z "$2" ] || [ -z "$3" ]; then 
+if [ -z "$1" ] | [ -z "$2" ]; then 
+	echo "Usage: $0 [bucket] [solution-name] {version}"
     echo "Please provide the base source bucket name, trademark approved solution name and version where the lambda code will eventually reside." 
     echo "For example: ./build-s3-dist.sh solutions trademarked-solution-name v1.0.0" 
     exit 1 
 fi 
 
-echo "make bucket=$1 solution=$2 version=$3" 
-cd ../source/code 
-ls
-echo $PWD
-make bucket=$1 solution=$2 version=$3 
-cd ../../deployment 
+bucket=$1
+echo "export DIST_OUTPUT_BUCKET=$bucket" > ./setenv.sh
+solution_name=$2
+echo "export DIST_SOLUTION_NAME=$solution_name" >> ./setenv.sh
+
+# Version from the command line is definitive. Otherwise, use version.txt
+if [ ! -z "$3" ]; then
+	version=$3
+elif [ -e ../source/version.txt ]; then
+	version=`cat ../source/version.txt`
+else
+	echo "Version not found. Version must be passed as argument 3 or in version.txt in the format vn.n.n"
+fi
+
+if [[ ! "$version" =~ ^v.*? ]]; then
+	version=v$version
+fi
+echo "export DIST_VERSION=$version" >> ./setenv.sh
+
+echo "=========================================================================="
+echo "Building $solution_name version $version for bucket $bucket"
+echo "=========================================================================="
+
+# Get reference for all important folders  
+template_dir="$PWD" # /deployment
+template_dist_dir="$template_dir/global-s3-assets"  
+build_dist_dir="$template_dir/regional-s3-assets"  
+source_dir="$template_dir/../source"
+dist_dir="$template_dir/dist"
+
+echo "------------------------------------------------------------------------------"   
+echo "[Init] Clean old dist folders"   
+echo "------------------------------------------------------------------------------"   
+do_cmd rm -rf $template_dist_dir   
+do_cmd mkdir -p $template_dist_dir   
+do_cmd rm -rf $build_dist_dir   
+do_cmd mkdir -p $build_dist_dir   
+do_cmd rm -rf $dist_dir
+do_cmd mkdir -p $dist_dir
+
+# Copy the source tree to deployment/dist
+do_cmd cp -r $source_dir/* $dist_dir 
+
+do_cmd pip install --upgrade pip
+# awscli will also install the compatible version of boto3 and botocore
+do_cmd pip install --upgrade awscli
+do_cmd pip install -r $source_dir/code/requirements.txt -t $dist_dir/code
+
+echo "------------------------------------------------------------------------------"   
+echo "[Make] Set up and call make from deployment/dist/code"   
+echo "------------------------------------------------------------------------------"
+cp $source_dir/version.txt $dist_dir/code 
+cd $dist_dir/code
+do_cmd make bucket=$bucket solution=$solution_name version=$version
+cd $template_dir
+# rm -rf dist
+chmod +x setenv.sh
 echo "Completed building distribution"