Skip to content
This repository was archived by the owner on Nov 10, 2025. It is now read-only.

Commit 3aa20bb

Browse files
tbelmegatbelmega
authored
Merge pull request #40 from aws-solutions/release/v2.0.11
Upgrade to v2.0.11
2 parents 131ff55 + 6673378 commit 3aa20bb

File tree

19 files changed

+91
-67
lines changed

19 files changed

+91
-67
lines changed

‎CHANGELOG.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,14 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
66
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
77

8+
## [2.0.11] - 2024-08-01
9+
10+
### Security
11+
- Upgrade `fast-xml-parser` to mitigate [CVE-2024-41818](https://nvd.nist.gov/vuln/detail/CVE-2024-41818)
12+
13+
### Changed
14+
- Extended PolicyManager's Log Group retention period to ten years.
15+
816
## [2.0.10] - 2024-06-19
917

1018
### Security

‎deployment/aws-fms-automations.template‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"Description": "(SO0134) - The AWS CloudFormation template for deployment of the aws-firewall-manager-automations-for-aws-organizations. Version v2.0.10",
2+
"Description": "(SO0134) - The AWS CloudFormation template for deployment of the aws-firewall-manager-automations-for-aws-organizations. Version v2.0.11",
33
"AWSTemplateFormatVersion": "2010-09-09",
44
"Metadata": {
55
"AWS::CloudFormation::Interface": {
@@ -38,7 +38,7 @@
3838
},
3939
"Solution": {
4040
"SolutionId": "SO0134",
41-
"SolutionVersion": "v2.0.10",
41+
"SolutionVersion": "v2.0.11",
4242
"UserAgentPrefix": "AwsSolution"
4343
}
4444
}
@@ -303,7 +303,7 @@
303303
"S3Bucket": {
304304
"Fn::Sub": "solutions-${AWS::Region}"
305305
},
306-
"S3Key": "aws-firewall-manager-automations-for-aws-organizations/v2.0.10/assetd121122acde085efd7d2a7f074c5a51327e86cc2fb1104c44095fa98bb2fdd69.zip"
306+
"S3Key": "aws-firewall-manager-automations-for-aws-organizations/v2.0.11/asset65cb064f1448ec88ad58959c7b3936a7c0f0b90b6a84e2143aa944da5ab7e61b.zip"
307307
},
308308
"Description": {
309309
"Fn::Join": [
@@ -464,7 +464,7 @@
464464
"S3Bucket": {
465465
"Fn::Sub": "solutions-${AWS::Region}"
466466
},
467-
"S3Key": "aws-firewall-manager-automations-for-aws-organizations/v2.0.10/asset7382a0addb9f34974a1ea6c6c9b063882af874828f366f5c93b2b7b64db15c94.zip"
467+
"S3Key": "aws-firewall-manager-automations-for-aws-organizations/v2.0.11/asset7382a0addb9f34974a1ea6c6c9b063882af874828f366f5c93b2b7b64db15c94.zip"
468468
},
469469
"Description": "AWS CDK resource provider framework - onEvent (CommonResourceStack/HelperProvider)",
470470
"Environment": {
@@ -789,7 +789,7 @@
789789
"S3Bucket": {
790790
"Fn::Sub": "solutions-${AWS::Region}"
791791
},
792-
"S3Key": "aws-firewall-manager-automations-for-aws-organizations/v2.0.10/assetc2fc4947fa6b45b1ca7c63d62ff33796fd3ecb60c42097ac6bf591e52d481b39.zip"
792+
"S3Key": "aws-firewall-manager-automations-for-aws-organizations/v2.0.11/assetcf37c8159d10a0ef4973f62aecd215913bc1e21a8fe6fba6656497a30267d0df.zip"
793793
},
794794
"Description": {
795795
"Fn::Join": [
@@ -926,7 +926,7 @@
926926
]
927927
}
928928
},
929-
"TemplateURL": "https://solutions-reference.s3.amazonaws.com/aws-firewall-manager-automations-for-aws-organizations/v2.0.10/aws-fms-compliance.template"
929+
"TemplateURL": "https://solutions-reference.s3.amazonaws.com/aws-firewall-manager-automations-for-aws-organizations/v2.0.11/aws-fms-compliance.template"
930930
},
931931
"UpdateReplacePolicy": "Delete",
932932
"DeletionPolicy": "Delete",
@@ -958,7 +958,7 @@
958958
},
959959
"PolicyIdentifier": "DefaultPolicy"
960960
},
961-
"TemplateURL": "https://solutions-reference.s3.amazonaws.com/aws-firewall-manager-automations-for-aws-organizations/v2.0.10/aws-fms-policy.template"
961+
"TemplateURL": "https://solutions-reference.s3.amazonaws.com/aws-firewall-manager-automations-for-aws-organizations/v2.0.11/aws-fms-policy.template"
962962
},
963963
"UpdateReplacePolicy": "Delete",
964964
"DeletionPolicy": "Delete",

