From 311966e28de060e899cb81025a9b1dd85cd08834 Mon Sep 17 00:00:00 2001
From: Steve Pulec <spulec@gmail.com>
Date: Wed, 18 Apr 2018 22:47:02 -0400
Subject: [PATCH] Add IAMDatabaseAuthenticationEnabled and DbiResourceId to RDS
 response. Closes #1465.

---
 moto/rds2/models.py          |  4 ++++
 tests/test_rds2/test_rds2.py | 21 ++++++++++++---------
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/moto/rds2/models.py b/moto/rds2/models.py
index 268ae5af2..29fa95959 100644
--- a/moto/rds2/models.py
+++ b/moto/rds2/models.py
@@ -103,6 +103,8 @@ class Database(BaseModel):
         if not self.option_group_name and self.engine in self.default_option_groups:
             self.option_group_name = self.default_option_groups[self.engine]
         self.character_set_name = kwargs.get('character_set_name', None)
+        self.iam_database_authentication_enabled = False
+        self.dbi_resource_id = "db-M5ENSHXFPU6XHZ4G4ZEI5QIO2U"
         self.tags = kwargs.get('tags', [])
 
     @property
@@ -142,6 +144,7 @@ class Database(BaseModel):
               <MultiAZ>{{ database.multi_az }}</MultiAZ>
               <VpcSecurityGroups/>
               <DBInstanceIdentifier>{{ database.db_instance_identifier }}</DBInstanceIdentifier>
+              <DbiResourceId>{{ database.dbi_resource_id }}</DbiResourceId>
               <PreferredBackupWindow>03:50-04:20</PreferredBackupWindow>
               <PreferredMaintenanceWindow>wed:06:38-wed:07:08</PreferredMaintenanceWindow>
               <ReadReplicaDBInstanceIdentifiers>
@@ -163,6 +166,7 @@ class Database(BaseModel):
               <ReadReplicaSourceDBInstanceIdentifier>{{ database.source_db_identifier }}</ReadReplicaSourceDBInstanceIdentifier>
               {% endif %}
               <Engine>{{ database.engine }}</Engine>
+              <IAMDatabaseAuthenticationEnabled>{{database.iam_database_authentication_enabled }}</IAMDatabaseAuthenticationEnabled>
               <LicenseModel>{{ database.license_model }}</LicenseModel>
               <EngineVersion>{{ database.engine_version }}</EngineVersion>
               <OptionGroupMemberships>
diff --git a/tests/test_rds2/test_rds2.py b/tests/test_rds2/test_rds2.py
index ea0ab378f..d056049b5 100644
--- a/tests/test_rds2/test_rds2.py
+++ b/tests/test_rds2/test_rds2.py
@@ -19,17 +19,20 @@ def test_create_database():
                                        MasterUserPassword='hunter2',
                                        Port=1234,
                                        DBSecurityGroups=["my_sg"])
-    database['DBInstance']['AllocatedStorage'].should.equal(10)
-    database['DBInstance']['DBInstanceClass'].should.equal("db.m1.small")
-    database['DBInstance']['LicenseModel'].should.equal("license-included")
-    database['DBInstance']['MasterUsername'].should.equal("root")
-    database['DBInstance']['DBSecurityGroups'][0][
+    db_instance = database['DBInstance']
+    db_instance['AllocatedStorage'].should.equal(10)
+    db_instance['DBInstanceClass'].should.equal("db.m1.small")
+    db_instance['LicenseModel'].should.equal("license-included")
+    db_instance['MasterUsername'].should.equal("root")
+    db_instance['DBSecurityGroups'][0][
         'DBSecurityGroupName'].should.equal('my_sg')
-    database['DBInstance']['DBInstanceArn'].should.equal(
+    db_instance['DBInstanceArn'].should.equal(
         'arn:aws:rds:us-west-2:1234567890:db:db-master-1')
-    database['DBInstance']['DBInstanceStatus'].should.equal('available')
-    database['DBInstance']['DBName'].should.equal('staging-postgres')
-    database['DBInstance']['DBInstanceIdentifier'].should.equal("db-master-1")
+    db_instance['DBInstanceStatus'].should.equal('available')
+    db_instance['DBName'].should.equal('staging-postgres')
+    db_instance['DBInstanceIdentifier'].should.equal("db-master-1")
+    db_instance['IAMDatabaseAuthenticationEnabled'].should.equal(False)
+    db_instance['DbiResourceId'].should.contain("db-")
 
 
 @mock_rds2