Merge pull request #36 from gockle/main

Update Nodejs Runtimes for all lambda functions to 18

Author: tbelmega

CHANGELOG.md

@@ -6,6 +6,12 @@ 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.0.9] - 2024-01-07
+
+### Changed
+
+- Update NodeJS runtimes to Nodejs18.x for all the lambda functions in the solution.
+
 ## [2.0.8] - 2023-10-31
 
 ### Changed
@@ -20,7 +26,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
-- Update aws-cdk-lib to force CustomResourceProvider and Provider to update lambda runtimes to Nodejs18.x.
+- Update aws-cdk-lib to force CustomResourceProvider and Provider to update lambda runtime to Nodejs18.x.
 
 ## [2.0.6] - 2023-06-27
 

solution-manifest.yml

@@ -1,7 +1,7 @@
 ---
 id: SO0134 # Solution Id
 name: automations-for-aws-firewall-manager # trademarked name
-version: v2.0.8 # current version of the solution. Used to verify template headers
+version: v2.0.9 # current version of the solution. Used to verify template headers
 regions: # List of supported regions per partition -or- `all` for all regions in partition
    commercial:
     - all # All the commercial regions; otherwise provide a list of regions
@@ -15,4 +15,4 @@ cloudformation_templates: # This list should match with AWS CloudFormation templ
   - template: aws-fms-compliance.template
   - template: aws-fms-demo.template
 build_environment:
-    build_image: 'aws/codebuild/standard:7.0' # Options include: 'aws/codebuild/standard:5.0','aws/codebuild/standard:6.0','aws/codebuild/standard:7.0','aws/codebuild/amazonlinux2-x86_64-standard:4.0','aws/codebuild/amazonlinux2-x86_64-standard:5.0'
+    build_image: 'aws/codebuild/standard:7.0'

source/resources/__tests__/prereq.test.ts

@@ -13,9 +13,9 @@ describe("==Pre-requisite Stack Tests==", () => {
     test("has helper, pre-req and provider lambda functions", () => {
       expect(stack).toCountResources("AWS::Lambda::Function", 4);
     });
-    test("lambda function has nodejs16 runtime", () => {
+    test("lambda function has nodejs18 runtime", () => {
       expect(stack).toHaveResourceLike("AWS::Lambda::Function", {
-        Runtime: "nodejs16.x",
+        Runtime: "nodejs18.x",
       });
     });
     test("has custom resource for launch", () => {

source/resources/lib/common.ts

@@ -144,7 +144,7 @@ export class CommonResourceStack extends Stack {
         "Solution",
         "SolutionId"
       )} - Function to help with FMS solution installation (DO NOT DELETE)`,
-      runtime: Runtime.NODEJS_16_X,
+      runtime: Runtime.NODEJS_18_X,
       code: Code.fromAsset(
         `${path.dirname(__dirname)}/../services/helper/dist/helperFunction.zip`
       ),
@@ -279,7 +279,7 @@ export class CommonResourceStack extends Stack {
         "Solution",
         "SolutionId"
       )} - Function to publish FMS solution metrics to aws-solutions`,
-      runtime: Runtime.NODEJS_16_X,
+      runtime: Runtime.NODEJS_18_X,
       code: Code.fromAsset(
         `${path.dirname(
           __dirname

source/resources/lib/compliance.ts

@@ -232,7 +232,7 @@ export class ComplianceGeneratorStack extends NestedStack {
       "ComplianceGenerator",
       {
         description: `${manifest.solution.primarySolutionId} - Function to generate compliance reports for FMS policies`,
-        runtime: Runtime.NODEJS_16_X,
+        runtime: Runtime.NODEJS_18_X,
         deadLetterQueue: dlq,
         code: Code.fromAsset(
           `${path.dirname(

source/resources/lib/demo.ts

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { App, CfnResource, Stack, StackProps } from "aws-cdk-lib";
-import { Vpc, SecurityGroup, Peer, Port } from "aws-cdk-lib/aws-ec2";
+import { Vpc, SecurityGroup, Peer, Port, IpAddresses, ISubnet } from "aws-cdk-lib/aws-ec2";
 import manifest from "./solution_manifest.json";
 const {
   CloudFrontToS3,
@@ -38,11 +38,11 @@ export class DemoStack extends Stack {
      * Security Groups
      */
     const vpc = new Vpc(this, "test-VPC", {
-      cidr: "10.0.0.0/16",
+      ipAddresses: IpAddresses.cidr("10.0.0.0/16"),
     });
 
-    vpc.publicSubnets.forEach((s) => {
-      const cfnSubnet = s.node.defaultChild as CfnResource;
+    vpc.publicSubnets.forEach((subnet: ISubnet) => {
+      const cfnSubnet = subnet.node.defaultChild as CfnResource;
       cfnSubnet.addPropertyOverride("MapPublicIpOnLaunch", false);
     });
 

source/resources/lib/prereq.ts

@@ -105,7 +105,7 @@ export class PreReqStack extends Stack {
      */
     const helperFunction: Function = new Function(this, "FMSHelperFunction", {
       description: "DO NOT DELETE - FMS helper function",
-      runtime: Runtime.NODEJS_16_X,
+      runtime: Runtime.NODEJS_18_X,
       code: Code.fromAsset(
         `${path.dirname(__dirname)}/../services/helper/dist/helperFunction.zip`
       ),
@@ -160,7 +160,7 @@ export class PreReqStack extends Stack {
       {
         description:
           "Function to validate and install pre-requisites for the FMS solution",
-        runtime: Runtime.NODEJS_16_X,
+        runtime: Runtime.NODEJS_18_X,
         code: Code.fromAsset(
           `${path.dirname(
             __dirname