Skip to content

Commit a603963

Browse files
hickeydh-awsrgd11Gillis Van GinderachterEvan ChuBrian969
authored
Merge-150-Codebase (#827)
* Add codecommit support to installer * fix(core): Add additional retry exception type for AWS Organizations * Replace webpack build commands with esbuild * Improve tsconfig.json files * Replace webpack build commands with esbuild * Improve tsconfig.json files * Update esbuild to 0.9.2 and specify build script to use local esbuild via pnpx * Fix sample configs and scp (#659) * add SSM to config files, fix scp * tweak configs * Updating package to 1.3.0 * Doc updates v1.3.0, SCP FIX (#661) * (docs)spelling, minor updates 1.3.0 * fixSCP * Feat/config rem mission profile perm (#662) * Initial Push for Custom Config Rule * pushing packages * Fixing tests * Creating CustomConfigRule from source in ref-artifacts * Dowloading Config-Rules and using them assets * Removing unused dependency * Removing dependency * Fixing construct names for iam role * Adding config rule lambda function for instance profile permission validation * Adding additional replacements * Fixing IAM Role creation for s3-copy-files * Reverting back S3-Copy-Files to older * Updating configuration files with respect to custom config-rules * Reverting using aws.Partition due to CDK allowing only qualifier, accountid and region overrides * removed unused import * Fixing rule param replacements * Fixing Empty value in request param * Updating config rule lambda function * Fixing remediation params replace * Supporting StringList Param for both config rule and remediation * Adding sample configuration * Fixing if policy doesn't exist in account * fix SCP Co-authored-by: Brian969 <56414362+Brian969@users.noreply.github.com> * minor doc tweaks (#664) * Revert "Updating package to 1.3.0" This reverts commit 19e18f2. * Updating package to 1.3.0 * fix(ci): Fix GitLab CI checks * Remove UI build folder * Removing .js file * Revert "Updating package to 1.3.0" This reverts commit 19e18f2. * Updating package to 1.3.0 * fix(core): Fixing SSM-Document-Share (#666) * Fixing SSM Document share and other issues - Fixing number of accountIds passing to ssm modify-document-permission - Fixing number of accounts passing to GuardDuty createMembers, updateMembers and deleteMembers - Adding security-hub-excl-regions and not enabling security hub in those regions * Enable SecurityHub based on sucurity-hub flag * Fixing pageSize for guardDuty and SSM Document share * feat(core): Additional enhancements (#669) * feat(core): Additional enhancements - enable access logging on Rsyslog NLB - Enable DeletionProtection on ELB - Deny non https calls to S3 buckets * Updating installerBucket Policy to allow only secure requests * Fix adding subscription filter to loggroups - Using .map instead of regular for loop * Fix adding subscription filter for existing user by changing construct name - add additional back-off, retry conditions * Pushing pnpm lock file to lock package versions (#672) * fix(core): Fixing installer failures (#673) * Pushing pnpm lock file to lock package versions * Removing ignore pnpm-lock.yaml * Update multi-file-config-capabilities.md (#675) * Clarify number of lines of diff CodeCommit can support. * Add missing secureTransport for logArchive bucket (#678) * (docs)Update installation.md (#667) * Update installation.md * Update sample configs with ap-northeast-3 * fix error in developer guide * Improve SCP * block sharing snapshots and ec2 images * tweak-scp-lockdown-snapsharing * Update installation.md * Updating package to 1.3.1 * edited to support cleanup without directory services enabled (#680) Co-authored-by: Charlie Llewellyn <cjl@amazon.co.uk> * Replace webpack build commands with esbuild Improve tsconfig.json files * fix(ci): Fix GitLab CI checks * Fix sample configs and scp (#659) * add SSM to config files, fix scp * tweak configs * Adding VPC Tenancy * Split configuration packages while maintaining backwards compatibility * Fix sample configs and scp (#659) * add SSM to config files, fix scp * tweak configs * Fix sample configs and scp (#659) * add SSM to config files, fix scp * tweak configs * Fix spelling for endpoint-port-overrides * sync w/github * feat(core): StepFunctions codebuild task * feat(core): VPC Cidr generation dynamic and look up * fix(core): Move RDGW Image path to configuration from Code * feat(core): Creating CGW and tgw attach for external Firewall * Fix sample configs and scp (#659) * add SSM to config files, fix scp * tweak configs * feat(core): Review changes for VPC-Enhancement feature * Remove unused dependencies Centralize eslint configuration in root package * fix(core): Cdk zip assets uploading * fix(core): Revert changes for uploading zip asses of custom-config-rule * fix(core): Support lastet config for update script * Improve UI rendering Added import and export functionality * fix: Skip GUI build in Installer CodeBuild project * feat(ui): Initial UI translations * Fix sample configs and scp (#659) * add SSM to config files, fix scp * tweak configs * fix(core): Adding Org condition in Centralized CloudWatch Roles * fix(core): add static routing to Customer Gateway and vpnConnection * fix(core): Fix Static Routing and VPC Lookup cidr-src * merge(core): Merge Github back * upgrade(core): Update AWS SDK to "2.920.0" * Implement first steps of the wizard * fix(core): Cleanup task * update config files * fix(core): Fix defaults for cleanup task * Added AWS NFW feature * fix(core): Fixing Adding Management account as member to GuardDuty Org Admin account * merge(core): Merging Github for Static cgw routing * fix(core): Validating email on existing account in configuration * feature(wizard): Wizard improvements * fix(core): Cross account TGW route * feat(core): Add support for Checkpoint firewall under GWLB * fix(core): Add tags to GWLB, Dynamic Secrets creation and change bootstrap in userdata * fix(core): Checkpoint manger bootstrap formatting * Fix Ace webpack bundling * fix(core): Fix firewall issues * (docs)Improve-gui-descriptions * added exclude characters to meet iam reqs * Squashed commit of the following: commit 496741d88c2668f61b9d9ebff0d6464899efda28 Merge: 7e6c1e2f 30c83b8c Author: Dustin Hickey <hickeydh@amazon.amazon.com> Date: Fri Jul 23 14:08:26 2021 -0500 Merge branch '60-fix-vulnerable-dependencies' of ssh.gitlab.aws.dev:tsd/accelerator into 60-fix-vulnerable-dependencies commit 7e6c1e2f596377a206644ab4fcf78753316ad44a Author: Dustin Hickey <hickeydh@amazon.amazon.com> Date: Fri Jul 23 14:04:24 2021 -0500 Modified test to match update of ssm commit ae33e6cb8072548cdff5fa337f1c924b3228a545 Author: Dustin Hickey <hickeydh@amazon.amazon.com> Date: Wed Jul 21 12:45:27 2021 -0500 Testing commit 8c0cbec71ea1e971d50585415d3c06c328776888 Author: Dustin Hickey <hickeydh@amazon.amazon.com> Date: Tue Jul 13 17:14:20 2021 -0500 fixed lock file commit 25b5b8f61b7c20d035d2d4c2a7b7b177df6db84b Author: Dustin Hickey <hickeydh@amazon.amazon.com> Date: Tue Jul 13 16:08:20 2021 -0500 removed overrides commit 0a72d6031edbe7120e5037228fcfd7afee1d0316 Author: Dustin Hickey <hickeydh@amazon.amazon.com> Date: Tue Jul 13 15:23:29 2021 -0500 Changed another version number commit c35d0594f0c505391702b3c5918861634f4eec22 Author: Dustin Hickey <hickeydh@amazon.amazon.com> Date: Tue Jul 13 15:05:07 2021 -0500 Updated CdkBootstrapVersion commit 88f1639527a56029409c86e93627ba5f28b29c10 Author: Dustin Hickey <hickeydh@amazon.amazon.com> Date: Tue Jul 13 14:05:47 2021 -0500 Updated dependencies commit 30c83b8c575b2ae175d24bfda87526965aee4ce7 Author: Dustin Hickey <hickeydh@amazon.amazon.com> Date: Fri Jul 23 14:04:24 2021 -0500 Modified test to match update of ssm commit a8dfdd9ced4384574d9a55724891a875184143a8 Author: Dustin Hickey <hickeydh@amazon.amazon.com> Date: Wed Jul 21 12:45:27 2021 -0500 Testing commit 680cc4368532d5fad9fee19f79165e4d96df995e Author: Dustin Hickey <hickeydh@amazon.amazon.com> Date: Tue Jul 13 17:14:20 2021 -0500 fixed lock file commit df312f0a702ea0d49603b883f2d402e62b4c81cf Author: Dustin Hickey <hickeydh@amazon.amazon.com> Date: Tue Jul 13 16:08:20 2021 -0500 removed overrides commit d3ce8593875f6660a88b4e3c4f8db1073f08c8e9 Author: Dustin Hickey <hickeydh@amazon.amazon.com> Date: Tue Jul 13 15:23:29 2021 -0500 Changed another version number commit e983561fd245d8c3e6cf6f6ed03f0a322cabc331 Author: Dustin Hickey <hickeydh@amazon.amazon.com> Date: Tue Jul 13 15:05:07 2021 -0500 Updated CdkBootstrapVersion commit 1efeb3b9ca66bf2502ec96ef62d0464f2e2aacf7 Author: Dustin Hickey <hickeydh@amazon.amazon.com> Date: Tue Jul 13 14:05:47 2021 -0500 Updated dependencies * Added point-in-time recovery for DynamoDB * Added Autoscaling for DynamoDB tables * Added DLQs for all AWS Lambda functions * Revert "Added DLQs for all AWS Lambda functions" This reverts commit c39e6bf. * Adding issue templates for SEA bug/feature-request * Latest config file tweaks,, macie error handling, ami updates * v136-fixes * Update config.lite-GWLB-example.json - correct typo in sample * Squashed commit of the following: commit 23bd4cea5100d2f495d303e5c567e39e0f1e32f7 Author: Dustin Hickey <hickeydh@amazon.amazon.com> Date: Fri Aug 6 07:59:46 2021 -0400 Fixed eslint error commit 5a951cce18b8eb912d819dd2a21495e01405e716 Author: Dustin Hickey <hickeydh@amazon.amazon.com> Date: Thu Aug 5 18:51:07 2021 -0400 Added routes to phase 2 commit 109b5024cc168fad83d2bd45c157f9895687c4b2 Author: Dustin Hickey <hickeydh@amazon.amazon.com> Date: Thu Aug 5 17:10:31 2021 -0400 Added naming commit 6c6a175c289480e7f62a8ead478e1cf861c07ba7 Author: Dustin Hickey <hickeydh@amazon.amazon.com> Date: Thu Aug 5 15:07:46 2021 -0400 updated lock file commit 59bfd8a3df4f04cb67ba8592213c9d2f544ea834 Author: Dustin Hickey <hickeydh@amazon.amazon.com> Date: Thu Aug 5 15:01:52 2021 -0400 nfwOutput commit 551f5872d312b6d772751bc31b359e910d9d98a1 Merge: a547fb4 04c733f Author: Dustin Hickey <hickeydh@amazon.amazon.com> Date: Thu Aug 5 15:01:09 2021 -0400 Merge branch 'main' into hickeydh/feature/nfw commit a547fb4bf609adb1df1792974e3b29b881624dc4 Author: Dustin Hickey <hickeydh@amazon.amazon.com> Date: Thu Aug 5 14:43:19 2021 -0400 Added NFW outputs commit c4ed2a3cefea1b8e7121043fcebe53a64defaa5a Author: Dustin Hickey <hickeydh@amazon.amazon.com> Date: Tue Jul 27 15:31:47 2021 -0500 removed duplicate entry for en.ts for awsnfw commit 83fc4f26a7b4d5e22fab531ba64f6944658adf83 Merge: 65d8df3 a9ea1f2 Author: Dustin Hickey <hickeydh@amazon.amazon.com> Date: Fri Jul 23 15:32:39 2021 -0500 Merge branch 'main' into hickeydh/feature/nfw commit 65d8df3c7c08b29427822002891d8483467052aa Author: Dustin Hickey <hickeydh@amazon.amazon.com> Date: Thu Jul 8 11:23:25 2021 -0500 fixed eslint problems commit eec0cc85f79108c1e67acdd2976b75a76489aa5c Author: Dustin Hickey <hickeydh@amazon.amazon.com> Date: Thu Jul 8 10:55:10 2021 -0500 Added features commit 211b7f10f9f6c8fef55689ebaed53d3abf59d2f9 Author: Dustin Hickey <hickeydh@amazon.amazon.com> Date: Fri Jul 2 16:40:38 2021 -0500 fixed eslint error commit 2fe82ae048f9cd61909287dda3ad3fb0e6f3f374 Author: Dustin Hickey <hickeydh@amazon.amazon.com> Date: Fri Jul 2 16:23:27 2021 -0500 Fixed ui config problem commit 07a5d3db6ef3f54fc4ba69f3d21c13e654cb0ea2 Merge: eace811 f44363a Author: Dustin Hickey <hickeydh@amazon.amazon.com> Date: Fri Jul 2 16:08:30 2021 -0500 Merge branch 'main' into hickeydh/feature/nfw commit eace811395561d234c166e84840ee16db68c1dae Author: Dustin Hickey <hickeydh@amazon.amazon.com> Date: Fri Jul 2 15:12:29 2021 -0500 IP Forwarding fix commit 41764cb89bfb6acde763bc2201568eddddc7b1e7 Merge: 74e366a e525f8a Author: Dustin Hickey <hickeydh@amazon.amazon.com> Date: Thu Jul 1 12:58:06 2021 -0500 Merge branch 'main' into hickeydh/feature/nfw commit 74e366a22905eb3c5b232e039866ce7c58d7821c Author: Dustin Hickey <hickeydh@amazon.amazon.com> Date: Thu Jul 1 12:47:27 2021 -0500 Fixed NFW and some ALBforwading bugs commit 91769c71b6efbe4e18a754f925101e40e8fd1d5f Author: Dustin Hickey <hickeydh@amazon.amazon.com> Date: Thu Jul 1 04:56:26 2021 -0500 Fixed more duplicates commit 1195e6c588efe083b6178c3b830541b4cdc3feb4 Author: Dustin Hickey <hickeydh@amazon.amazon.com> Date: Thu Jul 1 04:32:06 2021 -0500 Fixed errors commit fc4bf83583029778c5e5b3f1c06575d2c6b9ec60 Author: Dustin Hickey <hickeydh@amazon.amazon.com> Date: Thu Jul 1 00:09:06 2021 -0500 Fixed more resource problems commit 094ce6bd5c672cf04a1c1989b4087ee137872771 Author: Dustin Hickey <hickeydh@amazon.amazon.com> Date: Wed Jun 30 23:40:19 2021 -0500 Fixed duplcite resource name commit 4e4cf0c8900c1c28c9a9be087af20de3e8ae1326 Author: Dustin Hickey <hickeydh@amazon.amazon.com> Date: Wed Jun 30 23:15:21 2021 -0500 testing nfw commit 7d46604ca73f082390c8385f542727c6497c6d48 Author: Dustin Hickey <hickeydh@amazon.amazon.com> Date: Wed Jun 23 09:43:18 2021 -0500 getting vpc stack cfn commit 3165fa06f7d1b584d94dd8c1b511f3e6b3db644d Author: Dustin Hickey <hickeydh@amazon.amazon.com> Date: Tue Jun 22 16:23:25 2021 -0500 fixing lower case commit 45c46ece3e02d4ca97012ced348ff5b4b3c470e7 Author: Dustin Hickey <hickeydh@amazon.amazon.com> Date: Tue Jun 22 15:50:48 2021 -0500 logging route target commit 9aa426c1764e0168b9cb19077731d9aab3044747 Author: Dustin Hickey <hickeydh@amazon.amazon.com> Date: Tue Jun 22 15:04:01 2021 -0500 testing changes again commit 5abc0e7ff72affa2255192b9ddf40ae750bacf7c Author: Dustin Hickey <hickeydh@amazon.amazon.com> Date: Tue Jun 22 11:30:14 2021 -0500 reverted vpc change commit 94ee9c67a0f07825ef1e54f5d9eee84c18cdb1ea Author: Dustin Hickey <hickeydh@amazon.amazon.com> Date: Tue Jun 22 10:34:21 2021 -0500 added subnet az commit e932ad919f57e0ad6a1e6baf53221dade356ec5d Author: Dustin Hickey <hickeydh@amazon.amazon.com> Date: Mon Jun 21 13:40:44 2021 -0500 testing nfw route changes commit 4e1bba680eb3f50ef9ab0fa1b4f3db0f8541bd0a Author: Dustin Hickey <hickeydh@amazon.amazon.com> Date: Mon Jun 21 10:27:41 2021 -0500 Fixed DDB Table Name commit 56e9e2006bd2c5b5505945c758f558aa5175c716 Author: Dustin Hickey <hickeydh@amazon.amazon.com> Date: Wed Jun 16 14:00:37 2021 -0500 checking route params commit 352c0e5f0daf2740873605ab6a5c1ed234553a7f Author: Dustin Hickey <hickeydh@amazon.amazon.com> Date: Wed Jun 16 13:15:31 2021 -0500 testing again commit 528b6950938764f529f16b3a97b1d0aa58fc06d2 Author: Dustin Hickey <hickeydh@amazon.amazon.com> Date: Wed Jun 16 12:34:33 2021 -0500 debugging CFN error commit 6aeb3470e14a79931d1d917aeae1a676658742a8 Author: Dustin Hickey <hickeydh@amazon.amazon.com> Date: Wed Jun 16 10:45:55 2021 -0500 fixed typo commit 92329c706e588629c08084e58974ec9423f780b4 Author: Dustin Hickey <hickeydh@amazon.amazon.com> Date: Wed Jun 16 08:30:36 2021 -0500 changed construct naming commit b5110e9f3ff629e0a9afb413f2c114ae24a82cf5 Merge: 1b7282e bce3eb3 Author: Dustin Hickey <hickeydh@amazon.amazon.com> Date: Tue Jun 15 08:59:27 2021 -0500 Merge branch 'main' into hickeydh/feature/nfw commit 1b7282e22be4c9c8bd5aea899b547b96caa56e33 Author: Dustin Hickey <hickeydh@amazon.amazon.com> Date: Sun Jun 13 11:49:39 2021 -0500 fixed type problem in gui commit 2f322d552ce1f811246bc189cb29982b1cce0493 Author: Dustin Hickey <hickeydh@amazon.amazon.com> Date: Sun Jun 13 09:36:48 2021 -0500 testing fix commit fb493bda4a040c1468e98ccff542e291ea98e534 Author: Dustin Hickey <hickeydh@amazon.amazon.com> Date: Fri Jun 11 16:43:51 2021 -0700 Made changes to fn select commit c931e6679535a1ca515b63ededebf11139d85972 Author: Dustin Hickey <hickeydh@amazon.amazon.com> Date: Fri Jun 11 16:21:53 2021 -0700 testing config changes commit 562d3e9feba490696fb3cafe55d8a78401c720bb Author: Dustin Hickey <hickeydh@amazon.amazon.com> Date: Fri Jun 11 16:12:48 2021 -0700 fixed config file problem commit 03d01a86fd7558752ecf3fc05c18fbf28b5890b7 Author: Dustin Hickey <hickeydh@amazon.amazon.com> Date: Fri Jun 11 16:08:58 2021 -0700 forwarding fix commit d50f4dae4730b0b7f1c65197f895d36430135744 Author: Dustin Hickey <hickeydh@amazon.amazon.com> Date: Fri Jun 11 15:42:21 2021 -0700 fixed typescript problem commit d57b7f55d59261c809a7f74c7010473ed2355371 Author: Dustin Hickey <hickeydh@amazon.amazon.com> Date: Fri Jun 11 14:50:42 2021 -0700 made changes commit d1896472abe388c55d78c49d27a11a2109fca0c0 Author: Dustin Hickey <hickeydh@amazon.amazon.com> Date: Thu Jun 10 07:32:10 2021 -0700 fixed linting errors commit 26ae685f1a78f964c3290701ab4e6beb1ec08f29 Author: Dustin Hickey <hickeydh@amazon.amazon.com> Date: Thu Jun 10 06:18:09 2021 -0700 fixed lock file commit 32c414c818b9fc1259a855f6a6fffec1a1ebac32 Merge: 0a8514a f91081d Author: Dustin Hickey <hickeydh@amazon.amazon.com> Date: Thu Jun 10 06:11:48 2021 -0700 Merge branch 'main' into hickeydh/feature/nfw commit 0a8514a0529701da0d9fd31c8b20c50994bac9ba Author: Dustin Hickey <hickeydh@amazon.amazon.com> Date: Thu Jun 10 05:47:22 2021 -0700 Added NFW feature * revert config file changes - move to dedicated branch * Retry-doc-only-updates * save-changed-files * added retry fix * Update for Control Tower, other doc tweaks * tweak checkpoint config * Removed DDB auto-scaling * retry ddb ondemand scaling * tweak configs and docs - remove ips * Add copyright notice * Fix for gd infinite loop * Add copyright notice to code files * fixed pagination issue * Squashed commit of the following: commit c16739352330379766be456cab78345033c4014f Merge: c701bfd 6504953 Author: Brian969 <56414362+Brian969@users.noreply.github.com> Date: Wed Aug 25 11:36:37 2021 -0400 Merge branch 'main' into update-versions commit c701bfdd03c52bcf263b0d12cee44674c3e63a96 Author: Brian Crissup <crissupb@amazon.com> Date: Wed Aug 25 10:50:50 2021 -0400 Revert iam role policy ssm document back to python3.7 Update ALB Lambda to Node14 commit 5619f6e044a0a09fb26b70e72852bb9b387d35e4 Merge: e0d8e41 eb5e2c8 Author: Brian Crissup <crissupb@amazon.com> Date: Wed Aug 25 07:41:37 2021 -0400 Merge branch 'update-versions' of ssh.gitlab.aws.dev:tsd/accelerator into update-versions commit eb5e2c850102fea8aa27edb734e2fd2683fd77f9 Author: Brian Crissup <crissupb@amazon.com> Date: Mon Aug 23 14:16:13 2021 -0400 Update example config with node 14 commit a5a1cc455154483318f3e0ae375c4871e3d4031b Author: Brian Crissup <crissupb@amazon.com> Date: Mon Aug 23 14:11:04 2021 -0400 Update Node 12 to Node 14 commit e0d8e41faf479962b1f4ea06a16c28ef1f895c5f Author: Brian Crissup <crissupb@amazon.com> Date: Mon Aug 23 14:16:13 2021 -0400 Update example config with node 14 commit 7f5cc12374c0afa20722867acf9c39d8401990ee Author: Brian Crissup <crissupb@amazon.com> Date: Mon Aug 23 14:11:04 2021 -0400 Update Node 12 to Node 14 * SCP Enhancements to support Control Tower * added pagination * Doc tweaks * added verify retries * raise exception if TGW name cannot be found * fixed verify stack * Doc updates colin * Fixed logging * Integrate AWS Solutions build pipeline * Installation Document Tweaks * Added NFW validation and changed ddb table * - Support for private IP Addresses for the foritnet firewalls as per in the GitHub release. * prettier/ToC/minor tweaks * Tweak configs * add ASEA nfw protection * Fixed Alarms and validation error * Allow s3:ListBucket for log archive read only role * Update-configs-based-on-update-script * Improve Docs for v1.5.0 release * Doc updates * fix ultra-lite config file * fix: endpoints with periods * update customizations * protect=acm-certs * update t2s to t3s * Update buildspec to node 14 and update viperlight ignores * fix: paging for security hub * fix: code commit throttle retry * Ignore CT policy changes * Fix scope naming * Doc tweaks colin * fixed deeployment retries and debugging * adjusted policy * Update README.md * update fortinet to v137 * Added trustPolicy functionality * try2-Migrate github changes for Save Outputs to SSM * GUI Enhancements * Config file upgrade script * (scps)tweak-fix config protection * Add support for enrolling existing accounts into CT * (docs)beta Upgrade instructions * remove disclaimer * Update v150-Upgrade.md * Auto generate config file documentation from typescript schema * (docs)more-updates * Automated Docs - Points the main breadcrumb url to the main page * Update the upgrade script * Automated Docs - Fine Tuning Round * (docs)yet-more-updates * feat: allow config aggregator to be specified in different central account + delete aggregator (try2) * Reworks for account table, organizational unit table, cidr pool table, and vpc table. * (docs)yet even more updates * (docs) updates * Automated Docs Fix - Same Properties * (doc)next batch of updates * Automated-Docs-Fix-Additional-Description * Fixed a potential exception where the organizationalUnitsNode might be undefined and cause errors * (docs) updates * (docs)updates * (docs)updates1 * fixed discrepancies and ran prettier * Fixed prettier formatting Co-authored-by: Randy Domingo <domrandy@amazon.com> Co-authored-by: Gillis Van Ginderachter <ggindera@amazon.com> Co-authored-by: Evan Chu <chueva@amazon.com> Co-authored-by: Brian969 <56414362+Brian969@users.noreply.github.com> Co-authored-by: github-actions <github-actions@github.com> Co-authored-by: Naveen Koppula <43773714+naveenkoppula@users.noreply.github.com> Co-authored-by: James Kierstead <archikierstead@users.noreply.github.com> Co-authored-by: charliejllewellyn <charlie.j.llewellyn@gmail.com> Co-authored-by: Charlie Llewellyn <cjl@amazon.co.uk> Co-authored-by: Venkata Naveen Kumar Koppula <nkoppula@amazon.com> Co-authored-by: Dustin Hickey <hickeydh@amazon.com> Co-authored-by: Brian Mycroft <bmycroft@amazon.com> Co-authored-by: Dustin Hickey <hickeydh@amazon.amazon.com> Co-authored-by: Muhammad Khas <mxk@amazon.com> Co-authored-by: Dave Liggat <dliggat@amazon.com> Co-authored-by: Brian Crissup <crissupb@amazon.com> Co-authored-by: Colin Lavallee <lavcolin@amazon.com> Co-authored-by: Antoine Awad <antawad@amazon.com> Co-authored-by: Adam McLean <apmclean@amazon.com> Co-authored-by: Michael Davie <mldavie@amazon.com> Co-authored-by: Ryan Jaeger <rjjaeger@amazon.com> Co-authored-by: Bobby Lupo <luprober@amazon.com> Co-authored-by: Frederic Bonin <fbonin@amazon.com>
1 parent 1fbc832 commit a603963

File tree

1,108 files changed

+95215
-31263
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,108 files changed

+95215
-31263
lines changed

.eslintrc.js

Lines changed: 188 additions & 255 deletions
Large diffs are not rendered by default.

.github/workflows/build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
- name: Use Node.js
1818
uses: actions/setup-node@v1
1919
with:
20-
node-version: 12
20+
node-version: 14
2121
- name: Cache Node.js modules
2222
uses: actions/cache@v1
2323
with:
@@ -28,7 +28,7 @@ jobs:
2828
${{ runner.OS }}-
2929
- name: Install Node.js modules
3030
run: |
31-
npm install -g pnpm@5.18.9
31+
npm install -g pnpm@6.2.3
3232
pnpm install --unsafe-perm --frozen-lockfile
3333
- name: Fix nasty bug in CDK
3434
run: |
@@ -37,7 +37,7 @@ jobs:
3737
find node_modules -name runtime-info.js -exec sed -i 's/mod.paths/(mod.paths || [])/g' {} \;
3838
- name: Build all workspaces
3939
run: |
40-
pnpm recursive run build -- --noEmit
40+
pnpm recursive run build
4141
- name: Run tests in all workspaces
4242
run: |
4343
pnpm recursive run test -- --pass-with-no-tests --silent

.github/workflows/lint-prettier.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
- name: Use Node.js
1818
uses: actions/setup-node@v1
1919
with:
20-
node-version: 12
20+
node-version: 14
2121
- name: Cache Node.js modules
2222
uses: actions/cache@v1
2323
with:
@@ -28,7 +28,7 @@ jobs:
2828
${{ runner.OS }}-
2929
- name: Install Node.js modules
3030
run: |
31-
npm install -g pnpm@5.18.9
31+
npm install -g pnpm@6.2.3
3232
pnpm install --frozen-lockfile
3333
- name: Analyze TypeScript files
3434
run: |
@@ -42,10 +42,10 @@ jobs:
4242
- name: Use Node.js
4343
uses: actions/setup-node@v1
4444
with:
45-
node-version: 12
45+
node-version: 14
4646
- name: Install Prettier
4747
run: |
48-
npm install -g prettier@2.2.0
48+
npm install -g prettier@2.2.1
4949
- name: Analyze TypeScript files
5050
run: |
5151
prettier --check **/*.ts

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ jobs:
2828
env:
2929
RUNNER_TEMP: /tmp/runner
3030
with:
31-
node-version: 12
31+
node-version: 14
3232
- name: Install pnpm
3333
run: |
34-
npm install -g pnpm@5.18.9
34+
npm install -g pnpm@6.2.3
3535
- name: Generate Changelog
3636
id: changelog
3737
env:

.gitignore

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
cdk.out
2-
node_modules
3-
.DS_Store
4-
*.log
5-
config.json
6-
aws-landing-zone-configuration.zip
7-
**/dist
8-
.idea
1+
cdk.out
2+
node_modules
3+
.DS_Store
4+
*.log
5+
config.json
6+
aws-landing-zone-configuration.zip
7+
**/dist
8+
.idea

CHANGELOG.md

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,13 @@
1-
This project is tracking change history using GitHub Releases located [here](https://github.com/aws-samples/aws-secure-environment-accelerator/releases).
1+
# Change Log
2+
3+
All notable changes to this project will be documented in this file.
4+
5+
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
6+
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
7+
8+
## [1.5.0] - 2021-10-01
9+
10+
### Added
11+
12+
- All files, initial AWS Solutions Version
13+
- This project is tracking change history using GitHub Releases located [here](https://github.com/aws-samples/aws-secure-environment-accelerator/releases).

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ reported the issue. Please try to include as much information as you can. Detail
2929

3030
Contributions via pull requests are much appreciated. Before sending us a pull request, please ensure that:
3131

32-
1. You are working against the latest source on the _master_ branch.
32+
1. You are working against the latest source on the _main_ branch.
3333
2. You check existing open, and recently merged, pull requests to make sure someone else hasn't addressed the problem already.
3434
3. You open an issue to discuss any significant work - we would hate for your time to be wasted.
3535
4. You have reviewed and are aligned with the `Accelerator Development First Principles`

README.md

Lines changed: 33 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
The AWS Accelerator is a tool designed to help deploy and operate secure multi-account, multi-region AWS environments on an ongoing basis. The power of the solution is the configuration file that drives the architecture deployed by the tool. This enables extensive flexibility and for the completely automated deployment of a customized architecture within AWS without changing a single line of code.
44

5-
While flexible, the AWS Accelerator is delivered with a sample configuration file which deploys an opinionated and prescriptive architecture designed to help meet the security and operational requirements of many governments around the world (initial focus was the Government of Canada). Tuning the parameters within the configuration file allows for the deployment of customized architectures and enables the solution to help meet the multitude of requirements of a broad range of governments and public sector organizations.
5+
While flexible, the AWS Accelerator is delivered with a sample configuration file which deploys an opinionated and prescriptive architecture designed to help meet the security and operational requirements of many governments around the world. Tuning the parameters within the configuration file allows for the deployment of customized architectures and enables the solution to help meet the multitude of requirements of a broad range of governments and public sector organizations.
66

7-
The installation of the provided prescriptive architecture is reasonably simple, deploying a customized architecture does require extensive understanding of the AWS platform.
7+
The installation of the provided prescriptive architecture is reasonably simple, deploying a customized architecture does require extensive understanding of the AWS platform. The sample deployment specifically helps customers meet NIST 800-53 and/or CCCS Medium Cloud Control Profile (formerly PBMM).
88

99
![Diagram](./docs/operations/img/ASEA-high-level-architecture.png)
1010

@@ -22,13 +22,14 @@ Specifically the accelerator deploys and manages the following functionality, bo
2222
- Shared Network
2323
- Operations
2424
- Perimeter
25-
- Log-Archive
26-
- Security-Audit
25+
- Log Archive
26+
- Security Tooling
2727
- Workload Accounts - automated concurrent mass account creation or use AWS organizations to scale one account at a time. These accounts are used to host a customer's workloads and applications.
2828
- Scalable to 1000's of AWS accounts
2929
- Supports AWS Organizations nested [ou's](https://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_ous.html) and importing existing AWS accounts
3030
- Performs 'account warming' to establish initial limits, when required
3131
- Automatically submits limit increases, when required (complies with initial limits until increased)
32+
- Leverages AWS Control Tower **(NEW)**
3233

3334
### Creates Networking
3435

@@ -39,7 +40,9 @@ Specifically the accelerator deploys and manages the following functionality, bo
3940
- Route 53 Private and Public Zones, Resolver Rules and Endpoints, VPC Endpoint Overloaded Zones
4041
- All completely and individually customizable (per account, VPC, subnet, or OU)
4142
- Layout and customize your VPCs, subnets, CIDRs and connectivity the way you want
43+
- Static or Dynamic **(NEW)** VPC and subnet CIDR assignments
4244
- Deletes default VPC's (worldwide)
45+
- AWS Network Firewall **(NEW)**
4346

4447
### Cross-Account Object Sharing
4548

@@ -78,13 +81,14 @@ Specifically the accelerator deploys and manages the following functionality, bo
7881
### Other Security Capabilities
7982

8083
- Creates, deploys and applies Service Control Policies
81-
- Creates Customer Managed KMS Keys (SSM, EBS, S3)
84+
- Creates Customer Managed KMS Keys (SSM, EBS, S3), EC2 key pairs, and secrets
8285
- Enables account level default EBS encryption and S3 Block Public Access
8386
- Configures Systems Manager Session Manager w/KMS encryption and centralized logging
8487
- Creates and configures AWS budgets (customizable per ou and per account)
8588
- Imports or requests certificates into AWS Certificate Manager
8689
- Deploys both perimeter and account level ALB's w/Lambda health checks, certificates and TLS policies
87-
- Deploys & configures 3rd party firewall clusters and management instances w/vendor best practices and sample security policies, w/automated TGW ECMP BGP tunnel standup (leverages marketplace)
90+
- Deploys & configures 3rd party firewall clusters and management instances (leverages marketplace)
91+
- Gateway Load Balancer w/auto-scaling **(NEW)** and VPN IPSec BGP ECMP deployment options
8892
- Protects Accelerator deployed and managed objects
8993
- Sets Up SNS Alerting topics (High, Medium, Low, Blackhole priorities)
9094
- Deploys CloudWatch Log Metrics and Alarms
@@ -106,44 +110,44 @@ Specifically the accelerator deploys and manages the following functionality, bo
106110
- ALB Logs
107111
- SSM Session Logs (also sent to CWL)
108112
- Resolver Query Logs (also sent to CWL)
113+
- Email alerting for CloudTrail Metric Alarms, Firewall Manager Events **(NEW)**, Security Hub Findings incl. Guardduty Findings **(NEW)**
109114

110115
## Relationship with AWS Landing Zone Solution (ALZ)
111116

112-
The ALZ is an AWS Solution designed to deploy a multi-account AWS architecture for customers based on best practices and lessons learned from some of AWS' largest customers. The AWS Accelerator draws on design patterns from the Landing Zone, and re-uses several concepts and nomenclature, but it is not directly derived from it, nor does it leverage any code from the ALZ. The initial versions of the AWS Accelerator presupposed the existence of an AWS Landing Zone Solution in the AWS Organization; this requirement has since been removed as of release `v1.1.0`.
113-
114-
The Accelerator is now a completely standalone solution.
117+
The ALZ was an AWS Solution designed to deploy a multi-account AWS architecture for customers based on best practices and lessons learned from some of AWS' largest customers. The AWS Accelerator draws on design patterns from the Landing Zone, and re-uses several concepts and nomenclature, but it is not directly derived from it, nor does it leverage any code from the ALZ. The Accelerator is a standalone solution with no dependence on ALZ.
115118

116119
## Relationship with AWS Control Tower
117120

118-
AWS Control Tower is the successor to the ALZ, but offered as an AWS managed service.
121+
The AWS Secure Environment Accelerator now leverages AWS Control Tower! **(NEW)**
119122

120-
When appropriate, it is envisioned that the AWS Accelerator will add the capability to be deployed on top of AWS Control Tower, as we initially allowed with the ALZ.
123+
With the release of v1.5.0, the AWS Accelerator adds the capability to be deployed on top of AWS Control Tower. Customers get the benefits of the fully managed capabilities of AWS Control Tower combined with the power and flexibility of the Accelerators Networking and Security orchestration.
121124

122-
## Accelerator Deployment Process (Summary)
125+
## Accelerator Installation Process (Summary)
123126

124127
This summarizes the installation process, the full installation document can be found in the documentation section below.
125128

126-
- Create a config.json (or config.yaml) file to represent your organizations requirements (several samples provided)
127-
- Create a Secrets Manager Secret which contains a GitHub token that provides access to the Accelerator code repo
128-
- Create a unique S3 input bucket and place your config.json and any additional custom config files in the bucket
129-
- Download and execute the latest installer CloudFormation template in your root accounts preferred 'primary' / 'home' region
129+
- Create a config.json (or config.yaml) file to represent your organizations requirements ([several samples provided](./docs/installation/customization-index.md))
130+
- Create a Secrets Manager Secret which contains a GitHub token that provides access to the Accelerator code repository
131+
- Create a unique S3 input bucket in the management account of the region you wish to deploy the solution and place your config.json and any additional custom config files in the bucket
132+
- Download and execute the latest [release](https://github.com/aws-samples/aws-secure-environment-accelerator/releases) installer CloudFormation template in your management accounts preferred 'primary' / 'home' region
130133
- Wait for:
131134
- CloudFormation to deploy and start the Code Pipeline (~5 mins)
132-
- Code Pipeline to download the Accelerator codebase and install the Accelerator State Machine (~20 mins)
133-
- The Accelerator State Machine to finish execution (~1.5 hrs)
134-
- Perform required manual follow-up activities (configure AWS SSO, set firewall passwords, etc.)
135-
- When required:
135+
- Code Pipeline to download the Accelerator codebase and install the Accelerator State Machine (~10 mins)
136+
- The Accelerator State Machine to finish execution (~1.25 hrs Standalone version, ~2.25 hrs Control Tower Version)
137+
- Perform required one-time [post installation](./docs/installation/installation.md#26-post-installation) activities (configure AWS SSO, set firewall passwords, etc.)
138+
- On an ongoing basis:
136139
- Use AWS Organizations to create new AWS accounts, which will automatically be guardrailed by the Accelerator
137-
- Update the config file in CodeCommit and run the Accelerator State Machine (~25 min) to:
138-
- deploy, configure and guardrail multiple accounts at the same time
139-
- change Accelerator configuration settings
140+
- Update the config file in CodeCommit and run the Accelerator State Machine to:
141+
- deploy, configure and guardrail multiple accounts at the same time (~25 min Standalone, ~50 min/account Control Tower)
142+
- change Accelerator configuration settings (~25 min)
140143

141144
# **Documentation**
142145

143146
### - Accelerator Installation and Upgrade [Guide](./docs/installation/installation.md)
144147

145148
- Link to Accelerator [releases](https://github.com/aws-samples/aws-secure-environment-accelerator/releases) and change history
146149
- Sample configuration files and customization [details](./docs/installation/customization-index.md)
150+
- State Machine behavior and [inputs](./docs/installation/sm_inputs.md)
147151
- [Chart](./docs/installation/what-we-do-where.md) containing details as to WHAT we do and WHERE we support it (regions, accounts, etc.)
148152
- Accelerator central logging [bucket structures](./docs/architectures/pbmm/log-file-locations.md)
149153
- Unofficial Accelerator [Roadmap](https://github.com/aws-samples/aws-secure-environment-accelerator/projects) (GitHub projects) - _Please upvote desired features_
@@ -160,11 +164,15 @@ This summarizes the installation process, the full installation document can be
160164

161165
### - Prescriptive PBMM Architecture Design [Document](./docs/architectures/pbmm/architecture.md) (Early Draft)
162166

163-
- AWS PBMM architecture sample [diagrams](./docs/architectures/pbmm/AWS_PBMM_Accel_Account_Network_VPC.md)
167+
- Accelerator Prescriptive Architecture Sample [diagrams](./docs/architectures/pbmm/AWS_PBMM_Accel_Account_Network_VPC.md)
164168

165169
---
166170

167-
Note: A ZIP file containing a PDF version of most documentation can be found [here](https://github.com/aws-samples/aws-secure-environment-accelerator/actions?query=workflow%3A%22Generate+Documentation%22).
171+
Note: Two ZIP files are attached as assets of each [release](https://github.com/aws-samples/aws-secure-environment-accelerator/releases):
172+
173+
- one contains a PDF version of the above documentation
174+
- the second contains a _DRAFT_ of the config file documentation, auto generated from a combination of the typescript schema and the field definitions added for the future GUI
175+
- Extract and open src\lib\docs-gen\output-docs\en\index.html in your browser
168176

169177
---
170178

buildspec.yml

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
version: 0.2
2+
3+
phases:
4+
install:
5+
runtime-versions:
6+
nodejs: 14
7+
commands:
8+
- echo "nothing to do in install"
9+
pre_build:
10+
commands:
11+
- echo "Installing dependencies and executing unit tests - `pwd`"
12+
- cd src
13+
- chmod +x ./run-all-tests.sh && ./run-all-tests.sh
14+
- echo "Installing dependencies and executing unit tests completed `date`"
15+
build:
16+
commands:
17+
- echo "Starting build `date` in `pwd`"
18+
- cd ../deployment
19+
- chmod +x ./build-s3-dist.sh && ./build-s3-dist.sh $DIST_OUTPUT_BUCKET $SOLUTION_NAME $VERSION
20+
- echo "Build completed `date`"
21+
- echo "Starting open-source-dist `date` in `pwd`"
22+
- chmod +x ./build-open-source-dist.sh && ./build-open-source-dist.sh $SOLUTION_NAME
23+
- echo "Open Source Dist completed `date`"
24+
25+
post_build:
26+
commands:
27+
- echo "Retrieving next stage buildspec `date` in `pwd`"
28+
- aws s3 cp s3://solutions-build-assets/changelog-spec.yml ../buildspec.yml
29+
- echo "Retrieving next stage buildspec complete"
30+
- echo "Post build completed on `date`"
31+
32+
artifacts:
33+
files:
34+
- .gitlab/**/*
35+
- deployment/**/*
36+
- docs/**/*
37+
- reference-artifacts/**/*
38+
- src/**/*
39+
- test/**/*
40+
- .dockerignore
41+
- .eslintrc.js
42+
- .gitattributes
43+
- .gitignore
44+
- .prettierrc
45+
- buildspec.yml
46+
- CHANGELOG.md
47+
- CODE_OF_CONDUCT.md
48+
- CONTRIBUTING.md
49+
- LICENSE
50+
- NOTICE
51+
- package.json
52+
- pnpm-lock.yaml
53+
- pnpm-workspace.yaml
54+
- README.md
55+
- tsconfig.base.json
56+
- sonar-project.properties

0 commit comments

Comments
 (0)