From 77f0a61c9f89202ae09bb7c5ed1e325139ffc516 Mon Sep 17 00:00:00 2001 From: TheDooner64 Date: Tue, 10 Jul 2018 13:50:47 -0400 Subject: [PATCH] Add scaffolding for Glue service, including create_database and get_database for the Glue Data Catalog --- moto/__init__.py | 1 + moto/glue/__init__.py | 5 +++++ moto/glue/exceptions.py | 9 ++++++++ moto/glue/models.py | 27 ++++++++++++++++++++++++ moto/glue/responses.py | 27 ++++++++++++++++++++++++ moto/glue/urls.py | 11 ++++++++++ moto/glue/utils.py | 1 + tests/test_glue/test_datacatalog.py | 30 +++++++++++++++++++++++++++ tests/test_s3/test_s3_storageclass.py | 3 --- tests/test_s3/test_s3_utils.py | 1 - 10 files changed, 111 insertions(+), 4 deletions(-) create mode 100644 moto/glue/__init__.py create mode 100644 moto/glue/exceptions.py create mode 100644 moto/glue/models.py create mode 100644 moto/glue/responses.py create mode 100644 moto/glue/urls.py create mode 100644 moto/glue/utils.py create mode 100644 tests/test_glue/test_datacatalog.py diff --git a/moto/__init__.py b/moto/__init__.py index 0ce5e54d1..e5881cfca 100644 --- a/moto/__init__.py +++ b/moto/__init__.py @@ -24,6 +24,7 @@ from .elbv2 import mock_elbv2 # flake8: noqa from .emr import mock_emr, mock_emr_deprecated # flake8: noqa from .events import mock_events # flake8: noqa from .glacier import mock_glacier, mock_glacier_deprecated # flake8: noqa +from .glue import mock_glue # flake8: noqa from .iam import mock_iam, mock_iam_deprecated # flake8: noqa from .kinesis import mock_kinesis, mock_kinesis_deprecated # flake8: noqa from .kms import mock_kms, mock_kms_deprecated # flake8: noqa diff --git a/moto/glue/__init__.py b/moto/glue/__init__.py new file mode 100644 index 000000000..6b1f13326 --- /dev/null +++ b/moto/glue/__init__.py @@ -0,0 +1,5 @@ +from __future__ import unicode_literals +from .models import glue_backend + +glue_backends = {"global": glue_backend} +mock_glue = glue_backend.decorator diff --git a/moto/glue/exceptions.py b/moto/glue/exceptions.py new file mode 100644 index 000000000..0c8760f18 --- /dev/null +++ b/moto/glue/exceptions.py @@ -0,0 +1,9 @@ +from __future__ import unicode_literals +from moto.core.exceptions import RESTError + + +class GlueClientError(RESTError): + + def __init__(self, *args, **kwargs): + kwargs.setdefault('template', 'single_error') + super(GlueClientError, self).__init__(*args, **kwargs) diff --git a/moto/glue/models.py b/moto/glue/models.py new file mode 100644 index 000000000..55cd46bcb --- /dev/null +++ b/moto/glue/models.py @@ -0,0 +1,27 @@ +from __future__ import unicode_literals + +from moto.core import BaseBackend, BaseModel +from moto.compat import OrderedDict + + +class GlueBackend(BaseBackend): + + def __init__(self): + self.databases = OrderedDict() + + def create_database(self, database_name): + database = FakeDatabase(database_name) + self.databases[database_name] = database + return database + + def get_database(self, database_name): + return self.databases[database_name] + + +class FakeDatabase(BaseModel): + + def __init__(self, database_name): + self.name = database_name + + +glue_backend = GlueBackend() diff --git a/moto/glue/responses.py b/moto/glue/responses.py new file mode 100644 index 000000000..f3ef6eb4d --- /dev/null +++ b/moto/glue/responses.py @@ -0,0 +1,27 @@ +from __future__ import unicode_literals + +import json + +from moto.core.responses import BaseResponse +from .models import glue_backend + + +class GlueResponse(BaseResponse): + + @property + def glue_backend(self): + return glue_backend + + @property + def parameters(self): + return json.loads(self.body) + + def create_database(self): + database_name = self.parameters['DatabaseInput']['Name'] + self.glue_backend.create_database(database_name) + return "" + + def get_database(self): + database_name = self.parameters.get('Name') + database = self.glue_backend.get_database(database_name) + return json.dumps({'Database': {'Name': database.name}}) diff --git a/moto/glue/urls.py b/moto/glue/urls.py new file mode 100644 index 000000000..f3eaa9cad --- /dev/null +++ b/moto/glue/urls.py @@ -0,0 +1,11 @@ +from __future__ import unicode_literals + +from .responses import GlueResponse + +url_bases = [ + "https?://glue(.*).amazonaws.com" +] + +url_paths = { + '{0}/$': GlueResponse.dispatch +} diff --git a/moto/glue/utils.py b/moto/glue/utils.py new file mode 100644 index 000000000..baffc4882 --- /dev/null +++ b/moto/glue/utils.py @@ -0,0 +1 @@ +from __future__ import unicode_literals diff --git a/tests/test_glue/test_datacatalog.py b/tests/test_glue/test_datacatalog.py new file mode 100644 index 000000000..77ad1c013 --- /dev/null +++ b/tests/test_glue/test_datacatalog.py @@ -0,0 +1,30 @@ +from __future__ import unicode_literals + +import sure # noqa +import boto3 + +from moto import mock_glue + + +def create_database(client, database_name): + return client.create_database( + DatabaseInput={ + 'Name': database_name + } + ) + + +def get_database(client, database_name): + return client.get_database(Name=database_name) + + +@mock_glue +def test_create_database(): + client = boto3.client('glue', region_name='us-east-1') + database_name = 'myspecialdatabase' + create_database(client, database_name) + + response = get_database(client, database_name) + database = response['Database'] + + database.should.equal({'Name': database_name}) diff --git a/tests/test_s3/test_s3_storageclass.py b/tests/test_s3/test_s3_storageclass.py index c4c83a285..2ed966022 100644 --- a/tests/test_s3/test_s3_storageclass.py +++ b/tests/test_s3/test_s3_storageclass.py @@ -101,6 +101,3 @@ def test_s3_default_storage_class(): # tests that the default storage class is still STANDARD list_of_objects["Contents"][0]["StorageClass"].should.equal("STANDARD") - - - diff --git a/tests/test_s3/test_s3_utils.py b/tests/test_s3/test_s3_utils.py index 9cda1f157..d874a0f1e 100644 --- a/tests/test_s3/test_s3_utils.py +++ b/tests/test_s3/test_s3_utils.py @@ -21,7 +21,6 @@ def test_force_ignore_subdomain_for_bucketnames(): os.environ['S3_IGNORE_SUBDOMAIN_BUCKETNAME'] = '1' expect(bucket_name_from_url('https://subdomain.localhost:5000/abc/resource')).should.equal(None) del(os.environ['S3_IGNORE_SUBDOMAIN_BUCKETNAME']) - def test_versioned_key_store():