‎deployment/aws-fms-compliance.template‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"Description": "(SO0134-cr) - The AWS CloudFormation template for deployment of the aws-firewall-manager-automations-for-aws-organizations compliance reporter resources. Version v2.0.10",
2+
"Description": "(SO0134-cr) - The AWS CloudFormation template for deployment of the aws-firewall-manager-automations-for-aws-organizations compliance reporter resources. Version v2.0.11",
33
"AWSTemplateFormatVersion": "2010-09-09",
44
"Metadata": {
55
"AWS::CloudFormation::Interface": {
@@ -41,7 +41,7 @@
4141
},
4242
"Solution": {
4343
"SolutionId": "SO0134",
44-
"SolutionVersion": "v2.0.10",
44+
"SolutionVersion": "v2.0.11",
4545
"UserAgentPrefix": "AwsSolution"
4646
}
4747
}
@@ -456,7 +456,7 @@
456456
"S3Bucket": {
457457
"Fn::Sub": "solutions-${AWS::Region}"
458458
},
459-
"S3Key": "aws-firewall-manager-automations-for-aws-organizations/v2.0.10/asset0c65a0f491e8d69cddfd0b45da98ee9512cd72e06239557b07637450dc95539a.zip"
459+
"S3Key": "aws-firewall-manager-automations-for-aws-organizations/v2.0.11/asset1ac2bfd15f8885c18e44ff6c9a6d0b28cb03c7a7cc014d994d0854e5206dd020.zip"
460460
},
461461
"DeadLetterConfig": {
462462
"TargetArn": {

‎deployment/aws-fms-demo.template‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"Description": "(SO0134D) - The AWS CloudFormation template for deployment of the aws-firewall-manager-automations-for-aws-organizations demo resources. Version v2.0.10",
2+
"Description": "(SO0134D) - The AWS CloudFormation template for deployment of the aws-firewall-manager-automations-for-aws-organizations demo resources. Version v2.0.11",
33
"AWSTemplateFormatVersion": "2010-09-09",
44
"Resources": {
55
"testcloudfronts3S3LoggingBucket90D239DD": {

‎deployment/aws-fms-policy.template‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"Description": "(SO0134-po) - The AWS CloudFormation template for deployment of the aws-firewall-manager-automations-for-aws-organizations. Version v2.0.10",
2+
"Description": "(SO0134-po) - The AWS CloudFormation template for deployment of the aws-firewall-manager-automations-for-aws-organizations. Version v2.0.11",
33
"AWSTemplateFormatVersion": "2010-09-09",
44
"Metadata": {
55
"AWS::CloudFormation::Interface": {
@@ -64,7 +64,7 @@
6464
},
6565
"Solution": {
6666
"SolutionId": "SO0134",
67-
"SolutionVersion": "v2.0.10",
67+
"SolutionVersion": "v2.0.11",
6868
"UserAgentPrefix": "AwsSolution"
6969
}
7070
}
@@ -393,7 +393,7 @@
393393
{
394394
"Ref": "AWS::Region"
395395
},
396-
"/aws-firewall-manager-automations-for-aws-organizations/v2.0.10/policy_manifest.json\",\"Key\":\"policy_manifest.json\"},\"physicalResourceId\":{\"id\":\"1718725613573\"}}"
396+
"/aws-firewall-manager-automations-for-aws-organizations/v2.0.11/policy_manifest.json\",\"Key\":\"policy_manifest.json\"},\"physicalResourceId\":{\"id\":\"1722475091257\"}}"
397397
]
398398
]
399399
},
@@ -504,7 +504,7 @@
504504
"S3Bucket": {
505505
"Fn::Sub": "solutions-${AWS::Region}"
506506
},
507-
"S3Key": "aws-firewall-manager-automations-for-aws-organizations/v2.0.10/asset17c16a3854838fd3ff4bda08146122a6701f33b9c86ae17f415ad0dc47a97544.zip"
507+
"S3Key": "aws-firewall-manager-automations-for-aws-organizations/v2.0.11/asset17c16a3854838fd3ff4bda08146122a6701f33b9c86ae17f415ad0dc47a97544.zip"
508508
},
509509
"Handler": "index.handler",
510510
"Role": {
@@ -638,7 +638,7 @@
638638
"S3Bucket": {
639639
"Fn::Sub": "solutions-${AWS::Region}"
640640
},
641-
"S3Key": "aws-firewall-manager-automations-for-aws-organizations/v2.0.10/asset013e8c75d236c32a1fab745b7186aba0455339de79b1c9ca3d7499c59b99d3d4.zip"
641+
"S3Key": "aws-firewall-manager-automations-for-aws-organizations/v2.0.11/asset282f99aacf96565b4780d1e9874c90fa48ef0abf40ccf66721408e97e6d3b664.zip"
642642
},
643643
"DeadLetterConfig": {
644644
"TargetArn": {
@@ -928,7 +928,7 @@
928928
]
929929
]
930930
},
931-
"RetentionInDays": 7
931+
"RetentionInDays": 3653
932932
},
933933
"UpdateReplacePolicy": "Delete",
934934
"DeletionPolicy": "Delete",

