Skip to content

Commit

Permalink
style: fix lint
Browse files Browse the repository at this point in the history
  • Loading branch information
@larkee
larkee committed Mar 11, 2021
1 parent 27b5f30 commit 2ca2822
Show file tree
Hide file tree
Showing 6 changed files with 88 additions and 69 deletions.
13 changes: 8 additions & 5 deletions google/cloud/spanner_v1/backup.py
View file
Expand Up @@ -70,7 +70,13 @@ class Backup(object):
"""

def __init__(
self, backup_id, instance, database="", expire_time=None, version_time=None, encryption_config=None
self,
backup_id,
instance,
database="",
expire_time=None,
version_time=None,
encryption_config=None,
):
self.backup_id = backup_id
self._instance = instance
Expand Down Expand Up @@ -253,10 +259,7 @@ def create(self):
encryption_config=self._encryption_config,
)

future = api.create_backup(
request=request,
metadata=metadata,
)
future = api.create_backup(request=request, metadata=metadata,)
return future

def exists(self):
Expand Down
26 changes: 13 additions & 13 deletions google/cloud/spanner_v1/database.py
View file
Expand Up @@ -17,6 +17,7 @@
import copy
import functools
import grpc
import logging
import re
import threading

Expand Down Expand Up @@ -123,13 +124,13 @@ class Database(object):
_spanner_api = None

def __init__(
self,
database_id,
instance,
ddl_statements=(),
pool=None,
logger=None,
encryption_config=None,
self,
database_id,
instance,
ddl_statements=(),
pool=None,
logger=None,
encryption_config=None,
):
self.database_id = database_id
self._instance = instance
Expand Down Expand Up @@ -633,17 +634,16 @@ def restore(self, source):
api = self._instance._client.database_admin_api
metadata = _metadata_with_prefix(self.name)
if type(self._encryption_config) == dict:
self._encryption_config = RestoreDatabaseEncryptionConfig(**self._encryption_config)
self._encryption_config = RestoreDatabaseEncryptionConfig(
**self._encryption_config
)
request = RestoreDatabaseRequest(
parent=self._instance.name,
database_id=self.database_id,
backup=source.name,
encryption_config=self._encryption_config
)
future = api.restore_database(
request=request,
metadata=metadata,
encryption_config=self._encryption_config,
)
future = api.restore_database(request=request, metadata=metadata,)
return future

def is_ready(self):
Expand Down
23 changes: 17 additions & 6 deletions google/cloud/spanner_v1/instance.py
View file
Expand Up @@ -357,7 +357,14 @@ def delete(self):

api.delete_instance(name=self.name, metadata=metadata)

def database(self, database_id, ddl_statements=(), pool=None, logger=None, encryption_config=None):
def database(
self,
database_id,
ddl_statements=(),
pool=None,
logger=None,
encryption_config=None,
):
"""Factory to create a database within this instance.
:type database_id: str
Expand Down Expand Up @@ -390,9 +397,6 @@ def database(self, database_id, ddl_statements=(), pool=None, logger=None, encry
:rtype: :class:`~google.cloud.spanner_v1.database.Database`
:returns: a database owned by this instance.
"""
return Database(
database_id, self, ddl_statements=ddl_statements, pool=pool, logger=logger
)
return Database(
database_id,
self,
Expand Down Expand Up @@ -426,7 +430,14 @@ def list_databases(self, page_size=None):
)
return page_iter

def backup(self, backup_id, database="", expire_time=None, version_time=None, encryption_config=None):
def backup(
self,
backup_id,
database="",
expire_time=None,
version_time=None,
encryption_config=None,
):
"""Factory to create a backup within this instance.
:type backup_id: str
Expand Down Expand Up @@ -472,7 +483,7 @@ def backup(self, backup_id, database="", expire_time=None, version_time=None, en
database=database,
expire_time=expire_time,
version_time=version_time,
encryption_config=encryption_config
encryption_config=encryption_config,
)

def list_backups(self, filter_="", page_size=None):
Expand Down
48 changes: 17 additions & 31 deletions tests/unit/test_backup.py
View file
Expand Up @@ -63,19 +63,20 @@ def test_ctor_defaults(self):

def test_ctor_non_defaults(self):
from google.cloud.spanner_admin_database_v1 import CreateBackupEncryptionConfig

instance = _Instance(self.INSTANCE_NAME)
timestamp = self._make_timestamp()

encryption_config = CreateBackupEncryptionConfig(
encryption_type=CreateBackupEncryptionConfig.EncryptionType.CUSTOMER_MANAGED_ENCRYPTION,
kms_key_name="key_name"
kms_key_name="key_name",
)
backup = self._make_one(
self.BACKUP_ID,
instance,
database=self.DATABASE_NAME,
expire_time=timestamp,
encryption_config=encryption_config
encryption_config=encryption_config,
)

self.assertEqual(backup.backup_id, self.BACKUP_ID)
Expand All @@ -87,19 +88,17 @@ def test_ctor_non_defaults(self):

def test_ctor_w_encryption_config_dict(self):
from google.cloud.spanner_admin_database_v1 import CreateBackupEncryptionConfig

instance = _Instance(self.INSTANCE_NAME)
timestamp = self._make_timestamp()

encryption_config = {
"encryption_type": 3,
"kms_key_name": "key_name"
}
encryption_config = {"encryption_type": 3, "kms_key_name": "key_name"}
backup = self._make_one(
self.BACKUP_ID,
instance,
database=self.DATABASE_NAME,
expire_time=timestamp,
encryption_config=encryption_config
encryption_config=encryption_config,
)
expected_encryption_config = CreateBackupEncryptionConfig(**encryption_config)

Expand Down Expand Up @@ -222,7 +221,7 @@ def test_encryption_config_property(self):
backup = self._make_one(self.BACKUP_ID, instance)
expected = backup._encryption_config = CreateBackupEncryptionConfig(
encryption_type=CreateBackupEncryptionConfig.EncryptionType.CUSTOMER_MANAGED_ENCRYPTION,
kms_key_name="kms_key_name"
kms_key_name="kms_key_name",
)
self.assertEqual(backup.encryption_config, expected)

Expand All @@ -248,14 +247,11 @@ def test_create_grpc_error(self):
backup.create()

request = CreateBackupRequest(
parent=self.INSTANCE_NAME,
backup_id=self.BACKUP_ID,
backup=backup_pb,
parent=self.INSTANCE_NAME, backup_id=self.BACKUP_ID, backup=backup_pb,
)

api.create_backup.assert_called_once_with(
request=request,
metadata=[("google-cloud-resource-prefix", backup.name)],
request=request, metadata=[("google-cloud-resource-prefix", backup.name)],
)

def test_create_already_exists(self):
Expand All @@ -279,14 +275,11 @@ def test_create_already_exists(self):
backup.create()

request = CreateBackupRequest(
parent=self.INSTANCE_NAME,
backup_id=self.BACKUP_ID,
backup=backup_pb,
parent=self.INSTANCE_NAME, backup_id=self.BACKUP_ID, backup=backup_pb,
)

api.create_backup.assert_called_once_with(
request=request,
metadata=[("google-cloud-resource-prefix", backup.name)],
request=request, metadata=[("google-cloud-resource-prefix", backup.name)],
)

def test_create_instance_not_found(self):
Expand All @@ -310,14 +303,11 @@ def test_create_instance_not_found(self):
backup.create()

request = CreateBackupRequest(
parent=self.INSTANCE_NAME,
backup_id=self.BACKUP_ID,
backup=backup_pb,
parent=self.INSTANCE_NAME, backup_id=self.BACKUP_ID, backup=backup_pb,
)

api.create_backup.assert_called_once_with(
request=request,
metadata=[("google-cloud-resource-prefix", backup.name)],
request=request, metadata=[("google-cloud-resource-prefix", backup.name)],
)

def test_create_expire_time_not_set(self):
Expand Down Expand Up @@ -352,17 +342,14 @@ def test_create_success(self):
version_timestamp = datetime.utcnow() - timedelta(minutes=5)
version_timestamp = version_timestamp.replace(tzinfo=UTC)
expire_timestamp = self._make_timestamp()
encryption_config = {
"encryption_type": 3,
"kms_key_name": "key_name"
}
encryption_config = {"encryption_type": 3, "kms_key_name": "key_name"}
backup = self._make_one(
self.BACKUP_ID,
instance,
database=self.DATABASE_NAME,
expire_time=expire_timestamp,
version_time=version_timestamp,
encryption_config=encryption_config
encryption_config=encryption_config,
)

backup_pb = Backup(
Expand All @@ -379,12 +366,11 @@ def test_create_success(self):
parent=self.INSTANCE_NAME,
backup_id=self.BACKUP_ID,
backup=backup_pb,
encryption_config=expected_encryption_config
encryption_config=expected_encryption_config,
)

api.create_backup.assert_called_once_with(
request=request,
metadata=[("google-cloud-resource-prefix", backup.name)],
request=request, metadata=[("google-cloud-resource-prefix", backup.name)],
)

def test_exists_grpc_error(self):
Expand Down
40 changes: 28 additions & 12 deletions tests/unit/test_database.py
View file
Expand Up @@ -529,7 +529,11 @@ def test_create_success(self):
pool = _Pool()
encryption_config = EncryptionConfig(kms_key_name="kms_key_name")
database = self._make_one(
self.DATABASE_ID, instance, ddl_statements=DDL_STATEMENTS, pool=pool, encryption_config=encryption_config
self.DATABASE_ID,
instance,
ddl_statements=DDL_STATEMENTS,
pool=pool,
encryption_config=encryption_config,
)

future = database.create()
Expand Down Expand Up @@ -561,7 +565,11 @@ def test_create_success_w_encryption_config_dict(self):
pool = _Pool()
encryption_config = {"kms_key_name": "kms_key_name"}
database = self._make_one(
self.DATABASE_ID, instance, ddl_statements=DDL_STATEMENTS, pool=pool, encryption_config=encryption_config
self.DATABASE_ID,
instance,
ddl_statements=DDL_STATEMENTS,
pool=pool,
encryption_config=encryption_config,
)

future = database.create()
Expand Down Expand Up @@ -1245,7 +1253,9 @@ def test_restore_not_found(self):
)

def test_restore_success(self):
from google.cloud.spanner_admin_database_v1 import RestoreDatabaseEncryptionConfig
from google.cloud.spanner_admin_database_v1 import (
RestoreDatabaseEncryptionConfig,
)
from google.cloud.spanner_admin_database_v1 import RestoreDatabaseRequest

op_future = object()
Expand All @@ -1256,9 +1266,11 @@ def test_restore_success(self):
pool = _Pool()
encryption_config = RestoreDatabaseEncryptionConfig(
encryption_type=RestoreDatabaseEncryptionConfig.EncryptionType.CUSTOMER_MANAGED_ENCRYPTION,
kms_key_name="kms_key_name"
kms_key_name="kms_key_name",
)
database = self._make_one(
self.DATABASE_ID, instance, pool=pool, encryption_config=encryption_config
)
database = self._make_one(self.DATABASE_ID, instance, pool=pool, encryption_config=encryption_config)
backup = _Backup(self.BACKUP_NAME)

future = database.restore(backup)
Expand All @@ -1269,7 +1281,7 @@ def test_restore_success(self):
parent=self.INSTANCE_NAME,
database_id=self.DATABASE_ID,
backup=self.BACKUP_NAME,
encryption_config=encryption_config
encryption_config=encryption_config,
)

api.restore_database.assert_called_once_with(
Expand All @@ -1278,7 +1290,9 @@ def test_restore_success(self):
)

def test_restore_success_w_encryption_config_dict(self):
from google.cloud.spanner_admin_database_v1 import RestoreDatabaseEncryptionConfig
from google.cloud.spanner_admin_database_v1 import (
RestoreDatabaseEncryptionConfig,
)
from google.cloud.spanner_admin_database_v1 import RestoreDatabaseRequest

op_future = object()
Expand All @@ -1288,10 +1302,12 @@ def test_restore_success_w_encryption_config_dict(self):
instance = _Instance(self.INSTANCE_NAME, client=client)
pool = _Pool()
encryption_config = {
'encryption_type': RestoreDatabaseEncryptionConfig.EncryptionType.CUSTOMER_MANAGED_ENCRYPTION,
'kms_key_name': 'kms_key_name'
"encryption_type": RestoreDatabaseEncryptionConfig.EncryptionType.CUSTOMER_MANAGED_ENCRYPTION,
"kms_key_name": "kms_key_name",
}
database = self._make_one(self.DATABASE_ID, instance, pool=pool, encryption_config=encryption_config)
database = self._make_one(
self.DATABASE_ID, instance, pool=pool, encryption_config=encryption_config
)
backup = _Backup(self.BACKUP_NAME)

future = database.restore(backup)
Expand All @@ -1300,13 +1316,13 @@ def test_restore_success_w_encryption_config_dict(self):

expected_encryption_config = RestoreDatabaseEncryptionConfig(
encryption_type=RestoreDatabaseEncryptionConfig.EncryptionType.CUSTOMER_MANAGED_ENCRYPTION,
kms_key_name="kms_key_name"
kms_key_name="kms_key_name",
)
expected_request = RestoreDatabaseRequest(
parent=self.INSTANCE_NAME,
database_id=self.DATABASE_ID,
backup=self.BACKUP_NAME,
encryption_config=expected_encryption_config
encryption_config=expected_encryption_config,
)

api.restore_database.assert_called_once_with(
Expand Down
7 changes: 5 additions & 2 deletions tests/unit/test_instance.py
View file
Expand Up @@ -618,11 +618,14 @@ def test_backup_factory_explicit(self):
timestamp = datetime.datetime.utcnow().replace(tzinfo=UTC)
encryption_config = CreateBackupEncryptionConfig(
encryption_type=CreateBackupEncryptionConfig.EncryptionType.CUSTOMER_MANAGED_ENCRYPTION,
kms_key_name="kms_key_name"
kms_key_name="kms_key_name",
)

backup = instance.backup(
BACKUP_ID, database=DATABASE_NAME, expire_time=timestamp, encryption_config=encryption_config
BACKUP_ID,
database=DATABASE_NAME,
expire_time=timestamp,
encryption_config=encryption_config,
)

self.assertIsInstance(backup, Backup)
Expand Down

0 comments on commit 2ca2822

Please sign in to comment.