Skip to content

Commit 6c0bb46

Browse files
dhermesdhermes
authored
Merge pull request #2703 from dhermes/connection-non-public
Making base connection module non-public and making connection attribute non-public
2 parents f5f797a + ac4d87a commit 6c0bb46

File tree

8 files changed

+39
-39
lines changed

8 files changed

+39
-39
lines changed

‎packages/google-cloud-logging/google/cloud/logging/_gax.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535

3636
from google.cloud._helpers import _datetime_to_rfc3339
3737
from google.cloud._helpers import make_secure_channel
38-
from google.cloud.connection import DEFAULT_USER_AGENT
38+
from google.cloud._http import DEFAULT_USER_AGENT
3939
from google.cloud.exceptions import Conflict
4040
from google.cloud.exceptions import NotFound
4141
from google.cloud.iterator import GAXIterator
@@ -531,7 +531,7 @@ def make_gax_logging_api(client):
531531
:returns: A metrics API instance with the proper credentials.
532532
"""
533533
channel = make_secure_channel(
534-
client.connection.credentials, DEFAULT_USER_AGENT,
534+
client._connection.credentials, DEFAULT_USER_AGENT,
535535
LoggingServiceV2Api.SERVICE_ADDRESS)
536536
generated = LoggingServiceV2Api(channel=channel)
537537
return _LoggingAPI(generated, client)
@@ -547,7 +547,7 @@ def make_gax_metrics_api(client):
547547
:returns: A metrics API instance with the proper credentials.
548548
"""
549549
channel = make_secure_channel(
550-
client.connection.credentials, DEFAULT_USER_AGENT,
550+
client._connection.credentials, DEFAULT_USER_AGENT,
551551
MetricsServiceV2Api.SERVICE_ADDRESS)
552552
generated = MetricsServiceV2Api(channel=channel)
553553
return _MetricsAPI(generated, client)
@@ -563,7 +563,7 @@ def make_gax_sinks_api(client):
563563
:returns: A metrics API instance with the proper credentials.
564564
"""
565565
channel = make_secure_channel(
566-
client.connection.credentials, DEFAULT_USER_AGENT,
566+
client._connection.credentials, DEFAULT_USER_AGENT,
567567
ConfigServiceV2Api.SERVICE_ADDRESS)
568568
generated = ConfigServiceV2Api(channel=channel)
569569
return _SinksAPI(generated, client)

‎packages/google-cloud-logging/google/cloud/logging/_http.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@
1616

1717
import functools
1818

19-
from google.cloud import connection as base_connection
19+
from google.cloud import _http
2020
from google.cloud.iterator import HTTPIterator
2121
from google.cloud.logging._helpers import entry_from_resource
2222
from google.cloud.logging.sink import Sink
2323
from google.cloud.logging.metric import Metric
2424

2525

26-
class Connection(base_connection.JSONConnection):
26+
class Connection(_http.JSONConnection):
2727
"""A connection to Google Stackdriver Logging via the JSON REST API.
2828
2929
:type credentials: :class:`oauth2client.client.OAuth2Credentials`
@@ -67,7 +67,7 @@ class _LoggingAPI(object):
6767

6868
def __init__(self, client):
6969
self._client = client
70-
self._connection = client.connection
70+
self._connection = client._connection
7171

7272
def list_entries(self, projects, filter_=None, order_by=None,
7373
page_size=None, page_token=None):
@@ -191,7 +191,7 @@ class _SinksAPI(object):
191191
"""
192192
def __init__(self, client):
193193
self._client = client
194-
self._connection = client.connection
194+
self._connection = client._connection
195195

196196
def list_sinks(self, project, page_size=None, page_token=None):
197197
"""List sinks for the project associated with this client.
@@ -328,7 +328,7 @@ class _MetricsAPI(object):
328328
"""
329329
def __init__(self, client):
330330
self._client = client
331-
self._connection = client.connection
331+
self._connection = client._connection
332332

333333
def list_metrics(self, project, page_size=None, page_token=None):
334334
"""List metrics for the project associated with this client.

