Update to version v1.0.1

.gitignore

@@ -40,6 +40,9 @@ nosetests.xml
 coverage.xml
 *,cover
 .hypothesis/
+**/coverage-reports/
+**/coverage/
+*.lcov
 
 # Translations
 *.mo
@@ -97,6 +100,8 @@ ENV/
 *.zip
 deployment/open-source
 deployment/examples
+deployment/firewallPolicies/
+deployment/firewalls/
 deployment/dist
 source/deploy
 deployment/vpc_rules
@@ -106,3 +111,7 @@ deployment/vpc_rules
 .idea
 .vscode
 source/scratch/
+tmp/
+
+# linting, scanning configurations, sonarqube
+.scannerwork/

CHANGELOG.md

@@ -4,6 +4,11 @@ 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).
 
+## [1.0.1] - 2021-04-10
+### Updated
+- Updated default branch name to 'main'. [Change branch settings in your 
+  existing AWS CodeCommit repository.](https://docs.aws.amazon.com/codecommit/latest/userguide/how-to-change-branch.html)
+
 ## [1.0.0] - 2021-02-24
 ### Added
 - New solution AWS Network Firewall Deployment Automations for AWS Transit Gateway, initial version

deployment/build-s3-dist.sh

@@ -22,9 +22,6 @@ if [ -z "$1" ] || [ -z "$2" ] || [ -z "$3" ]; then
     exit 1
 fi
 
-[ "$DEBUG" == 'true' ] && set -x
-set -e
-
 # Environment variables 
 export DIST_VERSION=$3
 export DIST_OUTPUT_BUCKET=$1
@@ -40,6 +37,9 @@ template_dist_dir="$template_dir/global-s3-assets"
 build_dist_dir="$template_dir/regional-s3-assets"
 source_dir="$template_dir/../source"
 
+[ "$DEBUG" == 'true' ] && set -x
+set -e
+
 echo "------------------------------------------------------------------------------"
 echo "[Init] Remove any old dist files from previous runs"
 echo "------------------------------------------------------------------------------"
@@ -66,13 +66,15 @@ echo "--------------------------------------------------------------------------
 # Install the global aws-cdk package
 echo "cd $source_dir"
 cd $source_dir
-echo "npm install -g aws-cdk@$cdk_version"
-npm install -g aws-cdk@$cdk_version
+echo "npm install"
+npm install
+echo "npm install aws-cdk@$cdk_version"
+npm install aws-cdk@$cdk_version
 
 # Run 'cdk synth' to generate raw solution outputs
 cd "$source_dir"
-echo "cdk synth --output=$staging_dist_dir"
-npm run build && cdk synth --output=$staging_dist_dir
+echo "node_modules/aws-cdk/bin/cdk synth --output=$staging_dist_dir"
+npm run build && node_modules/aws-cdk/bin/cdk synth --output=$staging_dist_dir
 
 # Remove unnecessary output files
 echo "cd $staging_dist_dir"
@@ -134,6 +136,14 @@ echo "--------------------------------------------------------------------------
 echo "[Cleanup] Remove temporary files"
 echo "------------------------------------------------------------------------------"
 
+# cleanup generated files
+cd $source_dir/networkFirewallAutomation/
+npm run cleanup:tsc
+npm run cleanup:dist
+
+cd $source_dir/
+npm run cleanup:tsc
+
 # Delete the temporary /staging folder
 echo "rm -rf $staging_dist_dir"
 rm -rf $staging_dist_dir

source/jest.config.js

@@ -0,0 +1,13 @@
+module.exports = {
+    "roots": [
+      "<rootDir>/test"
+    ],
+    testMatch: [ '**/*.test.ts'],
+    "transform": {
+      "^.+\\.tsx?$": "ts-jest"
+    },
+    coverageReporters: [
+      "text",
+      ["lcov", {"projectRoot": "../"}]
+    ]
+  }

source/lib/network-firewall-automation-solution-stack.ts

@@ -981,6 +981,7 @@ export class NetworkFirewallAutomationStack extends cdk.Stack {
             new codepipeline_action.CodeCommitSourceAction({
               actionName: 'Source',
               repository: codeCommitRepo,
+              branch: 'main',
               output: sourceOutputArtifact,
             })
           ]

source/networkFirewallAutomation/jest.config.js

@@ -0,0 +1,14 @@
+module.exports = {
+    "roots": [
+      "<rootDir>/__tests__"
+    ],
+    testMatch: [ '**/*.spec.ts', '**/*.test.ts'],
+    "transform": {
+      "^.+\\.tsx?$": "ts-jest"
+    },
+    coverageReporters: [
+      "text",
+      ["lcov", {"projectRoot": "../../"}]
+    ],
+    testTimeout: 30000
+  }