From a4009e7bd1b733f1b8507b1995a9f206ffefd992 Mon Sep 17 00:00:00 2001
From: Jon Michaelchuck <5964742+jbmchuck@users.noreply.github.com>
Date: Wed, 10 Mar 2021 00:49:50 -0800
Subject: [PATCH] MaxSessionDuration should be included in the list_roles
 response (#3750)

---
 moto/iam/responses.py      |  1 +
 tests/test_iam/test_iam.py | 11 +++++++++++
 2 files changed, 12 insertions(+)

diff --git a/moto/iam/responses.py b/moto/iam/responses.py
index 7c46c23f6..4fbc87fa3 100644
--- a/moto/iam/responses.py
+++ b/moto/iam/responses.py
@@ -1414,6 +1414,7 @@ LIST_ROLES_TEMPLATE = """<ListRolesResponse xmlns="https://iam.amazonaws.com/doc
         <AssumeRolePolicyDocument>{{ role.assume_role_policy_document }}</AssumeRolePolicyDocument>
         <CreateDate>{{ role.created_iso_8601 }}</CreateDate>
         <RoleId>{{ role.id }}</RoleId>
+        <MaxSessionDuration>{{ role.max_session_duration }}</MaxSessionDuration>
         {% if role.permissions_boundary %}
         <PermissionsBoundary>
           <PermissionsBoundaryType>PermissionsBoundaryPolicy</PermissionsBoundaryType>
diff --git a/tests/test_iam/test_iam.py b/tests/test_iam/test_iam.py
index a67f1fc43..8e0a167f7 100644
--- a/tests/test_iam/test_iam.py
+++ b/tests/test_iam/test_iam.py
@@ -4052,6 +4052,17 @@ def test_list_roles_without_description():
     conn.list_roles().get("Roles")[0].should_not.have.key("Description")
 
 
+@mock_iam()
+def test_list_roles_includes_max_session_duration():
+    conn = boto3.client("iam", region_name="us-east-1")
+    conn.create_role(
+        RoleName="my-role", AssumeRolePolicyDocument="some policy",
+    )
+
+    # Ensure the MaxSessionDuration is included in the role listing
+    conn.list_roles().get("Roles")[0].should.have.key("MaxSessionDuration")
+
+
 @mock_iam()
 def test_create_user_with_tags():
     conn = boto3.client("iam", region_name="us-east-1")