From 281bd79c900ab7c01d9cca13aef64f865c18f29e Mon Sep 17 00:00:00 2001
From: Ryan McGinty <rpmcginty@users.noreply.github.com>
Date: Sat, 18 Nov 2023 12:09:06 -0800
Subject: [PATCH] EFS: Add support for describing access points using File
 system ID filter (#7043)

---
 moto/efs/models.py                   | 12 +++++++++++-
 moto/efs/responses.py                |  5 ++++-
 tests/test_efs/test_access_points.py | 24 ++++++++++++++++++++++++
 3 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/moto/efs/models.py b/moto/efs/models.py
index 3512465d2..20b1e7aca 100644
--- a/moto/efs/models.py
+++ b/moto/efs/models.py
@@ -698,7 +698,11 @@ class EFSBackend(BaseBackend):
         self.access_points[access_point.access_point_id] = access_point
         return access_point
 
-    def describe_access_points(self, access_point_id: str) -> List[AccessPoint]:
+    def describe_access_points(
+        self,
+        access_point_id: Optional[str],
+        file_system_id: Optional[str],
+    ) -> List[AccessPoint]:
         """
         Pagination is not yet implemented
         """
@@ -706,6 +710,12 @@ class EFSBackend(BaseBackend):
             if access_point_id not in self.access_points:
                 raise AccessPointNotFound(access_point_id)
             return [self.access_points[access_point_id]]
+        elif file_system_id:
+            return [
+                access_point
+                for access_point in self.access_points.values()
+                if access_point.file_system_id == file_system_id
+            ]
         return list(self.access_points.values())
 
     def delete_access_point(self, access_point_id: str) -> None:
diff --git a/moto/efs/responses.py b/moto/efs/responses.py
index c2b4f4412..44d3613b9 100644
--- a/moto/efs/responses.py
+++ b/moto/efs/responses.py
@@ -170,7 +170,10 @@ class EFSResponse(BaseResponse):
 
     def describe_access_points(self) -> TYPE_RESPONSE:
         access_point_id = self._get_param("AccessPointId")
-        access_points = self.efs_backend.describe_access_points(access_point_id)
+        file_system_id = self._get_param("FileSystemId")
+        access_points = self.efs_backend.describe_access_points(
+            access_point_id, file_system_id
+        )
         resp = [ap.info_json() for ap in access_points]
         return json.dumps({"AccessPoints": resp}), {"Content-Type": "application/json"}
 
diff --git a/tests/test_efs/test_access_points.py b/tests/test_efs/test_access_points.py
index be783a75c..62f068d12 100644
--- a/tests/test_efs/test_access_points.py
+++ b/tests/test_efs/test_access_points.py
@@ -100,6 +100,30 @@ def test_describe_access_points__multiple(efs, file_system):
     assert len(resp["AccessPoints"]) == 2
 
 
+def test_describe_access_points__filters(efs):
+    fs_id1 = efs.create_file_system(CreationToken="foobarbaz")["FileSystemId"]
+    fs_id2 = efs.create_file_system(CreationToken="bazbarfoo")["FileSystemId"]
+
+    ap_id1 = efs.create_access_point(ClientToken="ct", FileSystemId=fs_id1)[
+        "AccessPointId"
+    ]
+    ap_id2 = efs.create_access_point(ClientToken="ct", FileSystemId=fs_id2)[
+        "AccessPointId"
+    ]
+
+    resp = efs.describe_access_points(FileSystemId=fs_id1)
+    assert len(resp["AccessPoints"]) == 1
+    assert resp.get("NextToken") is None
+    assert resp["AccessPoints"][0]["FileSystemId"] == fs_id1
+    assert resp["AccessPoints"][0]["AccessPointId"] == ap_id1
+
+    resp = efs.describe_access_points(AccessPointId=ap_id2)
+    assert len(resp["AccessPoints"]) == 1
+    assert resp.get("NextToken") is None
+    assert resp["AccessPoints"][0]["FileSystemId"] == fs_id2
+    assert resp["AccessPoints"][0]["AccessPointId"] == ap_id2
+
+
 def test_delete_access_points(efs, file_system):
     fs_id = file_system["FileSystemId"]