From c134afaf60517c773c6b198427c031d9356825e6 Mon Sep 17 00:00:00 2001
From: Asher Foa <asher@toolchain.com>
Date: Tue, 29 Mar 2022 13:24:48 -0400
Subject: [PATCH] Create & Describe file system APIs return Name property based
 on tags (#4978)

---
 moto/efs/models.py                 | 16 +++++++++++++---
 tests/test_efs/test_file_system.py | 11 +++++++++++
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/moto/efs/models.py b/moto/efs/models.py
index b4d1a2800..c301a3189 100644
--- a/moto/efs/models.py
+++ b/moto/efs/models.py
@@ -168,9 +168,19 @@ class FileSystem(CloudFormationModel):
             for k, v in self.__dict__.items()
             if not k.startswith("_")
         }
-        ret["Tags"] = self._context.list_tags_for_resource(self.file_system_id)
-        ret["SizeInBytes"] = self.size_in_bytes
-        ret["NumberOfMountTargets"] = self.number_of_mount_targets
+        tags = self._context.list_tags_for_resource(self.file_system_id)
+        name = ""
+        for tag in tags:
+            if tag["Key"] == "Name":
+                name = tag["Value"]
+                break
+
+        ret.update(
+            Tags=tags,
+            SizeInBytes=self.size_in_bytes,
+            NumberOfMountTargets=self.number_of_mount_targets,
+            Name=name,
+        )
         return ret
 
     def add_mount_target(self, subnet, mount_target):
diff --git a/tests/test_efs/test_file_system.py b/tests/test_efs/test_file_system.py
index 25caeb03e..3f96a1f8a 100644
--- a/tests/test_efs/test_file_system.py
+++ b/tests/test_efs/test_file_system.py
@@ -69,6 +69,8 @@ def test_create_file_system_correct_use(efs):
     assert create_fs_resp["PerformanceMode"] == "generalPurpose"
     assert create_fs_resp["Encrypted"] is False
     assert create_fs_resp["NumberOfMountTargets"] == 0
+    assert create_fs_resp["Name"] == "Test EFS Container"
+
     for key_name in ["Value", "ValueInIA", "ValueInStandard"]:
         assert key_name in create_fs_resp["SizeInBytes"]
         assert create_fs_resp["SizeInBytes"][key_name] == 0
@@ -107,10 +109,12 @@ def test_create_file_system_aws_sample_1(efs):
         "SizeInBytes",
         "Tags",
         "ThroughputMode",
+        "Name",
     }
     assert resp["Tags"] == [{"Key": "Name", "Value": "Test Group1"}]
     assert resp["PerformanceMode"] == "generalPurpose"
     assert resp["Encrypted"]
+    assert resp["Name"] == "Test Group1"
 
     policy_resp = efs.describe_backup_policy(FileSystemId=resp["FileSystemId"])
     assert policy_resp["BackupPolicy"]["Status"] == "ENABLED"
@@ -136,11 +140,13 @@ def test_create_file_system_aws_sample_2(efs):
         "FileSystemArn",
         "NumberOfMountTargets",
         "OwnerId",
+        "Name",
     }
     assert resp["ProvisionedThroughputInMibps"] == 60
     assert resp["AvailabilityZoneId"] == "usw2-az1"
     assert resp["AvailabilityZoneName"] == "us-west-2b"
     assert resp["ThroughputMode"] == "provisioned"
+    assert resp["Name"] == "Test Group1"
 
     policy_resp = efs.describe_backup_policy(FileSystemId=resp["FileSystemId"])
     assert policy_resp["BackupPolicy"]["Status"] == "ENABLED"
@@ -183,6 +189,7 @@ def test_describe_file_systems_using_identifier(efs):
     desc_fs_resp = efs.describe_file_systems(FileSystemId=fs_id)
     desc_fs_resp.should.have.key("FileSystems").length_of(1)
     desc_fs_resp["FileSystems"][0].should.have.key("FileSystemId").equals(fs_id)
+    assert desc_fs_resp["FileSystems"][0]["Name"] == ""
 
 
 def test_describe_file_systems_using_unknown_identifier(efs):
@@ -219,8 +226,10 @@ def test_describe_file_systems_minimal_case(efs):
         "FileSystemArn",
         "NumberOfMountTargets",
         "OwnerId",
+        "Name",
     }
     assert file_system["FileSystemId"] == create_fs_resp["FileSystemId"]
+    assert file_system["Name"] == ""
 
     # Pop out the timestamps and see if the rest of the description is the same.
     create_fs_resp["SizeInBytes"].pop("Timestamp")
@@ -257,11 +266,13 @@ def test_describe_file_systems_aws_create_sample_2(efs):
         "FileSystemArn",
         "NumberOfMountTargets",
         "OwnerId",
+        "Name",
     }
     assert file_system["ProvisionedThroughputInMibps"] == 60
     assert file_system["AvailabilityZoneId"] == "usw2-az1"
     assert file_system["AvailabilityZoneName"] == "us-west-2b"
     assert file_system["ThroughputMode"] == "provisioned"
+    assert file_system["Name"] == "Test Group1"
 
 
 def test_describe_file_systems_paging(efs):