‎packages/google-cloud-logging/google/cloud/logging/handlers/transports/background_thread.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -150,10 +150,10 @@ class BackgroundThreadTransport(Transport):
150150
"""
151151

152152
def __init__(self, client, name):
153-
http = copy.deepcopy(client.connection.http)
154-
http = client.connection.credentials.authorize(http)
153+
http = copy.deepcopy(client._connection.http)
154+
http = client._connection.credentials.authorize(http)
155155
self.client = Client(client.project,
156-
client.connection.credentials,
156+
client._connection.credentials,
157157
http)
158158
logger = self.client.logger(name)
159159
self.worker = _Worker(logger)

‎packages/google-cloud-logging/unit_tests/handlers/transports/test_background_thread.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ class _Client(object):
188188

189189
def __init__(self, project):
190190
self.project = project
191-
self.connection = _Connection()
191+
self._connection = _Connection()
192192

193193
def logger(self, name): # pylint: disable=unused-argument
194194
self._logger = _Logger(name)

‎packages/google-cloud-logging/unit_tests/test__gax.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1312,4 +1312,4 @@ def __init__(self, credentials):
13121312
class _Client(object):
13131313

13141314
def __init__(self, credentials):
1315-
self.connection = _Connection(credentials)
1315+
self._connection = _Connection(credentials)

‎packages/google-cloud-logging/unit_tests/test__http.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ def test_list_entries_no_paging(self):
9494
}
9595
client = Client(project=self.PROJECT, credentials=object(),
9696
use_gax=False)
97-
client.connection = _Connection(RETURNED)
97+
client._connection = _Connection(RETURNED)
9898
api = self._make_one(client)
9999

100100
iterator = api.list_entries([self.PROJECT])
@@ -117,7 +117,7 @@ def test_list_entries_no_paging(self):
117117
self.assertIsNone(entry.severity)
118118
self.assertIsNone(entry.http_request)
119119

120-
called_with = client.connection._called_with
120+
called_with = client._connection._called_with
121121
expected_path = '/%s' % (self.LIST_ENTRIES_PATH,)
122122
self.assertEqual(called_with, {
123123
'method': 'POST',
@@ -172,7 +172,7 @@ def test_list_entries_w_paging(self):
172172
}
173173
client = Client(project=self.PROJECT, credentials=object(),
174174
use_gax=False)
175-
client.connection = _Connection(RETURNED)
175+
client._connection = _Connection(RETURNED)
176176
api = self._make_one(client)
177177

178178
iterator = api.list_entries(
@@ -207,7 +207,7 @@ def test_list_entries_w_paging(self):
207207
self.assertIsNone(entry2.severity)
208208
self.assertIsNone(entry2.http_request)
209209

210-
called_with = client.connection._called_with
210+
called_with = client._connection._called_with
211211
expected_path = '/%s' % (self.LIST_ENTRIES_PATH,)
212212
self.assertEqual(called_with, {
213213
'method': 'POST',
@@ -802,4 +802,4 @@ def _datetime_to_rfc3339_w_nanos(value):
802802
class _Client(object):
803803

804804
def __init__(self, connection):
805-
self.connection = connection
805+
self._connection = connection

‎packages/google-cloud-logging/unit_tests/test_client.py‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ def test_logging_api_wo_gax(self):
4444

4545
client = self._make_one(self.PROJECT, credentials=_Credentials(),
4646
use_gax=False)
47-
conn = client.connection = object()
47+
conn = client._connection = object()
4848
api = client.logging_api
4949

5050
self.assertIsInstance(api, _LoggingAPI)
@@ -98,7 +98,7 @@ def test_sinks_api_wo_gax(self):
9898
with _Monkey(MUT, _USE_GAX=False):
9999
client = self._make_one(self.PROJECT, credentials=_Credentials())
100100

101-
conn = client.connection = object()
101+
conn = client._connection = object()
102102
api = client.sinks_api
103103

104104
self.assertIsInstance(api, _SinksAPI)
@@ -139,7 +139,7 @@ def test_metrics_api_wo_gax(self):
139139
with _Monkey(MUT, _USE_GAX=False):
140140
client = self._make_one(self.PROJECT, credentials=_Credentials())
141141

142-
conn = client.connection = object()
142+
conn = client._connection = object()
143143
api = client.metrics_api
144144

145145
self.assertIsInstance(api, _MetricsAPI)
@@ -205,7 +205,7 @@ def test_list_entries_defaults(self):
205205
'entries': ENTRIES,
206206
'nextPageToken': TOKEN,
207207
}
208-
client.connection = _Connection(returned)
208+
client._connection = _Connection(returned)
209209

210210
iterator = client.list_entries()
211211
page = six.next(iterator.pages)
@@ -223,7 +223,7 @@ def test_list_entries_defaults(self):
223223
self.assertEqual(logger.project, self.PROJECT)
224224
self.assertEqual(token, TOKEN)
225225

226-
called_with = client.connection._called_with
226+
called_with = client._connection._called_with
227227
self.assertEqual(called_with, {
228228
'path': '/entries:list',
229229
'method': 'POST',
@@ -266,7 +266,7 @@ def test_list_entries_explicit(self):
266266
client = self._make_one(self.PROJECT, credentials=_Credentials(),
267267
use_gax=False)
268268
returned = {'entries': ENTRIES}
269-
client.connection = _Connection(returned)
269+
client._connection = _Connection(returned)
270270

271271
iterator = client.list_entries(
272272
projects=[PROJECT1, PROJECT2], filter_=FILTER, order_by=DESCENDING,
@@ -299,7 +299,7 @@ def test_list_entries_explicit(self):
299299

300300
self.assertIs(entries[0].logger, entries[1].logger)
301301

302-
called_with = client.connection._called_with
302+
called_with = client._connection._called_with
303303
self.assertEqual(called_with, {
304304
'path': '/entries:list',
305305
'method': 'POST',
@@ -355,7 +355,7 @@ def test_list_sinks_no_paging(self):
355355
'sinks': SINKS,
356356
'nextPageToken': TOKEN,
357357
}
358-
client.connection = _Connection(returned)
358+
client._connection = _Connection(returned)
359359

360360
iterator = client.list_sinks()
361361
page = six.next(iterator.pages)
@@ -374,7 +374,7 @@ def test_list_sinks_no_paging(self):
374374
self.assertIs(sink.client, client)
375375

376376
# Verify the mocked transport.
377-
called_with = client.connection._called_with
377+
called_with = client._connection._called_with
378378
path = '/projects/%s/sinks' % (self.PROJECT,)
379379
self.assertEqual(called_with, {
380380
'method': 'GET',
@@ -400,7 +400,7 @@ def test_list_sinks_with_paging(self):
400400
returned = {
401401
'sinks': SINKS,
402402
}
403-
client.connection = _Connection(returned)
403+
client._connection = _Connection(returned)
404404

405405
iterator = client.list_sinks(PAGE_SIZE, TOKEN)
406406
sinks = list(iterator)
@@ -418,7 +418,7 @@ def test_list_sinks_with_paging(self):
418418
self.assertIs(sink.client, client)
419419

420420
# Verify the mocked transport.
421-
called_with = client.connection._called_with
421+
called_with = client._connection._called_with
422422
path = '/projects/%s/sinks' % (self.PROJECT,)
423423
self.assertEqual(called_with, {
424424
'method': 'GET',
@@ -470,7 +470,7 @@ def test_list_metrics_no_paging(self):
470470
returned = {
471471
'metrics': metrics,
472472
}
473-
client.connection = _Connection(returned)
473+
client._connection = _Connection(returned)
474474

475475
# Execute request.
476476
iterator = client.list_metrics()
@@ -486,7 +486,7 @@ def test_list_metrics_no_paging(self):
486486
self.assertIs(metric.client, client)
487487

488488
# Verify mocked transport.
489-
called_with = client.connection._called_with
489+
called_with = client._connection._called_with
490490
path = '/projects/%s/metrics' % (self.PROJECT,)
491491
self.assertEqual(called_with, {
492492
'method': 'GET',
@@ -513,7 +513,7 @@ def test_list_metrics_with_paging(self):
513513
'metrics': metrics,
514514
'nextPageToken': next_token,
515515
}
516-
client.connection = _Connection(returned)
516+
client._connection = _Connection(returned)
517517

518518
# Execute request.
519519
iterator = client.list_metrics(page_size, token)
@@ -532,7 +532,7 @@ def test_list_metrics_with_paging(self):
532532
self.assertIs(metric.client, client)
533533

534534
# Verify mocked transport.
535-
called_with = client.connection._called_with
535+
called_with = client._connection._called_with
536536
path = '/projects/%s/metrics' % (self.PROJECT,)
537537
self.assertEqual(called_with, {
538538
'method': 'GET',

‎packages/google-cloud-logging/unit_tests/test_logger.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,7 @@ def test_list_entries_defaults(self):
357357
returned = {
358358
'nextPageToken': TOKEN,
359359
}
360-
client.connection = _Connection(returned)
360+
client._connection = _Connection(returned)
361361

362362
logger = self._make_one(self.LOGGER_NAME, client=client)
363363

@@ -368,7 +368,7 @@ def test_list_entries_defaults(self):
368368

369369
self.assertEqual(len(entries), 0)
370370
self.assertEqual(token, TOKEN)
371-
called_with = client.connection._called_with
371+
called_with = client._connection._called_with
372372
FILTER = 'logName=projects/%s/logs/%s' % (
373373
self.PROJECT, self.LOGGER_NAME)
374374
self.assertEqual(called_with, {
@@ -391,7 +391,7 @@ def test_list_entries_explicit(self):
391391
PAGE_SIZE = 42
392392
client = Client(project=self.PROJECT, credentials=object(),
393393
use_gax=False)
394-
client.connection = _Connection({})
394+
client._connection = _Connection({})
395395
logger = self._make_one(self.LOGGER_NAME, client=client)
396396
iterator = logger.list_entries(
397397
projects=[PROJECT1, PROJECT2], filter_=FILTER, order_by=DESCENDING,
@@ -402,7 +402,7 @@ def test_list_entries_explicit(self):
402402
self.assertEqual(len(entries), 0)
403403
self.assertIsNone(token)
404404
# self.assertEqual(client._listed, LISTED)
405-
called_with = client.connection._called_with
405+
called_with = client._connection._called_with
406406
combined_filter = '%s AND logName=projects/%s/logs/%s' % (
407407
FILTER, self.PROJECT, self.LOGGER_NAME)
408408
self.assertEqual(called_with, {
@@ -721,7 +721,7 @@ class _Client(object):
721721

722722
def __init__(self, project, connection=None):
723723
self.project = project
724-
self.connection = connection
724+
self._connection = connection
725725

726726

727727
class _Bugout(Exception):

0 commit comments

Comments
 (0)