From 069c159492b04202aa06e15bcdd3f1bcd9d93120 Mon Sep 17 00:00:00 2001
From: ngander64 <67654233+ngander64@users.noreply.github.com>
Date: Sat, 11 Jul 2020 03:38:33 -0500
Subject: [PATCH] Always return 'HardExpiry' for account password policy.
 (#3117)

Co-authored-by: Nick B Gander <NGANDER@amfam.com>
---
 moto/iam/responses.py      | 2 --
 tests/test_iam/test_iam.py | 1 +
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/moto/iam/responses.py b/moto/iam/responses.py
index 3a829676..8eb1730e 100644
--- a/moto/iam/responses.py
+++ b/moto/iam/responses.py
@@ -2423,9 +2423,7 @@ GET_ACCOUNT_PASSWORD_POLICY_TEMPLATE = """<GetAccountPasswordPolicyResponse xmln
     <PasswordPolicy>
       <AllowUsersToChangePassword>{{ password_policy.allow_users_to_change_password | lower }}</AllowUsersToChangePassword>
       <ExpirePasswords>{{ password_policy.expire_passwords | lower }}</ExpirePasswords>
-      {% if password_policy.hard_expiry %}
       <HardExpiry>{{ password_policy.hard_expiry | lower }}</HardExpiry>
-      {% endif %}
       {% if password_policy.max_password_age %}
       <MaxPasswordAge>{{ password_policy.max_password_age }}</MaxPasswordAge>
       {% endif %}
diff --git a/tests/test_iam/test_iam.py b/tests/test_iam/test_iam.py
index a749a37e..4ae5ad49 100644
--- a/tests/test_iam/test_iam.py
+++ b/tests/test_iam/test_iam.py
@@ -2608,6 +2608,7 @@ def test_update_account_password_policy():
             "RequireNumbers": False,
             "RequireSymbols": False,
             "RequireUppercaseCharacters": False,
+            "HardExpiry": False,
         }
     )