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

Commit 131ff55

Browse files
tbelmegatbelmega
authored
Merge pull request #39 from aws-solutions/release/v2.0.10
Upgrade to v2.0.10
2 parents caf6d09 + 4ab9b5e commit 131ff55

24 files changed

+1334
-2100
lines changed

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,6 @@ __snapshots__
3434
# IDE project files
3535
.idea
3636

37+
#vscode settings
38+
.vscode
3739

‎CHANGELOG.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,13 @@ 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.10] - 2024-06-19
9+
10+
### Security
11+
- Upgraded `braces` package to mitigate [CVE-2024-4068](https://avd.aquasec.com/nvd/2024/cve-2024-4068/)
12+
13+
### Fixed
14+
- Fixed intermittent deployment failure caused by "CopyManifest" custom resource installing latest SDK version.
815

916
## [2.0.9] - 2024-01-07
1017

‎deployment/aws-fms-automations.template‎

Lines changed: 61 additions & 45 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.5",
2+
"Description": "(SO0134) - The AWS CloudFormation template for deployment of the aws-firewall-manager-automations-for-aws-organizations. Version v2.0.10",
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.5",
41+
"SolutionVersion": "v2.0.10",
4242
"UserAgentPrefix": "AwsSolution"
4343
}
4444
}
@@ -193,37 +193,53 @@
193193
{
194194
"Ref": "AWS::Region"
195195
},
196-
"me-south-1"
196+
"il-central-1"
197197
]
198198
},
199199
{
200200
"Fn::Equals": [
201201
{
202202
"Ref": "AWS::Region"
203203
},
204-
"sa-east-1"
204+
"me-central-1"
205205
]
206206
},
207207
{
208208
"Fn::Equals": [
209209
{
210210
"Ref": "AWS::Region"
211211
},
212-
"us-east-1"
212+
"me-south-1"
213213
]
214214
},
215215
{
216216
"Fn::Equals": [
217217
{
218218
"Ref": "AWS::Region"
219219
},
220-
"us-east-2"
220+
"sa-east-1"
221221
]
222222
}
223223
]
224224
},
225225
{
226226
"Fn::Or": [
227+
{
228+
"Fn::Equals": [
229+
{
230+
"Ref": "AWS::Region"
231+
},
232+
"us-east-1"
233+
]
234+
},
235+
{
236+
"Fn::Equals": [
237+
{
238+
"Ref": "AWS::Region"
239+
},
240+
"us-east-2"
241+
]
242+
},
227243
{
228244
"Fn::Equals": [
229245
{
@@ -287,13 +303,7 @@
287303
"S3Bucket": {
288304
"Fn::Sub": "solutions-${AWS::Region}"
289305
},
290-
"S3Key": "aws-firewall-manager-automations-for-aws-organizations/v2.0.5/assetf61d8efdffd22a1aaf0e604e17c95273adfd0cfbc4bd714478dbdb7e5adea20b.zip"
291-
},
292-
"Role": {
293-
"Fn::GetAtt": [
294-
"HelperFunctionServiceRole6B43B152",
295-
"Arn"
296-
]
306+
"S3Key": "aws-firewall-manager-automations-for-aws-organizations/v2.0.10/assetd121122acde085efd7d2a7f074c5a51327e86cc2fb1104c44095fa98bb2fdd69.zip"
297307
},
298308
"Description": {
299309
"Fn::Join": [
@@ -338,7 +348,13 @@
338348
},
339349
"Handler": "index.handler",
340350
"MemorySize": 512,
341-
"Runtime": "nodejs16.x"
351+
"Role": {
352+
"Fn::GetAtt": [
353+
"HelperFunctionServiceRole6B43B152",
354+
"Arn"
355+
]
356+
},
357+
"Runtime": "nodejs18.x"
342358
},
343359
"DependsOn": [
344360
"HelperFunctionServiceRole6B43B152"
@@ -448,13 +464,7 @@
448464
"S3Bucket": {
449465
"Fn::Sub": "solutions-${AWS::Region}"
450466
},
451-
"S3Key": "aws-firewall-manager-automations-for-aws-organizations/v2.0.5/asset8e3d635893ea17fa3158623489cd42c680fad925b38de1ef51cb10d84f6e245e.zip"
452-
},
453-
"Role": {
454-
"Fn::GetAtt": [
455-
"HelperProviderframeworkonEventServiceRole1962DD43",
456-
"Arn"
457-
]
467+
"S3Key": "aws-firewall-manager-automations-for-aws-organizations/v2.0.10/asset7382a0addb9f34974a1ea6c6c9b063882af874828f366f5c93b2b7b64db15c94.zip"
458468
},
459469
"Description": "AWS CDK resource provider framework - onEvent (CommonResourceStack/HelperProvider)",
460470
"Environment": {
@@ -468,7 +478,13 @@
468478
}
469479
},
470480
"Handler": "framework.onEvent",
471-
"Runtime": "nodejs14.x",
481+
"Role": {
482+
"Fn::GetAtt": [
483+
"HelperProviderframeworkonEventServiceRole1962DD43",
484+
"Arn"
485+
]
486+
},
487+
"Runtime": "nodejs18.x",
472488
"Timeout": 900
473489
},
474490
"DependsOn": [
@@ -573,27 +589,27 @@
573589
"FMSTable84B8646C": {
574590
"Type": "AWS::DynamoDB::Table",
575591
"Properties": {
576-
"KeySchema": [
592+
"AttributeDefinitions": [
577593
{
578594
"AttributeName": "PolicyName",
579-
"KeyType": "HASH"
595+
"AttributeType": "S"
580596
},
581597
{
582598
"AttributeName": "Region",
583-
"KeyType": "RANGE"
599+
"AttributeType": "S"
584600
}
585601
],
586-
"AttributeDefinitions": [
602+
"BillingMode": "PAY_PER_REQUEST",
603+
"KeySchema": [
587604
{
588605
"AttributeName": "PolicyName",
589-
"AttributeType": "S"
606+
"KeyType": "HASH"
590607
},
591608
{
592609
"AttributeName": "Region",
593-
"AttributeType": "S"
610+
"KeyType": "RANGE"
594611
}
595612
],
596-
"BillingMode": "PAY_PER_REQUEST",
597613
"PointInTimeRecoverySpecification": {
598614
"PointInTimeRecoveryEnabled": true
599615
},
@@ -773,13 +789,7 @@
773789
"S3Bucket": {
774790
"Fn::Sub": "solutions-${AWS::Region}"
775791
},
776-
"S3Key": "aws-firewall-manager-automations-for-aws-organizations/v2.0.5/assetd72c40e9198a7f69e1e525c456cae4305e1dc8b40874eca18533b8157e166a7d.zip"
777-
},
778-
"Role": {
779-
"Fn::GetAtt": [
780-
"MetricsManagerServiceRole00F759D1",
781-
"Arn"
782-
]
792+
"S3Key": "aws-firewall-manager-automations-for-aws-organizations/v2.0.10/assetc2fc4947fa6b45b1ca7c63d62ff33796fd3ecb60c42097ac6bf591e52d481b39.zip"
783793
},
784794
"Description": {
785795
"Fn::Join": [
@@ -811,7 +821,13 @@
811821
"Handler": "index.handler",
812822
"MemorySize": 128,
813823
"ReservedConcurrentExecutions": 1,
814-
"Runtime": "nodejs16.x",
824+
"Role": {
825+
"Fn::GetAtt": [
826+
"MetricsManagerServiceRole00F759D1",
827+
"Arn"
828+
]
829+
},
830+
"Runtime": "nodejs18.x",
815831
"Timeout": 15
816832
},
817833
"DependsOn": [
@@ -836,15 +852,15 @@
836852
"MetricsManagerSqsEventSourceCommonResourceStackMetricsQueueBA3FDDBD01BF5955": {
837853
"Type": "AWS::Lambda::EventSourceMapping",
838854
"Properties": {
839-
"FunctionName": {
840-
"Ref": "MetricsManager98639C73"
841-
},
842855
"BatchSize": 1,
843856
"EventSourceArn": {
844857
"Fn::GetAtt": [
845858
"MetricsQueue0DAB96B7",
846859
"Arn"
847860
]
861+
},
862+
"FunctionName": {
863+
"Ref": "MetricsManager98639C73"
848864
}
849865
},
850866
"Metadata": {
@@ -886,7 +902,7 @@
886902
"CDKMetadata": {
887903
"Type": "AWS::CDK::Metadata",
888904
"Properties": {
889-
"Analytics": "v2:deflate64:H4sIAAAAAAAA/2VRTU/DMAz9LdyzsA0JcWUTuyFKx71yEzNlbZJSJ0VT1f9O4qJSiUv8nu3nr+zl005u7+CbNko3m9bUcjwHUI04froCerAYsM/kFbrOuEuGR++0CcY7kXTV2IKtNcjxFJ1ib0pZ8MuALpx97BWuKvz3TsKAlWPpW8wJbAvfGnXjSRhNgh4qIMJA8jmbxOUhqgbDAQiFvjmwXqcVPqCe6zBIui+S43vEyM4Z8Ms6Rn/NVnSaRInEcwrumG5zyTuoSMHbqv8Nkix6PxidT8WRRZV3WeHltm8xdDFMwnmN8kr3w+5R7rfpK65kzKaPLhiLspztDyJ/yIymAQAA"
905+
"Analytics": "v2:deflate64:H4sIAAAAAAAA/2WQTU/DMAyGf8vuqaHsMo5sghuitNwrN8mmrE1S4qTTFPW/o6SoVOKS97Edfz5BWR7gcYc3Krjoi0F1EBuPvGens6nQoZZeumS84zgqc0l4skYor6xheKM2Dqg7gRDfguHZezqblV8naXxjg+NyU+G/d2YKNcTaDjJ9yFrZQfF7niTTzGjfIpH0BC9JGO3hGHgv/RFJMnE3qK3oIH5ht9TJMDP6JoifQYbsXCC/OS/TX7ONOc+slpTnZLlj4/GSduCBvNWt+w0SVM5OSqRT5cialXbZ8Hrbj+DH4GdmrJBwpYepPED5DOXuSkoVLhivtIR60R9Gp9e8pwEAAA=="
890906
},
891907
"Metadata": {
892908
"aws:cdk:path": "CommonResourceStack/CDKMetadata/Default"
@@ -896,7 +912,6 @@
896912
"ComplianceStack": {
897913
"Type": "AWS::CloudFormation::Stack",
898914
"Properties": {
899-
"TemplateURL": "https://solutions-reference.s3.amazonaws.com/aws-firewall-manager-automations-for-aws-organizations/v2.0.5/aws-fms-compliance.template",
900915
"Parameters": {
901916
"MetricsQueue": {
902917
"Fn::GetAtt": [
@@ -910,7 +925,8 @@
910925
"UUID"
911926
]
912927
}
913-
}
928+
},
929+
"TemplateURL": "https://solutions-reference.s3.amazonaws.com/aws-firewall-manager-automations-for-aws-organizations/v2.0.10/aws-fms-compliance.template"
914930
},
915931
"UpdateReplacePolicy": "Delete",
916932
"DeletionPolicy": "Delete",
@@ -924,7 +940,6 @@
924940
"PolicyStack": {
925941
"Type": "AWS::CloudFormation::Stack",
926942
"Properties": {
927-
"TemplateURL": "https://solutions-reference.s3.amazonaws.com/aws-firewall-manager-automations-for-aws-organizations/v2.0.5/aws-fms-policy.template",
928943
"Parameters": {
929944
"PolicyTable": {
930945
"Ref": "FMSTable84B8646C"
@@ -942,7 +957,8 @@
942957
]
943958
},
944959
"PolicyIdentifier": "DefaultPolicy"
945-
}
960+
},
961+
"TemplateURL": "https://solutions-reference.s3.amazonaws.com/aws-firewall-manager-automations-for-aws-organizations/v2.0.10/aws-fms-policy.template"
946962
},
947963
"UpdateReplacePolicy": "Delete",
948964
"DeletionPolicy": "Delete",

0 commit comments

Comments
 (0)