Implement full Database object for Glue get_database() - fix for #3571. (#3572)

* implement potential fix for #3571.

* freeze_time decorator not used in TEST_SERVER_MODE

tests/test_glue/fixtures/datacatalog.py

@@ -53,3 +53,16 @@ PARTITION_INPUT = {
     # 'TableName': 'source_table',
     # 'Values': ['2018-06-26'],
 }
+
+DATABASE_INPUT = {
+    "Name": "testdatabase",
+    "Description": "a testdatabase",
+    "LocationUri": "",
+    "Parameters": {},
+    "CreateTableDefaultPermissions": [
+        {
+            "Principal": {"DataLakePrincipalIdentifier": "a_fake_owner"},
+            "Permissions": ["ALL"],
+        },
+    ],
+}

tests/test_glue/helpers.py

@@ -2,11 +2,22 @@ from __future__ import unicode_literals
 
 import copy
 
-from .fixtures.datacatalog import TABLE_INPUT, PARTITION_INPUT
+from .fixtures.datacatalog import TABLE_INPUT, PARTITION_INPUT, DATABASE_INPUT
 
 
-def create_database(client, database_name):
-    return client.create_database(DatabaseInput={"Name": database_name})
+def create_database_input(database_name):
+    database_input = copy.deepcopy(DATABASE_INPUT)
+    database_input["Name"] = database_name
+    database_input["LocationUri"] = "s3://my-bucket/{database_name}".format(
+        database_name=database_name
+    )
+    return database_input
+
+
+def create_database(client, database_name, database_input=None):
+    if database_input is None:
+        database_input = create_database_input(database_name)
+    return client.create_database(DatabaseInput=database_input)
 
 
 def get_database(client, database_name):

tests/test_glue/test_datacatalog.py

@@ -9,21 +9,37 @@ from botocore.client import ClientError
 
 from datetime import datetime
 import pytz
+from freezegun import freeze_time
 
-from moto import mock_glue
+from moto import mock_glue, settings
 from . import helpers
 
 
+FROZEN_CREATE_TIME = datetime(2015, 1, 1, 0, 0, 0)
+
+
 @mock_glue
+@freeze_time(FROZEN_CREATE_TIME)
 def test_create_database():
     client = boto3.client("glue", region_name="us-east-1")
     database_name = "myspecialdatabase"
-    helpers.create_database(client, database_name)
+    database_input = helpers.create_database_input(database_name)
+    helpers.create_database(client, database_name, database_input)
 
     response = helpers.get_database(client, database_name)
     database = response["Database"]
 
-    database.should.equal({"Name": database_name})
+    database.get("Name").should.equal(database_name)
+    database.get("Description").should.equal(database_input.get("Description"))
+    database.get("LocationUri").should.equal(database_input.get("LocationUri"))
+    database.get("Parameters").should.equal(database_input.get("Parameters"))
+    if not settings.TEST_SERVER_MODE:
+        database.get("CreateTime").should.equal(FROZEN_CREATE_TIME)
+    database.get("CreateTableDefaultPermissions").should.equal(
+        database_input.get("CreateTableDefaultPermissions")
+    )
+    database.get("TargetDatabase").should.equal(database_input.get("TargetDatabase"))
+    database.get("CatalogId").should.equal(database_input.get("CatalogId"))
 
 
 @mock_glue
@@ -64,15 +80,15 @@ def test_get_databases_several_items():
     client = boto3.client("glue", region_name="us-east-1")
     database_name_1, database_name_2 = "firstdatabase", "seconddatabase"
 
-    helpers.create_database(client, database_name_1)
-    helpers.create_database(client, database_name_2)
+    helpers.create_database(client, database_name_1, {"Name": database_name_1})
+    helpers.create_database(client, database_name_2, {"Name": database_name_2})
 
     database_list = sorted(
         client.get_databases()["DatabaseList"], key=lambda x: x["Name"]
     )
     database_list.should.have.length_of(2)
-    database_list[0].should.equal({"Name": database_name_1})
-    database_list[1].should.equal({"Name": database_name_2})
+    database_list[0]["Name"].should.equal(database_name_1)
+    database_list[1]["Name"].should.equal(database_name_2)
 
 
 @mock_glue