Update to v1.5.12 open-source release (#231)

aws-solutions · Nov 19, 2024 · 563c65f · 563c65f
1 parent a6d9195
commit 563c65f
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 154 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,13 @@ 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.5.12] - 2024-11-19
+### Security:
+- Bump cross-spawn to `7.0.6` to resolve [CVE-2024-9506](https://github.com/advisories/GHSA-5j4c-8p2g-v4jx)
+
+### Fixed:
+- If a filesystem's stack changes from CREATE_COMPLETE to UPDATE_COMPLETE it no longer lists as managed [#229](https://github.com/aws-solutions/simple-file-manager-for-amazon-efs/issues/229)
+
 ## [1.5.11] - 2024-10-29
 ### Security: 
 - Bump http-proxy-middleware to `2.0.7` to resolve [cve-2024-21536](https://github.com/advisories/GHSA-c7qv-q95q-8v27)

diff --git a/source/api/app.py b/source/api/app.py
@@ -101,7 +101,9 @@ def format_filesystem_response(filesystem):
         new_filesystem_object["managed"] = "Deleting"
     elif stack_status['Stacks'][0]['StackStatus'] == 'CREATE_IN_PROGRESS':
         new_filesystem_object["managed"] = "Creating"
-    elif stack_status['Stacks'][0]['StackStatus'] == 'CREATE_COMPLETE':
+    elif stack_status['Stacks'][0]['StackStatus'] == 'UPDATE_IN_PROGRESS':
+        new_filesystem_object["managed"] = "Updating"
+    elif stack_status['Stacks'][0]['StackStatus'] in ['CREATE_COMPLETE', 'UPDATE_COMPLETE', 'UPDATE_ROLLBACK_COMPLETE']:
         new_filesystem_object["managed"] = True
 
     new_filesystem_object["file_system_id"] = filesystem_id
@@ -476,7 +478,7 @@ def delete_filesystem_lambda(filesystem_id):
     :raises ChaliceViewError, BadRequestError
     """
     stack_status = describe_manager_stack(filesystem_id)
-    if stack_status['Stacks'][0]['StackStatus'] == 'CREATE_COMPLETE':
+    if stack_status['Stacks'][0]['StackStatus'] in ['CREATE_COMPLETE', 'UPDATE_COMPLETE', 'UPDATE_ROLLBACK_COMPLETE']:
         try:
             delete_stack = delete_manager_stack(filesystem_id)
             app.log.info(delete_stack)

diff --git a/source/web/package-lock.json b/source/web/package-lock.json
diff --git a/source/web/package.json b/source/web/package.json
@@ -56,12 +56,14 @@
     "fast-xml-parser": "4.4.1",
     "postcss": "8.4.31",
     "axios": "0.28.0",
-    "cookie": "0.7.0"
+    "cookie": "0.7.0",
+    "cross-spawn": "^7.0.6"
   },
   "resolutions": {
     "fast-xml-parser": "4.4.1",
     "postcss": "8.4.31",
     "axios": "0.28.0",
-    "cookie": "0.7.0"
+    "cookie": "0.7.0",
+    "cross-spawn": "^7.0.6"
   }
 }
diff --git a/test/unit/api/service_responses.py b/test/unit/api/service_responses.py
@@ -181,7 +181,7 @@
                 ],
                 'MonitoringTimeInMinutes': 123
             },
-            'StackStatus': 'CREATE_COMPLETE',
+            'StackStatus': 'UPDATE_COMPLETE',
             'StackStatusReason': 'string',
             'DisableRollback': True,
             'NotificationARNs': [