‎deployment/aws-fms-prereq.template‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"Description": "(SO0134N) - The AWS CloudFormation template for deployment of the aws-firewall-manager-automations-for-aws-organizations. Version v2.0.10",
2+
"Description": "(SO0134N) - The AWS CloudFormation template for deployment of the aws-firewall-manager-automations-for-aws-organizations. Version v2.0.11",
33
"AWSTemplateFormatVersion": "2010-09-09",
44
"Metadata": {
55
"AWS::CloudFormation::Interface": {
@@ -48,7 +48,7 @@
4848
},
4949
"Solution": {
5050
"SolutionId": "SO0134N",
51-
"SolutionVersion": "v2.0.10",
51+
"SolutionVersion": "v2.0.11",
5252
"GlobalStackSetName": "FMS-EnableConfig-Global",
5353
"RegionalStackSetName": "FMS-EnableConfig-Regional",
5454
"UserAgentPrefix": "AwsSolution"
@@ -97,7 +97,7 @@
9797
"S3Bucket": {
9898
"Fn::Sub": "solutions-${AWS::Region}"
9999
},
100-
"S3Key": "aws-firewall-manager-automations-for-aws-organizations/v2.0.10/assetd121122acde085efd7d2a7f074c5a51327e86cc2fb1104c44095fa98bb2fdd69.zip"
100+
"S3Key": "aws-firewall-manager-automations-for-aws-organizations/v2.0.11/asset65cb064f1448ec88ad58959c7b3936a7c0f0b90b6a84e2143aa944da5ab7e61b.zip"
101101
},
102102
"Description": "DO NOT DELETE - FMS helper function",
103103
"Environment": {
@@ -245,7 +245,7 @@
245245
"S3Bucket": {
246246
"Fn::Sub": "solutions-${AWS::Region}"
247247
},
248-
"S3Key": "aws-firewall-manager-automations-for-aws-organizations/v2.0.10/asset7382a0addb9f34974a1ea6c6c9b063882af874828f366f5c93b2b7b64db15c94.zip"
248+
"S3Key": "aws-firewall-manager-automations-for-aws-organizations/v2.0.11/asset7382a0addb9f34974a1ea6c6c9b063882af874828f366f5c93b2b7b64db15c94.zip"
249249
},
250250
"Description": "AWS CDK resource provider framework - onEvent (PreReqStack/HelperProvider)",
251251
"Environment": {
@@ -385,7 +385,7 @@
385385
"S3Bucket": {
386386
"Fn::Sub": "solutions-${AWS::Region}"
387387
},
388-
"S3Key": "aws-firewall-manager-automations-for-aws-organizations/v2.0.10/assetf3f84a266840977b5a680778ded4c90b32a4741935a3e43fff15f180297682b1.zip"
388+
"S3Key": "aws-firewall-manager-automations-for-aws-organizations/v2.0.11/asset8652d017578624dfafbf9e62e678f4a6eb113df1cfa4e55027279723fbf7e847.zip"
389389
},
390390
"Description": "Function to validate and install pre-requisites for the FMS solution",
391391
"Environment": {
@@ -627,7 +627,7 @@
627627
"S3Bucket": {
628628
"Fn::Sub": "solutions-${AWS::Region}"
629629
},
630-
"S3Key": "aws-firewall-manager-automations-for-aws-organizations/v2.0.10/asset7382a0addb9f34974a1ea6c6c9b063882af874828f366f5c93b2b7b64db15c94.zip"
630+
"S3Key": "aws-firewall-manager-automations-for-aws-organizations/v2.0.11/asset7382a0addb9f34974a1ea6c6c9b063882af874828f366f5c93b2b7b64db15c94.zip"
631631
},
632632
"Description": "AWS CDK resource provider framework - onEvent (PreReqStack/PreReqProvider)",
633633
"Environment": {

‎package-lock.json‎

Lines changed: 12 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,10 @@
3333
"@aws-sdk/client-s3": "^3.359.0"
3434
},
3535
"overrides": {
36-
"word-wrap": "1.2.4"
36+
"word-wrap": "1.2.4",
37+
"fast-xml-parser": ">=4.4.1"
3738
},
3839
"resolutions": {
3940
"word-wrap": "1.2.4"
4041
}
41-
}
42+
}

‎source/resources/__tests__/policy.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ describe("==Policy Stack Tests==", () => {
4242
});
4343
test("has cloudwatch log group", () => {
4444
expect(policyStack).toHaveResource("AWS::Logs::LogGroup", {
45-
RetentionInDays: 7,
45+
RetentionInDays: 3653,
4646
});
4747
});
4848
});

‎source/resources/lib/policy.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@ export class PolicyStack extends NestedStack {
355355
const lg: LogGroup = new LogGroup(this, "PolicyMangerLogGroup", {
356356
logGroupName: `/aws/lambda/${policyManager.functionName}`,
357357
removalPolicy: RemovalPolicy.DESTROY,
358-
retention: RetentionDays.ONE_WEEK,
358+
retention: RetentionDays.TEN_YEARS,
359359
});
360360

361361
/**

0 commit comments

Comments
 (0)