Merge branch 'main' into firewall-manager-non-ct

CHANGELOG.md

@@ -45,7 +45,6 @@
 All notable changes to this project will be documented in this file.
 
 ---
-
 ## 2023-10-23
 
 Updated [Firewall Manager](https://github.com/aws-samples/aws-security-reference-architecture-examples/tree/main/aws_sra_examples/solutions/firewall_manager/firewall_manager_org) solution to make AWS Control Tower optional.

README.md

@@ -146,6 +146,7 @@ _Note: The `Quick Setup` is not designed to be used with the `Easy Setup` proced
 | [Inspector](aws_sra_examples/solutions/inspector/inspector_org)                                       | Configure Inspector within a delegated admin account for all accounts and governed regions within the organization.                                                                                                                                                                                                                                             |                                                                                                              |                                                                                                                                                                                                                                                                   |
 | [Detective](aws_sra_examples/solutions/detective/detective)                                           | The Detective Organization solution will automate enabling Amazon Detective by delegating administration to an account (e.g. Audit or Security Tooling) and configuring Detective for all the existing and future AWS Organization accounts. **Note:** As of 06/07/2023, this solution is not included in the quick setup (it will be in a future code release) |                                                                                                              | <ul><li>AWS Control Tower</li><li>[GuardDuty](aws_sra_examples/solutions/guardduty/guardduty_org)</li></ul>                                                                                                                                                       |
 
+
 ## Utils
 
 - packaging_scripts/stage-solution.sh (Package and stage all the AWS SRA example solutions. For more information see [Staging script details](aws_sra_examples/docs/DOWNLOAD-AND-STAGE-SOLUTIONS.md#staging-script-details))

aws_sra_examples/easy_setup/customizations_for_aws_control_tower/manifest.yaml

@@ -194,7 +194,7 @@ resources:
 
       # Inspector Solution
       - parameter_key: pScanComponents
-        parameter_value: 'EC2, ECR, LAMBDA'
+        parameter_value: 'EC2, ECR, LAMBDA, LAMBDA_CODE'
       - parameter_key: pEcrRescanDuration
         parameter_value: 'LIFETIME'
 

aws_sra_examples/easy_setup/templates/sra-easy-setup.yaml

@@ -226,7 +226,7 @@ Metadata:
         default: SRA Staging S3 Bucket Stack Name
 
       pScanComponents:
-        default: Comma separated list of scan components (EC2, ECR, LAMBDA)
+        default: Comma separated list of scan components (EC2, ECR, LAMBDA, LAMBDA_CODE)
       pEcrRescanDuration:
         default: ECR Rescan Duration
       pDeployInspectorSolution:
@@ -522,8 +522,8 @@ Parameters:
     Type: String
 
   pScanComponents:
-    AllowedValues: [EC2, ECR, LAMBDA]
-    Default: EC2, ECR, LAMBDA
+    AllowedValues: [EC2, ECR, LAMBDA, LAMBDA_CODE]
+    Default: EC2, ECR, LAMBDA, LAMBDA_CODE
     Description: Lambda Function Logging Level
     Type: CommaDelimitedList
   pEcrRescanDuration: