Skip to content

Commit 5b85e4f

Browse files
larkeelarkee
committed
style: fix lint
1 parent 4870917 commit 5b85e4f

File tree

6 files changed

+88
-69
lines changed

6 files changed

+88
-69
lines changed

‎google/cloud/spanner_v1/backup.py

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,13 @@ class Backup(object):
7070
"""
7171

7272
def __init__(
73-
self, backup_id, instance, database="", expire_time=None, version_time=None, encryption_config=None
73+
self,
74+
backup_id,
75+
instance,
76+
database="",
77+
expire_time=None,
78+
version_time=None,
79+
encryption_config=None,
7480
):
7581
self.backup_id = backup_id
7682
self._instance = instance
@@ -253,10 +259,7 @@ def create(self):
253259
encryption_config=self._encryption_config,
254260
)
255261

256-
future = api.create_backup(
257-
request=request,
258-
metadata=metadata,
259-
)
262+
future = api.create_backup(request=request, metadata=metadata,)
260263
return future
261264

262265
def exists(self):

‎google/cloud/spanner_v1/database.py

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
import copy
1818
import functools
1919
import grpc
20+
import logging
2021
import re
2122
import threading
2223

@@ -117,13 +118,13 @@ class Database(object):
117118
_spanner_api = None
118119

119120
def __init__(
120-
self,
121-
database_id,
122-
instance,
123-
ddl_statements=(),
124-
pool=None,
125-
logger=None,
126-
encryption_config=None,
121+
self,
122+
database_id,
123+
instance,
124+
ddl_statements=(),
125+
pool=None,
126+
logger=None,
127+
encryption_config=None,
127128
):
128129
self.database_id = database_id
129130
self._instance = instance
@@ -627,17 +628,16 @@ def restore(self, source):
627628
api = self._instance._client.database_admin_api
628629
metadata = _metadata_with_prefix(self.name)
629630
if type(self._encryption_config) == dict:
630-
self._encryption_config = RestoreDatabaseEncryptionConfig(**self._encryption_config)
631+
self._encryption_config = RestoreDatabaseEncryptionConfig(
632+
**self._encryption_config
633+
)
631634
request = RestoreDatabaseRequest(
632635
parent=self._instance.name,
633636
database_id=self.database_id,
634637
backup=source.name,
635-
encryption_config=self._encryption_config
636-
)
637-
future = api.restore_database(
638-
request=request,
639-
metadata=metadata,
638+
encryption_config=self._encryption_config,
640639
)
640+
future = api.restore_database(request=request, metadata=metadata,)
641641
return future
642642

643643
def is_ready(self):

‎google/cloud/spanner_v1/instance.py

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,14 @@ def delete(self):
357357

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

360-
def database(self, database_id, ddl_statements=(), pool=None, logger=None, encryption_config=None):
360+
def database(
361+
self,
362+
database_id,
363+
ddl_statements=(),
364+
pool=None,
365+
logger=None,
366+
encryption_config=None,
367+
):
361368
"""Factory to create a database within this instance.
362369
363370
:type database_id: str
@@ -390,9 +397,6 @@ def database(self, database_id, ddl_statements=(), pool=None, logger=None, encry
390397
:rtype: :class:`~google.cloud.spanner_v1.database.Database`
391398
:returns: a database owned by this instance.
392399
"""
393-
return Database(
394-
database_id, self, ddl_statements=ddl_statements, pool=pool, logger=logger
395-
)
396400
return Database(
397401
database_id,
398402
self,
@@ -426,7 +430,14 @@ def list_databases(self, page_size=None):
426430
)
427431
return page_iter
428432

429-
def backup(self, backup_id, database="", expire_time=None, version_time=None, encryption_config=None):
433+
def backup(
434+
self,
435+
backup_id,
436+
database="",
437+
expire_time=None,
438+
version_time=None,
439+
encryption_config=None,
440+
):
430441
"""Factory to create a backup within this instance.
431442
432443
:type backup_id: str
@@ -472,7 +483,7 @@ def backup(self, backup_id, database="", expire_time=None, version_time=None, en
472483
database=database,
473484
expire_time=expire_time,
474485
version_time=version_time,
475-
encryption_config=encryption_config
486+
encryption_config=encryption_config,
476487
)
477488

478489
def list_backups(self, filter_="", page_size=None):

‎tests/unit/test_backup.py

Lines changed: 17 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -63,19 +63,20 @@ def test_ctor_defaults(self):
6363

6464
def test_ctor_non_defaults(self):
6565
from google.cloud.spanner_admin_database_v1 import CreateBackupEncryptionConfig
66+
6667
instance = _Instance(self.INSTANCE_NAME)
6768
timestamp = self._make_timestamp()
6869

6970
encryption_config = CreateBackupEncryptionConfig(
7071
encryption_type=CreateBackupEncryptionConfig.EncryptionType.CUSTOMER_MANAGED_ENCRYPTION,
71-
kms_key_name="key_name"
72+
kms_key_name="key_name",
7273
)
7374
backup = self._make_one(
7475
self.BACKUP_ID,
7576
instance,
7677
database=self.DATABASE_NAME,
7778
expire_time=timestamp,
78-
encryption_config=encryption_config
79+
encryption_config=encryption_config,
7980
)
8081

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

8889
def test_ctor_w_encryption_config_dict(self):
8990
from google.cloud.spanner_admin_database_v1 import CreateBackupEncryptionConfig
91+
9092
instance = _Instance(self.INSTANCE_NAME)
9193
timestamp = self._make_timestamp()
9294

93-
encryption_config = {
94-
"encryption_type": 3,
95-
"kms_key_name": "key_name"
96-
}
95+
encryption_config = {"encryption_type": 3, "kms_key_name": "key_name"}
9796
backup = self._make_one(
9897
self.BACKUP_ID,
9998
instance,
10099
database=self.DATABASE_NAME,
101100
expire_time=timestamp,
102-
encryption_config=encryption_config
101+
encryption_config=encryption_config,
103102
)
104103
expected_encryption_config = CreateBackupEncryptionConfig(**encryption_config)
105104

@@ -222,7 +221,7 @@ def test_encryption_config_property(self):
222221
backup = self._make_one(self.BACKUP_ID, instance)
223222
expected = backup._encryption_config = CreateBackupEncryptionConfig(
224223
encryption_type=CreateBackupEncryptionConfig.EncryptionType.CUSTOMER_MANAGED_ENCRYPTION,
225-
kms_key_name="kms_key_name"
224+
kms_key_name="kms_key_name",
226225
)
227226
self.assertEqual(backup.encryption_config, expected)
228227

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

250249
request = CreateBackupRequest(
251-
parent=self.INSTANCE_NAME,
252-
backup_id=self.BACKUP_ID,
253-
backup=backup_pb,
250+
parent=self.INSTANCE_NAME, backup_id=self.BACKUP_ID, backup=backup_pb,
254251
)
255252

256253
api.create_backup.assert_called_once_with(
257-
request=request,
258-
metadata=[("google-cloud-resource-prefix", backup.name)],
254+
request=request, metadata=[("google-cloud-resource-prefix", backup.name)],
259255
)
260256

261257
def test_create_already_exists(self):
@@ -279,14 +275,11 @@ def test_create_already_exists(self):
279275
backup.create()
280276

281277
request = CreateBackupRequest(
282-
parent=self.INSTANCE_NAME,
283-
backup_id=self.BACKUP_ID,
284-
backup=backup_pb,
278+
parent=self.INSTANCE_NAME, backup_id=self.BACKUP_ID, backup=backup_pb,
285279
)
286280

287281
api.create_backup.assert_called_once_with(
288-
request=request,
289-
metadata=[("google-cloud-resource-prefix", backup.name)],
282+
request=request, metadata=[("google-cloud-resource-prefix", backup.name)],
290283
)
291284

292285
def test_create_instance_not_found(self):
@@ -310,14 +303,11 @@ def test_create_instance_not_found(self):
310303
backup.create()
311304

312305
request = CreateBackupRequest(
313-
parent=self.INSTANCE_NAME,
314-
backup_id=self.BACKUP_ID,
315-
backup=backup_pb,
306+
parent=self.INSTANCE_NAME, backup_id=self.BACKUP_ID, backup=backup_pb,
316307
)
317308

318309
api.create_backup.assert_called_once_with(
319-
request=request,
320-
metadata=[("google-cloud-resource-prefix", backup.name)],
310+
request=request, metadata=[("google-cloud-resource-prefix", backup.name)],
321311
)
322312

323313
def test_create_expire_time_not_set(self):
@@ -352,17 +342,14 @@ def test_create_success(self):
352342
version_timestamp = datetime.utcnow() - timedelta(minutes=5)
353343
version_timestamp = version_timestamp.replace(tzinfo=UTC)
354344
expire_timestamp = self._make_timestamp()
355-
encryption_config = {
356-
"encryption_type": 3,
357-
"kms_key_name": "key_name"
358-
}
345+
encryption_config = {"encryption_type": 3, "kms_key_name": "key_name"}
359346
backup = self._make_one(
360347
self.BACKUP_ID,
361348
instance,
362349
database=self.DATABASE_NAME,
363350
expire_time=expire_timestamp,
364351
version_time=version_timestamp,
365-
encryption_config=encryption_config
352+
encryption_config=encryption_config,
366353
)
367354

368355
backup_pb = Backup(
@@ -379,12 +366,11 @@ def test_create_success(self):
379366
parent=self.INSTANCE_NAME,
380367
backup_id=self.BACKUP_ID,
381368
backup=backup_pb,
382-
encryption_config=expected_encryption_config
369+
encryption_config=expected_encryption_config,
383370
)
384371

385372
api.create_backup.assert_called_once_with(
386-
request=request,
387-
metadata=[("google-cloud-resource-prefix", backup.name)],
373+
request=request, metadata=[("google-cloud-resource-prefix", backup.name)],
388374
)
389375

390376
def test_exists_grpc_error(self):

‎tests/unit/test_database.py

Lines changed: 28 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -529,7 +529,11 @@ def test_create_success(self):
529529
pool = _Pool()
530530
encryption_config = EncryptionConfig(kms_key_name="kms_key_name")
531531
database = self._make_one(
532-
self.DATABASE_ID, instance, ddl_statements=DDL_STATEMENTS, pool=pool, encryption_config=encryption_config
532+
self.DATABASE_ID,
533+
instance,
534+
ddl_statements=DDL_STATEMENTS,
535+
pool=pool,
536+
encryption_config=encryption_config,
533537
)
534538

535539
future = database.create()
@@ -561,7 +565,11 @@ def test_create_success_w_encryption_config_dict(self):
561565
pool = _Pool()
562566
encryption_config = {"kms_key_name": "kms_key_name"}
563567
database = self._make_one(
564-
self.DATABASE_ID, instance, ddl_statements=DDL_STATEMENTS, pool=pool, encryption_config=encryption_config
568+
self.DATABASE_ID,
569+
instance,
570+
ddl_statements=DDL_STATEMENTS,
571+
pool=pool,
572+
encryption_config=encryption_config,
565573
)
566574

567575
future = database.create()
@@ -1245,7 +1253,9 @@ def test_restore_not_found(self):
12451253
)
12461254

12471255
def test_restore_success(self):
1248-
from google.cloud.spanner_admin_database_v1 import RestoreDatabaseEncryptionConfig
1256+
from google.cloud.spanner_admin_database_v1 import (
1257+
RestoreDatabaseEncryptionConfig,
1258+
)
12491259
from google.cloud.spanner_admin_database_v1 import RestoreDatabaseRequest
12501260

12511261
op_future = object()
@@ -1256,9 +1266,11 @@ def test_restore_success(self):
12561266
pool = _Pool()
12571267
encryption_config = RestoreDatabaseEncryptionConfig(
12581268
encryption_type=RestoreDatabaseEncryptionConfig.EncryptionType.CUSTOMER_MANAGED_ENCRYPTION,
1259-
kms_key_name="kms_key_name"
1269+
kms_key_name="kms_key_name",
1270+
)
1271+
database = self._make_one(
1272+
self.DATABASE_ID, instance, pool=pool, encryption_config=encryption_config
12601273
)
1261-
database = self._make_one(self.DATABASE_ID, instance, pool=pool, encryption_config=encryption_config)
12621274
backup = _Backup(self.BACKUP_NAME)
12631275

12641276
future = database.restore(backup)
@@ -1269,7 +1281,7 @@ def test_restore_success(self):
12691281
parent=self.INSTANCE_NAME,
12701282
database_id=self.DATABASE_ID,
12711283
backup=self.BACKUP_NAME,
1272-
encryption_config=encryption_config
1284+
encryption_config=encryption_config,
12731285
)
12741286

12751287
api.restore_database.assert_called_once_with(
@@ -1278,7 +1290,9 @@ def test_restore_success(self):
12781290
)
12791291

12801292
def test_restore_success_w_encryption_config_dict(self):
1281-
from google.cloud.spanner_admin_database_v1 import RestoreDatabaseEncryptionConfig
1293+
from google.cloud.spanner_admin_database_v1 import (
1294+
RestoreDatabaseEncryptionConfig,
1295+
)
12821296
from google.cloud.spanner_admin_database_v1 import RestoreDatabaseRequest
12831297

12841298
op_future = object()
@@ -1288,10 +1302,12 @@ def test_restore_success_w_encryption_config_dict(self):
12881302
instance = _Instance(self.INSTANCE_NAME, client=client)
12891303
pool = _Pool()
12901304
encryption_config = {
1291-
'encryption_type': RestoreDatabaseEncryptionConfig.EncryptionType.CUSTOMER_MANAGED_ENCRYPTION,
1292-
'kms_key_name': 'kms_key_name'
1305+
"encryption_type": RestoreDatabaseEncryptionConfig.EncryptionType.CUSTOMER_MANAGED_ENCRYPTION,
1306+
"kms_key_name": "kms_key_name",
12931307
}
1294-
database = self._make_one(self.DATABASE_ID, instance, pool=pool, encryption_config=encryption_config)
1308+
database = self._make_one(
1309+
self.DATABASE_ID, instance, pool=pool, encryption_config=encryption_config
1310+
)
12951311
backup = _Backup(self.BACKUP_NAME)
12961312

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

13011317
expected_encryption_config = RestoreDatabaseEncryptionConfig(
13021318
encryption_type=RestoreDatabaseEncryptionConfig.EncryptionType.CUSTOMER_MANAGED_ENCRYPTION,
1303-
kms_key_name="kms_key_name"
1319+
kms_key_name="kms_key_name",
13041320
)
13051321
expected_request = RestoreDatabaseRequest(
13061322
parent=self.INSTANCE_NAME,
13071323
database_id=self.DATABASE_ID,
13081324
backup=self.BACKUP_NAME,
1309-
encryption_config=expected_encryption_config
1325+
encryption_config=expected_encryption_config,
13101326
)
13111327

13121328
api.restore_database.assert_called_once_with(

‎tests/unit/test_instance.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -618,11 +618,14 @@ def test_backup_factory_explicit(self):
618618
timestamp = datetime.datetime.utcnow().replace(tzinfo=UTC)
619619
encryption_config = CreateBackupEncryptionConfig(
620620
encryption_type=CreateBackupEncryptionConfig.EncryptionType.CUSTOMER_MANAGED_ENCRYPTION,
621-
kms_key_name="kms_key_name"
621+
kms_key_name="kms_key_name",
622622
)
623623

624624
backup = instance.backup(
625-
BACKUP_ID, database=DATABASE_NAME, expire_time=timestamp, encryption_config=encryption_config
625+
BACKUP_ID,
626+
database=DATABASE_NAME,
627+
expire_time=timestamp,
628+
encryption_config=encryption_config,
626629
)
627630

628631
self.assertIsInstance(backup, Backup)

0 commit comments

Comments
 (0)