From 91368c4abee9cdca3179dbfc9686eeeb60e0f49f Mon Sep 17 00:00:00 2001 From: Bu Sun Kim Date: Thu, 29 Oct 2020 22:56:19 +0000 Subject: [PATCH 1/8] chore: move manual code to logging_v2 --- google/cloud/logging/__init__.py | 45 +++++++---- google/cloud/logging_v2/__init__.py | 17 ++++ .../cloud/{logging => logging_v2}/_gapic.py | 6 +- .../cloud/{logging => logging_v2}/_helpers.py | 8 +- google/cloud/{logging => logging_v2}/_http.py | 8 +- .../cloud/{logging => logging_v2}/client.py | 32 ++++---- .../cloud/{logging => logging_v2}/entries.py | 2 +- .../handlers/__init__.py | 8 +- .../handlers/_helpers.py | 2 +- .../handlers/app_engine.py | 6 +- .../handlers/container_engine.py | 2 +- .../handlers/handlers.py | 8 +- .../handlers/middleware/__init__.py | 2 +- .../handlers/middleware/request.py | 0 .../handlers/transports/__init__.py | 6 +- .../handlers/transports/background_thread.py | 4 +- .../handlers/transports/base.py | 0 .../handlers/transports/sync.py | 4 +- .../cloud/{logging => logging_v2}/logger.py | 12 +-- .../cloud/{logging => logging_v2}/metric.py | 0 .../cloud/{logging => logging_v2}/resource.py | 0 google/cloud/{logging => logging_v2}/sink.py | 0 tests/system/test_system.py | 10 +-- .../unit/handlers/middleware/test_request.py | 8 +- tests/unit/handlers/test__helpers.py | 16 ++-- tests/unit/handlers/test_app_engine.py | 10 +-- tests/unit/handlers/test_container_engine.py | 2 +- tests/unit/handlers/test_handlers.py | 12 +-- .../transports/test_background_thread.py | 30 +++---- tests/unit/handlers/transports/test_base.py | 2 +- tests/unit/handlers/transports/test_sync.py | 8 +- tests/unit/test__gapic.py | 30 +++---- tests/unit/test__helpers.py | 18 ++--- tests/unit/test__http.py | 34 ++++---- tests/unit/test_client.py | 80 +++++++++---------- tests/unit/test_entries.py | 34 ++++---- tests/unit/test_logger.py | 80 +++++++++---------- tests/unit/test_metric.py | 2 +- tests/unit/test_sink.py | 2 +- 39 files changed, 289 insertions(+), 261 deletions(-) rename google/cloud/{logging => logging_v2}/_gapic.py (99%) rename google/cloud/{logging => logging_v2}/_helpers.py (95%) rename google/cloud/{logging => logging_v2}/_http.py (98%) rename google/cloud/{logging => logging_v2}/client.py (94%) rename google/cloud/{logging => logging_v2}/entries.py (99%) rename google/cloud/{logging => logging_v2}/handlers/__init__.py (71%) rename google/cloud/{logging => logging_v2}/handlers/_helpers.py (96%) rename google/cloud/{logging => logging_v2}/handlers/app_engine.py (95%) rename google/cloud/{logging => logging_v2}/handlers/container_engine.py (96%) rename google/cloud/{logging => logging_v2}/handlers/handlers.py (94%) rename google/cloud/{logging => logging_v2}/handlers/middleware/__init__.py (88%) rename google/cloud/{logging => logging_v2}/handlers/middleware/request.py (100%) rename google/cloud/{logging => logging_v2}/handlers/transports/__init__.py (81%) rename google/cloud/{logging => logging_v2}/handlers/transports/background_thread.py (99%) rename google/cloud/{logging => logging_v2}/handlers/transports/base.py (100%) rename google/cloud/{logging => logging_v2}/handlers/transports/sync.py (94%) rename google/cloud/{logging => logging_v2}/logger.py (97%) rename google/cloud/{logging => logging_v2}/metric.py (100%) rename google/cloud/{logging => logging_v2}/resource.py (100%) rename google/cloud/{logging => logging_v2}/sink.py (100%) diff --git a/google/cloud/logging/__init__.py b/google/cloud/logging/__init__.py index 80de6c4b6..20eab49d7 100644 --- a/google/cloud/logging/__init__.py +++ b/google/cloud/logging/__init__.py @@ -1,4 +1,6 @@ -# Copyright 2016 Google LLC +# -*- coding: utf-8 -*- + +# Copyright 2020 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -11,20 +13,29 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. +# -"""Google Stackdriver Logging API wrapper.""" - - -from pkg_resources import get_distribution - -__version__ = get_distribution("google-cloud-logging").version - -from google.cloud.logging.client import Client - - -ASCENDING = "timestamp asc" -"""Query string to order by ascending timestamps.""" -DESCENDING = "timestamp desc" -"""Query string to order by decending timestamps.""" - -__all__ = ["__version__", "ASCENDING", "Client", "DESCENDING"] +from google.cloud.logging_v2.client import Client +from google.cloud.logging_v2.entries import LogEntry +from google.cloud.logging_v2.entries import TextEntry +from google.cloud.logging_v2.entries import ProtobufEntry +from google.cloud.logging_v2.entries import StructEntry +from google.cloud.logging_v2.logger import Logger +from google.cloud.logging_v2.logger import Batch +from google.cloud.logging_v2.metric import Metric +from google.cloud.logging_v2.sink import Sink +from google.cloud.logging_v2 import handlers + + +__all__ = ( + "Client", + "LogEntry", + "TextEntry", + "ProtobufEntry", + "StructEntry", + "Logger", + "Batch", + "Metric", + "Sink", + "handlers" +) \ No newline at end of file diff --git a/google/cloud/logging_v2/__init__.py b/google/cloud/logging_v2/__init__.py index 964c99572..a0495877d 100644 --- a/google/cloud/logging_v2/__init__.py +++ b/google/cloud/logging_v2/__init__.py @@ -21,6 +21,19 @@ from google.cloud.logging_v2.gapic import metrics_service_v2_client +from pkg_resources import get_distribution + +__version__ = get_distribution("google-cloud-logging").version + +from google.cloud.logging_v2.client import Client + + +ASCENDING = "timestamp asc" +"""Query string to order by ascending timestamps.""" +DESCENDING = "timestamp desc" +"""Query string to order by decending timestamps.""" + + class LoggingServiceV2Client(logging_service_v2_client.LoggingServiceV2Client): __doc__ = logging_service_v2_client.LoggingServiceV2Client.__doc__ enums = enums @@ -42,4 +55,8 @@ class MetricsServiceV2Client(metrics_service_v2_client.MetricsServiceV2Client): "LoggingServiceV2Client", "ConfigServiceV2Client", "MetricsServiceV2Client", + "__version__", + "ASCENDING", + "Client", + "DESCENDING" ) diff --git a/google/cloud/logging/_gapic.py b/google/cloud/logging_v2/_gapic.py similarity index 99% rename from google/cloud/logging/_gapic.py rename to google/cloud/logging_v2/_gapic.py index 32897c088..026db660d 100644 --- a/google/cloud/logging/_gapic.py +++ b/google/cloud/logging_v2/_gapic.py @@ -30,9 +30,9 @@ from google.protobuf.json_format import MessageToDict from google.protobuf.json_format import ParseDict -from google.cloud.logging._helpers import entry_from_resource -from google.cloud.logging.sink import Sink -from google.cloud.logging.metric import Metric +from google.cloud.logging_v2._helpers import entry_from_resource +from google.cloud.logging_v2.sink import Sink +from google.cloud.logging_v2.metric import Metric class _LoggingAPI(object): diff --git a/google/cloud/logging/_helpers.py b/google/cloud/logging_v2/_helpers.py similarity index 95% rename from google/cloud/logging/_helpers.py rename to google/cloud/logging_v2/_helpers.py index 37e890ead..a9e979dc6 100644 --- a/google/cloud/logging/_helpers.py +++ b/google/cloud/logging_v2/_helpers.py @@ -22,10 +22,10 @@ import requests -from google.cloud.logging.entries import LogEntry -from google.cloud.logging.entries import ProtobufEntry -from google.cloud.logging.entries import StructEntry -from google.cloud.logging.entries import TextEntry +from google.cloud.logging_v2.entries import LogEntry +from google.cloud.logging_v2.entries import ProtobufEntry +from google.cloud.logging_v2.entries import StructEntry +from google.cloud.logging_v2.entries import TextEntry try: from google.cloud.logging_v2.gapic.enums import LogSeverity diff --git a/google/cloud/logging/_http.py b/google/cloud/logging_v2/_http.py similarity index 98% rename from google/cloud/logging/_http.py rename to google/cloud/logging_v2/_http.py index deb6b394f..30e45b238 100644 --- a/google/cloud/logging/_http.py +++ b/google/cloud/logging_v2/_http.py @@ -19,10 +19,10 @@ from google.api_core import page_iterator from google.cloud import _http -from google.cloud.logging import __version__ -from google.cloud.logging._helpers import entry_from_resource -from google.cloud.logging.sink import Sink -from google.cloud.logging.metric import Metric +from google.cloud.logging_v2 import __version__ +from google.cloud.logging_v2._helpers import entry_from_resource +from google.cloud.logging_v2.sink import Sink +from google.cloud.logging_v2.metric import Metric class Connection(_http.JSONConnection): diff --git a/google/cloud/logging/client.py b/google/cloud/logging_v2/client.py similarity index 94% rename from google/cloud/logging/client.py rename to google/cloud/logging_v2/client.py index 64d962506..4d2442a7b 100644 --- a/google/cloud/logging/client.py +++ b/google/cloud/logging_v2/client.py @@ -18,7 +18,7 @@ import os try: - from google.cloud.logging import _gapic + from google.cloud.logging_v2 import _gapic except ImportError: # pragma: NO COVER _HAVE_GRPC = False _gapic = None @@ -28,21 +28,21 @@ import google.api_core.client_options from google.cloud.client import ClientWithProject from google.cloud.environment_vars import DISABLE_GRPC -from google.cloud.logging._helpers import _add_defaults_to_filter -from google.cloud.logging._helpers import retrieve_metadata_server -from google.cloud.logging._http import Connection -from google.cloud.logging._http import _LoggingAPI as JSONLoggingAPI -from google.cloud.logging._http import _MetricsAPI as JSONMetricsAPI -from google.cloud.logging._http import _SinksAPI as JSONSinksAPI -from google.cloud.logging.handlers import CloudLoggingHandler -from google.cloud.logging.handlers import AppEngineHandler -from google.cloud.logging.handlers import ContainerEngineHandler -from google.cloud.logging.handlers import setup_logging -from google.cloud.logging.handlers.handlers import EXCLUDED_LOGGER_DEFAULTS - -from google.cloud.logging.logger import Logger -from google.cloud.logging.metric import Metric -from google.cloud.logging.sink import Sink +from google.cloud.logging_v2._helpers import _add_defaults_to_filter +from google.cloud.logging_v2._helpers import retrieve_metadata_server +from google.cloud.logging_v2._http import Connection +from google.cloud.logging_v2._http import _LoggingAPI as JSONLoggingAPI +from google.cloud.logging_v2._http import _MetricsAPI as JSONMetricsAPI +from google.cloud.logging_v2._http import _SinksAPI as JSONSinksAPI +from google.cloud.logging_v2.handlers import CloudLoggingHandler +from google.cloud.logging_v2.handlers import AppEngineHandler +from google.cloud.logging_v2.handlers import ContainerEngineHandler +from google.cloud.logging_v2.handlers import setup_logging +from google.cloud.logging_v2.handlers.handlers import EXCLUDED_LOGGER_DEFAULTS + +from google.cloud.logging_v2.logger import Logger +from google.cloud.logging_v2.metric import Metric +from google.cloud.logging_v2.sink import Sink _DISABLE_GRPC = os.getenv(DISABLE_GRPC, False) diff --git a/google/cloud/logging/entries.py b/google/cloud/logging_v2/entries.py similarity index 99% rename from google/cloud/logging/entries.py rename to google/cloud/logging_v2/entries.py index 3847102dc..6d3b0eef3 100644 --- a/google/cloud/logging/entries.py +++ b/google/cloud/logging_v2/entries.py @@ -22,7 +22,7 @@ from google.protobuf.json_format import MessageToDict from google.protobuf.json_format import Parse -from google.cloud.logging.resource import Resource +from google.cloud.logging_v2.resource import Resource from google.cloud._helpers import _name_from_project_path from google.cloud._helpers import _rfc3339_nanos_to_datetime from google.cloud._helpers import _datetime_to_rfc3339 diff --git a/google/cloud/logging/handlers/__init__.py b/google/cloud/logging_v2/handlers/__init__.py similarity index 71% rename from google/cloud/logging/handlers/__init__.py rename to google/cloud/logging_v2/handlers/__init__.py index 67b96c95e..29ed8f0d1 100644 --- a/google/cloud/logging/handlers/__init__.py +++ b/google/cloud/logging_v2/handlers/__init__.py @@ -14,10 +14,10 @@ """Python :mod:`logging` handlers for Google Cloud Logging.""" -from google.cloud.logging.handlers.app_engine import AppEngineHandler -from google.cloud.logging.handlers.container_engine import ContainerEngineHandler -from google.cloud.logging.handlers.handlers import CloudLoggingHandler -from google.cloud.logging.handlers.handlers import setup_logging +from google.cloud.logging_v2.handlers.app_engine import AppEngineHandler +from google.cloud.logging_v2.handlers.container_engine import ContainerEngineHandler +from google.cloud.logging_v2.handlers.handlers import CloudLoggingHandler +from google.cloud.logging_v2.handlers.handlers import setup_logging __all__ = [ "AppEngineHandler", diff --git a/google/cloud/logging/handlers/_helpers.py b/google/cloud/logging_v2/handlers/_helpers.py similarity index 96% rename from google/cloud/logging/handlers/_helpers.py rename to google/cloud/logging_v2/handlers/_helpers.py index 4bd319a53..e4408a448 100644 --- a/google/cloud/logging/handlers/_helpers.py +++ b/google/cloud/logging_v2/handlers/_helpers.py @@ -22,7 +22,7 @@ except ImportError: # pragma: NO COVER flask = None -from google.cloud.logging.handlers.middleware.request import _get_django_request +from google.cloud.logging_v2.handlers.middleware.request import _get_django_request _DJANGO_TRACE_HEADER = "HTTP_X_CLOUD_TRACE_CONTEXT" _FLASK_TRACE_HEADER = "X_CLOUD_TRACE_CONTEXT" diff --git a/google/cloud/logging/handlers/app_engine.py b/google/cloud/logging_v2/handlers/app_engine.py similarity index 95% rename from google/cloud/logging/handlers/app_engine.py rename to google/cloud/logging_v2/handlers/app_engine.py index d0179fb6d..ceef46f59 100644 --- a/google/cloud/logging/handlers/app_engine.py +++ b/google/cloud/logging_v2/handlers/app_engine.py @@ -21,9 +21,9 @@ import logging import os -from google.cloud.logging.handlers._helpers import get_trace_id -from google.cloud.logging.handlers.transports import BackgroundThreadTransport -from google.cloud.logging.resource import Resource +from google.cloud.logging_v2.handlers._helpers import get_trace_id +from google.cloud.logging_v2.handlers.transports import BackgroundThreadTransport +from google.cloud.logging_v2.resource import Resource _DEFAULT_GAE_LOGGER_NAME = "app" diff --git a/google/cloud/logging/handlers/container_engine.py b/google/cloud/logging_v2/handlers/container_engine.py similarity index 96% rename from google/cloud/logging/handlers/container_engine.py rename to google/cloud/logging_v2/handlers/container_engine.py index 9fe460889..823de0285 100644 --- a/google/cloud/logging/handlers/container_engine.py +++ b/google/cloud/logging_v2/handlers/container_engine.py @@ -21,7 +21,7 @@ import logging.handlers -from google.cloud.logging.handlers._helpers import format_stackdriver_json +from google.cloud.logging_v2.handlers._helpers import format_stackdriver_json class ContainerEngineHandler(logging.StreamHandler): diff --git a/google/cloud/logging/handlers/handlers.py b/google/cloud/logging_v2/handlers/handlers.py similarity index 94% rename from google/cloud/logging/handlers/handlers.py rename to google/cloud/logging_v2/handlers/handlers.py index 111cec8d2..3721f9050 100644 --- a/google/cloud/logging/handlers/handlers.py +++ b/google/cloud/logging_v2/handlers/handlers.py @@ -16,8 +16,8 @@ import logging -from google.cloud.logging.handlers.transports import BackgroundThreadTransport -from google.cloud.logging.logger import _GLOBAL_RESOURCE +from google.cloud.logging_v2.handlers.transports import BackgroundThreadTransport +from google.cloud.logging_v2.logger import _GLOBAL_RESOURCE DEFAULT_LOGGER_NAME = "python" @@ -67,7 +67,7 @@ class CloudLoggingHandler(logging.StreamHandler): import logging import google.cloud.logging - from google.cloud.logging.handlers import CloudLoggingHandler + from google.cloud.logging_v2.handlers import CloudLoggingHandler client = google.cloud.logging.Client() handler = CloudLoggingHandler(client) @@ -135,7 +135,7 @@ def setup_logging( import logging import google.cloud.logging - from google.cloud.logging.handlers import CloudLoggingHandler + from google.cloud.logging_v2.handlers import CloudLoggingHandler client = google.cloud.logging.Client() handler = CloudLoggingHandler(client) diff --git a/google/cloud/logging/handlers/middleware/__init__.py b/google/cloud/logging_v2/handlers/middleware/__init__.py similarity index 88% rename from google/cloud/logging/handlers/middleware/__init__.py rename to google/cloud/logging_v2/handlers/middleware/__init__.py index d8ba3016f..bd32e4a90 100644 --- a/google/cloud/logging/handlers/middleware/__init__.py +++ b/google/cloud/logging_v2/handlers/middleware/__init__.py @@ -12,6 +12,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -from google.cloud.logging.handlers.middleware.request import RequestMiddleware +from google.cloud.logging_v2.handlers.middleware.request import RequestMiddleware __all__ = ["RequestMiddleware"] diff --git a/google/cloud/logging/handlers/middleware/request.py b/google/cloud/logging_v2/handlers/middleware/request.py similarity index 100% rename from google/cloud/logging/handlers/middleware/request.py rename to google/cloud/logging_v2/handlers/middleware/request.py diff --git a/google/cloud/logging/handlers/transports/__init__.py b/google/cloud/logging_v2/handlers/transports/__init__.py similarity index 81% rename from google/cloud/logging/handlers/transports/__init__.py rename to google/cloud/logging_v2/handlers/transports/__init__.py index 3c6cc214e..d1b961533 100644 --- a/google/cloud/logging/handlers/transports/__init__.py +++ b/google/cloud/logging_v2/handlers/transports/__init__.py @@ -20,9 +20,9 @@ the background. """ -from google.cloud.logging.handlers.transports.base import Transport -from google.cloud.logging.handlers.transports.sync import SyncTransport -from google.cloud.logging.handlers.transports.background_thread import ( +from google.cloud.logging_v2.handlers.transports.base import Transport +from google.cloud.logging_v2.handlers.transports.sync import SyncTransport +from google.cloud.logging_v2.handlers.transports.background_thread import ( BackgroundThreadTransport, ) diff --git a/google/cloud/logging/handlers/transports/background_thread.py b/google/cloud/logging_v2/handlers/transports/background_thread.py similarity index 99% rename from google/cloud/logging/handlers/transports/background_thread.py rename to google/cloud/logging_v2/handlers/transports/background_thread.py index 812b733cf..406c6c258 100644 --- a/google/cloud/logging/handlers/transports/background_thread.py +++ b/google/cloud/logging_v2/handlers/transports/background_thread.py @@ -28,8 +28,8 @@ from six.moves import queue -from google.cloud.logging import _helpers -from google.cloud.logging.handlers.transports.base import Transport +from google.cloud.logging_v2 import _helpers +from google.cloud.logging_v2.handlers.transports.base import Transport _DEFAULT_GRACE_PERIOD = 5.0 # Seconds _DEFAULT_MAX_BATCH_SIZE = 10 diff --git a/google/cloud/logging/handlers/transports/base.py b/google/cloud/logging_v2/handlers/transports/base.py similarity index 100% rename from google/cloud/logging/handlers/transports/base.py rename to google/cloud/logging_v2/handlers/transports/base.py diff --git a/google/cloud/logging/handlers/transports/sync.py b/google/cloud/logging_v2/handlers/transports/sync.py similarity index 94% rename from google/cloud/logging/handlers/transports/sync.py rename to google/cloud/logging_v2/handlers/transports/sync.py index e87eb4885..1e73c7a8e 100644 --- a/google/cloud/logging/handlers/transports/sync.py +++ b/google/cloud/logging_v2/handlers/transports/sync.py @@ -17,8 +17,8 @@ Logs directly to the the Stackdriver Logging API with a synchronous call. """ -from google.cloud.logging import _helpers -from google.cloud.logging.handlers.transports.base import Transport +from google.cloud.logging_v2 import _helpers +from google.cloud.logging_v2.handlers.transports.base import Transport class SyncTransport(Transport): diff --git a/google/cloud/logging/logger.py b/google/cloud/logging_v2/logger.py similarity index 97% rename from google/cloud/logging/logger.py rename to google/cloud/logging_v2/logger.py index e6dae8b0e..8621558b3 100644 --- a/google/cloud/logging/logger.py +++ b/google/cloud/logging_v2/logger.py @@ -14,12 +14,12 @@ """Define API Loggers.""" -from google.cloud.logging._helpers import _add_defaults_to_filter -from google.cloud.logging.entries import LogEntry -from google.cloud.logging.entries import ProtobufEntry -from google.cloud.logging.entries import StructEntry -from google.cloud.logging.entries import TextEntry -from google.cloud.logging.resource import Resource +from google.cloud.logging_v2._helpers import _add_defaults_to_filter +from google.cloud.logging_v2.entries import LogEntry +from google.cloud.logging_v2.entries import ProtobufEntry +from google.cloud.logging_v2.entries import StructEntry +from google.cloud.logging_v2.entries import TextEntry +from google.cloud.logging_v2.resource import Resource _GLOBAL_RESOURCE = Resource(type="global", labels={}) diff --git a/google/cloud/logging/metric.py b/google/cloud/logging_v2/metric.py similarity index 100% rename from google/cloud/logging/metric.py rename to google/cloud/logging_v2/metric.py diff --git a/google/cloud/logging/resource.py b/google/cloud/logging_v2/resource.py similarity index 100% rename from google/cloud/logging/resource.py rename to google/cloud/logging_v2/resource.py diff --git a/google/cloud/logging/sink.py b/google/cloud/logging_v2/sink.py similarity index 100% rename from google/cloud/logging/sink.py rename to google/cloud/logging_v2/sink.py diff --git a/tests/system/test_system.py b/tests/system/test_system.py index db6dbe95e..af057f960 100644 --- a/tests/system/test_system.py +++ b/tests/system/test_system.py @@ -26,10 +26,10 @@ from google.cloud._helpers import UTC import google.cloud.logging import google.cloud.logging.handlers.handlers -from google.cloud.logging.handlers.handlers import CloudLoggingHandler -from google.cloud.logging.handlers.transports import SyncTransport -from google.cloud.logging import client -from google.cloud.logging.resource import Resource +from google.cloud.logging_v2.handlers.handlers import CloudLoggingHandler +from google.cloud.logging_v2.handlers.transports import SyncTransport +from google.cloud.logging_v2 import client +from google.cloud.logging_v2.resource import Resource from test_utils.retry import RetryErrors from test_utils.retry import RetryResult @@ -124,7 +124,7 @@ def _logger_name(prefix): def test_list_entry_with_unregistered(self): from google.protobuf import any_pb2 from google.protobuf import descriptor_pool - from google.cloud.logging import entries + from google.cloud.logging_v2 import entries pool = descriptor_pool.Default() type_name = "google.cloud.audit.AuditLog" diff --git a/tests/unit/handlers/middleware/test_request.py b/tests/unit/handlers/middleware/test_request.py index f606da573..16d3f9ba2 100644 --- a/tests/unit/handlers/middleware/test_request.py +++ b/tests/unit/handlers/middleware/test_request.py @@ -36,7 +36,7 @@ def tearDownClass(cls): class TestRequestMiddleware(DjangoBase): def _get_target_class(self): - from google.cloud.logging.handlers.middleware import request + from google.cloud.logging_v2.handlers.middleware import request return request.RequestMiddleware @@ -45,7 +45,7 @@ def _make_one(self, *args, **kw): def test_process_request(self): from django.test import RequestFactory - from google.cloud.logging.handlers.middleware import request + from google.cloud.logging_v2.handlers.middleware import request middleware = self._make_one() mock_request = RequestFactory().get("/") @@ -58,14 +58,14 @@ def test_process_request(self): class Test__get_django_request(DjangoBase): @staticmethod def _call_fut(): - from google.cloud.logging.handlers.middleware import request + from google.cloud.logging_v2.handlers.middleware import request return request._get_django_request() @staticmethod def _make_patch(new_locals): return mock.patch( - "google.cloud.logging.handlers.middleware.request._thread_locals", + "google.cloud.logging_v2.handlers.middleware.request._thread_locals", new=new_locals, ) diff --git a/tests/unit/handlers/test__helpers.py b/tests/unit/handlers/test__helpers.py index 972e3db39..0cd3b30d8 100644 --- a/tests/unit/handlers/test__helpers.py +++ b/tests/unit/handlers/test__helpers.py @@ -20,7 +20,7 @@ class Test_get_trace_id_from_flask(unittest.TestCase): @staticmethod def _call_fut(): - from google.cloud.logging.handlers import _helpers + from google.cloud.logging_v2.handlers import _helpers return _helpers.get_trace_id_from_flask() @@ -62,7 +62,7 @@ def test_valid_context_header(self): class Test_get_trace_id_from_django(unittest.TestCase): @staticmethod def _call_fut(): - from google.cloud.logging.handlers import _helpers + from google.cloud.logging_v2.handlers import _helpers return _helpers.get_trace_id_from_django() @@ -76,14 +76,14 @@ def setUp(self): def tearDown(self): from django.test.utils import teardown_test_environment - from google.cloud.logging.handlers.middleware import request + from google.cloud.logging_v2.handlers.middleware import request teardown_test_environment() request._thread_locals.__dict__.clear() def test_no_context_header(self): from django.test import RequestFactory - from google.cloud.logging.handlers.middleware import request + from google.cloud.logging_v2.handlers.middleware import request django_request = RequestFactory().get("/") @@ -94,7 +94,7 @@ def test_no_context_header(self): def test_valid_context_header(self): from django.test import RequestFactory - from google.cloud.logging.handlers.middleware import request + from google.cloud.logging_v2.handlers.middleware import request django_trace_header = "HTTP_X_CLOUD_TRACE_CONTEXT" expected_trace_id = "testtraceiddjango" @@ -114,17 +114,17 @@ def test_valid_context_header(self): class Test_get_trace_id(unittest.TestCase): @staticmethod def _call_fut(): - from google.cloud.logging.handlers import _helpers + from google.cloud.logging_v2.handlers import _helpers return _helpers.get_trace_id() def _helper(self, django_return, flask_return): django_patch = mock.patch( - "google.cloud.logging.handlers._helpers.get_trace_id_from_django", + "google.cloud.logging_v2.handlers._helpers.get_trace_id_from_django", return_value=django_return, ) flask_patch = mock.patch( - "google.cloud.logging.handlers._helpers.get_trace_id_from_flask", + "google.cloud.logging_v2.handlers._helpers.get_trace_id_from_flask", return_value=flask_return, ) diff --git a/tests/unit/handlers/test_app_engine.py b/tests/unit/handlers/test_app_engine.py index eef4ac741..2a80e79b1 100644 --- a/tests/unit/handlers/test_app_engine.py +++ b/tests/unit/handlers/test_app_engine.py @@ -22,7 +22,7 @@ class TestAppEngineHandler(unittest.TestCase): PROJECT = "PROJECT" def _get_target_class(self): - from google.cloud.logging.handlers.app_engine import AppEngineHandler + from google.cloud.logging_v2.handlers.app_engine import AppEngineHandler return AppEngineHandler @@ -31,7 +31,7 @@ def _make_one(self, *args, **kw): def test_constructor_w_gae_standard_env(self): import sys - from google.cloud.logging.handlers import app_engine + from google.cloud.logging_v2.handlers import app_engine client = mock.Mock(project=self.PROJECT, spec=["project"]) @@ -57,7 +57,7 @@ def test_constructor_w_gae_standard_env(self): def test_constructor_w_gae_flex_env(self): import io - from google.cloud.logging.handlers import app_engine + from google.cloud.logging_v2.handlers import app_engine client = mock.Mock(project=self.PROJECT, spec=["project"]) name = "test-logger" @@ -106,7 +106,7 @@ def test_emit(self): def _get_gae_labels_helper(self, trace_id): get_trace_patch = mock.patch( - "google.cloud.logging.handlers.app_engine.get_trace_id", + "google.cloud.logging_v2.handlers.app_engine.get_trace_id", return_value=trace_id, ) @@ -121,7 +121,7 @@ def _get_gae_labels_helper(self, trace_id): return gae_labels def test_get_gae_labels_with_label(self): - from google.cloud.logging.handlers import app_engine + from google.cloud.logging_v2.handlers import app_engine trace_id = "test-gae-trace-id" gae_labels = self._get_gae_labels_helper(trace_id) diff --git a/tests/unit/handlers/test_container_engine.py b/tests/unit/handlers/test_container_engine.py index 09ee329ba..c5d6df65f 100644 --- a/tests/unit/handlers/test_container_engine.py +++ b/tests/unit/handlers/test_container_engine.py @@ -19,7 +19,7 @@ class TestContainerEngineHandler(unittest.TestCase): PROJECT = "PROJECT" def _get_target_class(self): - from google.cloud.logging.handlers.container_engine import ( + from google.cloud.logging_v2.handlers.container_engine import ( ContainerEngineHandler, ) diff --git a/tests/unit/handlers/test_handlers.py b/tests/unit/handlers/test_handlers.py index 5559791bc..1c5492e1a 100644 --- a/tests/unit/handlers/test_handlers.py +++ b/tests/unit/handlers/test_handlers.py @@ -22,7 +22,7 @@ class TestCloudLoggingHandler(unittest.TestCase): @staticmethod def _get_target_class(): - from google.cloud.logging.handlers.handlers import CloudLoggingHandler + from google.cloud.logging_v2.handlers.handlers import CloudLoggingHandler return CloudLoggingHandler @@ -31,8 +31,8 @@ def _make_one(self, *args, **kw): def test_ctor_defaults(self): import sys - from google.cloud.logging.logger import _GLOBAL_RESOURCE - from google.cloud.logging.handlers.handlers import DEFAULT_LOGGER_NAME + from google.cloud.logging_v2.logger import _GLOBAL_RESOURCE + from google.cloud.logging_v2.handlers.handlers import DEFAULT_LOGGER_NAME client = _Client(self.PROJECT) handler = self._make_one(client, transport=_Transport) @@ -47,7 +47,7 @@ def test_ctor_defaults(self): def test_ctor_explicit(self): import io - from google.cloud.logging.resource import Resource + from google.cloud.logging_v2.resource import Resource resource = Resource("resource_type", {"resource_label": "value"}) labels = {"handler_lable": "value"} @@ -72,7 +72,7 @@ def test_ctor_explicit(self): self.assertIs(handler.stream, stream) def test_emit(self): - from google.cloud.logging.logger import _GLOBAL_RESOURCE + from google.cloud.logging_v2.logger import _GLOBAL_RESOURCE client = _Client(self.PROJECT) handler = self._make_one( @@ -91,7 +91,7 @@ def test_emit(self): class TestSetupLogging(unittest.TestCase): def _call_fut(self, handler, excludes=None): - from google.cloud.logging.handlers.handlers import setup_logging + from google.cloud.logging_v2.handlers.handlers import setup_logging if excludes: return setup_logging(handler, excluded_loggers=excludes) diff --git a/tests/unit/handlers/transports/test_background_thread.py b/tests/unit/handlers/transports/test_background_thread.py index 7edae8a7b..6fd878cba 100644 --- a/tests/unit/handlers/transports/test_background_thread.py +++ b/tests/unit/handlers/transports/test_background_thread.py @@ -25,13 +25,13 @@ class TestBackgroundThreadHandler(unittest.TestCase): @staticmethod def _get_target_class(): - from google.cloud.logging.handlers.transports import BackgroundThreadTransport + from google.cloud.logging_v2.handlers.transports import BackgroundThreadTransport return BackgroundThreadTransport def _make_one(self, *args, **kw): worker_patch = mock.patch( - "google.cloud.logging.handlers.transports." "background_thread._Worker", + "google.cloud.logging_v2.handlers.transports." "background_thread._Worker", autospec=True, ) with worker_patch as worker_mock: @@ -47,7 +47,7 @@ def test_constructor(self): self.assertEqual(logger.name, name) def test_send(self): - from google.cloud.logging.logger import _GLOBAL_RESOURCE + from google.cloud.logging_v2.logger import _GLOBAL_RESOURCE client = _Client(self.PROJECT) name = "python_logger" @@ -68,7 +68,7 @@ def test_send(self): ) def test_trace_send(self): - from google.cloud.logging.logger import _GLOBAL_RESOURCE + from google.cloud.logging_v2.logger import _GLOBAL_RESOURCE client = _Client(self.PROJECT) name = "python_logger" @@ -90,7 +90,7 @@ def test_trace_send(self): ) def test_span_send(self): - from google.cloud.logging.logger import _GLOBAL_RESOURCE + from google.cloud.logging_v2.logger import _GLOBAL_RESOURCE client = _Client(self.PROJECT) name = "python_logger" @@ -147,7 +147,7 @@ class Test_Worker(unittest.TestCase): @staticmethod def _get_target_class(): - from google.cloud.logging.handlers.transports import background_thread + from google.cloud.logging_v2.handlers.transports import background_thread return background_thread._Worker @@ -181,7 +181,7 @@ def test_constructor(self): self.assertIsNone(worker._thread) def test_start(self): - from google.cloud.logging.handlers.transports import background_thread + from google.cloud.logging_v2.handlers.transports import background_thread worker = self._make_one(_Logger(self.NAME)) @@ -200,7 +200,7 @@ def test_start(self): self.assertIs(current_thread, worker._thread) def test_stop(self): - from google.cloud.logging.handlers.transports import background_thread + from google.cloud.logging_v2.handlers.transports import background_thread grace_period = 5.0 worker = self._make_one(_Logger(self.NAME)) @@ -270,7 +270,7 @@ def _enqueue_record(worker, message, levelno=logging.INFO, **kw): def test_enqueue_defaults(self): import datetime - from google.cloud.logging._helpers import LogSeverity + from google.cloud.logging_v2._helpers import LogSeverity worker = self._make_one(_Logger(self.NAME)) self.assertTrue(worker._queue.empty()) @@ -290,7 +290,7 @@ def test_enqueue_defaults(self): def test_enqueue_explicit(self): import datetime - from google.cloud.logging._helpers import LogSeverity + from google.cloud.logging_v2._helpers import LogSeverity worker = self._make_one(_Logger(self.NAME)) self.assertTrue(worker._queue.empty()) @@ -322,7 +322,7 @@ def test_enqueue_explicit(self): self.assertIsInstance(entry["timestamp"], datetime.datetime) def test__thread_main(self): - from google.cloud.logging.handlers.transports import background_thread + from google.cloud.logging_v2.handlers.transports import background_thread worker = self._make_one(_Logger(self.NAME)) @@ -338,7 +338,7 @@ def test__thread_main(self): self.assertEqual(worker._queue.qsize(), 0) def test__thread_main_error(self): - from google.cloud.logging.handlers.transports import background_thread + from google.cloud.logging_v2.handlers.transports import background_thread worker = self._make_one(_Logger(self.NAME)) worker._cloud_logger._batch_cls = _RaisingBatch @@ -353,7 +353,7 @@ def test__thread_main_error(self): self.assertEqual(worker._queue.qsize(), 0) def test__thread_main_batches(self): - from google.cloud.logging.handlers.transports import background_thread + from google.cloud.logging_v2.handlers.transports import background_thread worker = self._make_one(_Logger(self.NAME), max_batch_size=2) @@ -379,7 +379,7 @@ def test__thread_main_max_latency(self, time): # the "change detector" test in that way. However, this is still a # useful test to verify the queue timeout is appropriately calculated. from six.moves import queue - from google.cloud.logging.handlers.transports import background_thread + from google.cloud.logging_v2.handlers.transports import background_thread # Use monotonically increasing time. time.side_effect = range(1, 6) @@ -489,7 +489,7 @@ def log_struct( span_id=None, timestamp=None, ): - from google.cloud.logging.logger import _GLOBAL_RESOURCE + from google.cloud.logging_v2.logger import _GLOBAL_RESOURCE assert resource is None resource = _GLOBAL_RESOURCE diff --git a/tests/unit/handlers/transports/test_base.py b/tests/unit/handlers/transports/test_base.py index 03612e115..b8977ace5 100644 --- a/tests/unit/handlers/transports/test_base.py +++ b/tests/unit/handlers/transports/test_base.py @@ -21,7 +21,7 @@ class TestBaseHandler(unittest.TestCase): @staticmethod def _get_target_class(): - from google.cloud.logging.handlers.transports import Transport + from google.cloud.logging_v2.handlers.transports import Transport return Transport diff --git a/tests/unit/handlers/transports/test_sync.py b/tests/unit/handlers/transports/test_sync.py index f2ff67d59..da990c43d 100644 --- a/tests/unit/handlers/transports/test_sync.py +++ b/tests/unit/handlers/transports/test_sync.py @@ -22,7 +22,7 @@ class TestSyncHandler(unittest.TestCase): @staticmethod def _get_target_class(): - from google.cloud.logging.handlers.transports import SyncTransport + from google.cloud.logging_v2.handlers.transports import SyncTransport return SyncTransport @@ -36,8 +36,8 @@ def test_ctor(self): self.assertEqual(transport.logger.name, "python_logger") def test_send(self): - from google.cloud.logging.logger import _GLOBAL_RESOURCE - from google.cloud.logging._helpers import LogSeverity + from google.cloud.logging_v2.logger import _GLOBAL_RESOURCE + from google.cloud.logging_v2._helpers import LogSeverity client = _Client(self.PROJECT) @@ -63,7 +63,7 @@ def test_send(self): class _Logger(object): - from google.cloud.logging.logger import _GLOBAL_RESOURCE + from google.cloud.logging_v2.logger import _GLOBAL_RESOURCE def __init__(self, name): self.name = name diff --git a/tests/unit/test__gapic.py b/tests/unit/test__gapic.py index ad6ded2bd..d7d5dd7a6 100644 --- a/tests/unit/test__gapic.py +++ b/tests/unit/test__gapic.py @@ -19,8 +19,8 @@ from google.protobuf import empty_pb2 import mock -import google.cloud.logging -from google.cloud.logging import _gapic +import google.cloud.logging_v2 +from google.cloud.logging_v2 import _gapic from google.cloud.logging_v2.gapic import config_service_v2_client from google.cloud.logging_v2.gapic import logging_service_v2_client from google.cloud.logging_v2.gapic import metrics_service_v2_client @@ -63,14 +63,14 @@ def test_list_entries(self): channel.ListLogEntries.response = logging_pb2.ListLogEntriesResponse( entries=[log_entry_msg] ) - result = api.list_entries([PROJECT], FILTER, google.cloud.logging.DESCENDING) + result = api.list_entries([PROJECT], FILTER, google.cloud.logging_v2.DESCENDING) entries = list(result) # Check the response assert len(entries) == 1 entry = entries[0] - assert isinstance(entry, google.cloud.logging.entries.TextEntry) + assert isinstance(entry, google.cloud.logging_v2.entries.TextEntry) assert entry.payload == "text" # Check the request @@ -78,7 +78,7 @@ def test_list_entries(self): request = channel.ListLogEntries.requests[0] assert request.project_ids == [PROJECT] assert request.filter == FILTER - assert request.order_by == google.cloud.logging.DESCENDING + assert request.order_by == google.cloud.logging_v2.DESCENDING def test_list_entries_with_options(self): channel, api = self.make_logging_api() @@ -88,7 +88,7 @@ def test_list_entries_with_options(self): result = api.list_entries( [PROJECT], FILTER, - google.cloud.logging.ASCENDING, + google.cloud.logging_v2.ASCENDING, page_size=42, page_token="token", ) @@ -100,7 +100,7 @@ def test_list_entries_with_options(self): request = channel.ListLogEntries.requests[0] assert request.project_ids == [PROJECT] assert request.filter == FILTER - assert request.order_by == google.cloud.logging.ASCENDING + assert request.order_by == google.cloud.logging_v2.ASCENDING assert request.page_size == 42 assert request.page_token == "token" @@ -175,7 +175,7 @@ def test_list_sinks(self): # Check the response assert len(sinks) == 1 sink = sinks[0] - assert isinstance(sink, google.cloud.logging.sink.Sink) + assert isinstance(sink, google.cloud.logging_v2.sink.Sink) assert sink.name == self.SINK_PATH assert sink.destination == self.DESTINATION_URI assert sink.filter_ == FILTER @@ -339,7 +339,7 @@ def test_list_metrics(self): # Check the response assert len(metrics) == 1 metric = metrics[0] - assert isinstance(metric, google.cloud.logging.metric.Metric) + assert isinstance(metric, google.cloud.logging_v2.metric.Metric) assert metric.name == self.METRIC_PATH assert metric.description == self.DESCRIPTION assert metric.filter_ == FILTER @@ -443,7 +443,7 @@ def test_metric_delete(self): class Test__parse_log_entry(unittest.TestCase): @staticmethod def _call_fut(*args, **kwargs): - from google.cloud.logging._gapic import _parse_log_entry + from google.cloud.logging_v2._gapic import _parse_log_entry return _parse_log_entry(*args, **kwargs) @@ -455,7 +455,7 @@ def test_simple(self): expected = {"logName": entry_pb.log_name, "textPayload": entry_pb.text_payload} self.assertEqual(result, expected) - @mock.patch("google.cloud.logging._gapic.MessageToDict", side_effect=TypeError) + @mock.patch("google.cloud.logging_v2._gapic.MessageToDict", side_effect=TypeError) def test_non_registry_failure(self, msg_to_dict_mock): entry_pb = mock.Mock(spec=["HasField"]) entry_pb.HasField.return_value = False @@ -522,7 +522,7 @@ def test_registered_type(self): class Test__log_entry_mapping_to_pb(unittest.TestCase): @staticmethod def _call_fut(*args, **kwargs): - from google.cloud.logging._gapic import _log_entry_mapping_to_pb + from google.cloud.logging_v2._gapic import _log_entry_mapping_to_pb return _log_entry_mapping_to_pb(*args, **kwargs) @@ -582,7 +582,7 @@ def test_registered_type(self): self.assertEqual(result, entry_pb) -@mock.patch("google.cloud.logging._gapic.LoggingServiceV2Client", autospec=True) +@mock.patch("google.cloud.logging_v2._gapic.LoggingServiceV2Client", autospec=True) def test_make_logging_api(gapic_client): client = mock.Mock(spec=["_credentials", "_client_info"]) api = _gapic.make_logging_api(client) @@ -593,7 +593,7 @@ def test_make_logging_api(gapic_client): ) -@mock.patch("google.cloud.logging._gapic.MetricsServiceV2Client", autospec=True) +@mock.patch("google.cloud.logging_v2._gapic.MetricsServiceV2Client", autospec=True) def test_make_metrics_api(gapic_client): client = mock.Mock(spec=["_credentials", "_client_info"]) api = _gapic.make_metrics_api(client) @@ -604,7 +604,7 @@ def test_make_metrics_api(gapic_client): ) -@mock.patch("google.cloud.logging._gapic.ConfigServiceV2Client", autospec=True) +@mock.patch("google.cloud.logging_v2._gapic.ConfigServiceV2Client", autospec=True) def test_make_sinks_api(gapic_client): client = mock.Mock(spec=["_credentials", "_client_info"]) api = _gapic.make_sinks_api(client) diff --git a/tests/unit/test__helpers.py b/tests/unit/test__helpers.py index c92456794..fb3e09f04 100644 --- a/tests/unit/test__helpers.py +++ b/tests/unit/test__helpers.py @@ -25,7 +25,7 @@ class Test_entry_from_resource(unittest.TestCase): @staticmethod def _call_fut(resource, client, loggers): - from google.cloud.logging._helpers import entry_from_resource + from google.cloud.logging_v2._helpers import entry_from_resource return entry_from_resource(resource, client, loggers) @@ -39,7 +39,7 @@ def _payload_helper(self, key, class_name): loggers = {} mock_class = EntryMock() - name = "google.cloud.logging._helpers." + class_name + name = "google.cloud.logging_v2._helpers." + class_name with mock.patch(name, new=mock_class): result = self._call_fut(resource, client, loggers) @@ -62,7 +62,7 @@ def test_proto_payload(self): class Test_retrieve_metadata_server(unittest.TestCase): @staticmethod def _call_fut(metadata_key): - from google.cloud.logging._helpers import retrieve_metadata_server + from google.cloud.logging_v2._helpers import retrieve_metadata_server return retrieve_metadata_server(metadata_key) @@ -78,7 +78,7 @@ def test_metadata_exists(self): requests_mock.get.return_value = response_mock requests_mock.codes.ok = status_code_ok - patch = mock.patch("google.cloud.logging._helpers.requests", requests_mock) + patch = mock.patch("google.cloud.logging_v2._helpers.requests", requests_mock) with patch: metadata = self._call_fut(metadata_key) @@ -96,7 +96,7 @@ def test_metadata_does_not_exist(self): requests_mock.get.return_value = response_mock requests_mock.codes.ok = status_code_ok - patch = mock.patch("google.cloud.logging._helpers.requests", requests_mock) + patch = mock.patch("google.cloud.logging_v2._helpers.requests", requests_mock) with patch: metadata = self._call_fut(metadata_key) @@ -115,7 +115,7 @@ def test_request_exception(self): requests_get_patch = mock.patch("requests.get", requests_get_mock) url_patch = mock.patch( - "google.cloud.logging._helpers.METADATA_URL", new=metadata_url + "google.cloud.logging_v2._helpers.METADATA_URL", new=metadata_url ) with requests_get_patch: @@ -128,12 +128,12 @@ def test_request_exception(self): class Test__normalize_severity(unittest.TestCase): @staticmethod def _stackdriver_severity(): - from google.cloud.logging._helpers import LogSeverity + from google.cloud.logging_v2._helpers import LogSeverity return LogSeverity def _normalize_severity_helper(self, stdlib_level, enum_level): - from google.cloud.logging._helpers import _normalize_severity + from google.cloud.logging_v2._helpers import _normalize_severity self.assertEqual(_normalize_severity(stdlib_level), enum_level) @@ -173,7 +173,7 @@ def _time_format(): @staticmethod def _add_defaults_to_filter(filter_): - from google.cloud.logging._helpers import _add_defaults_to_filter + from google.cloud.logging_v2._helpers import _add_defaults_to_filter return _add_defaults_to_filter(filter_) diff --git a/tests/unit/test__http.py b/tests/unit/test__http.py index 7ad247ca7..6616b0722 100644 --- a/tests/unit/test__http.py +++ b/tests/unit/test__http.py @@ -30,13 +30,13 @@ class TestConnection(unittest.TestCase): @staticmethod def _get_default_timeout(): - from google.cloud.logging._http import _http + from google.cloud.logging_v2._http import _http return _http._DEFAULT_TIMEOUT @staticmethod def _get_target_class(): - from google.cloud.logging._http import Connection + from google.cloud.logging_v2._http import Connection return Connection @@ -105,7 +105,7 @@ class Test_LoggingAPI(unittest.TestCase): @staticmethod def _get_target_class(): - from google.cloud.logging._http import _LoggingAPI + from google.cloud.logging_v2._http import _LoggingAPI return _LoggingAPI @@ -129,9 +129,9 @@ def _make_timestamp(): def test_list_entries_no_paging(self): import six - from google.cloud.logging.client import Client - from google.cloud.logging.entries import TextEntry - from google.cloud.logging.logger import Logger + from google.cloud.logging_v2.client import Client + from google.cloud.logging_v2.entries import TextEntry + from google.cloud.logging_v2.logger import Logger NOW, TIMESTAMP = self._make_timestamp() IID = "IID" @@ -183,11 +183,11 @@ def test_list_entries_no_paging(self): ) def test_list_entries_w_paging(self): - from google.cloud.logging import DESCENDING - from google.cloud.logging.client import Client - from google.cloud.logging.logger import Logger - from google.cloud.logging.entries import ProtobufEntry - from google.cloud.logging.entries import StructEntry + from google.cloud.logging_v2 import DESCENDING + from google.cloud.logging_v2.client import Client + from google.cloud.logging_v2.logger import Logger + from google.cloud.logging_v2.entries import ProtobufEntry + from google.cloud.logging_v2.entries import StructEntry PROJECT1 = "PROJECT1" PROJECT2 = "PROJECT2" @@ -339,7 +339,7 @@ class Test_SinksAPI(unittest.TestCase): @staticmethod def _get_target_class(): - from google.cloud.logging._http import _SinksAPI + from google.cloud.logging_v2._http import _SinksAPI return _SinksAPI @@ -355,7 +355,7 @@ def test_ctor(self): def test_list_sinks_no_paging(self): import six - from google.cloud.logging.sink import Sink + from google.cloud.logging_v2.sink import Sink TOKEN = "TOKEN" RETURNED = { @@ -395,7 +395,7 @@ def test_list_sinks_no_paging(self): ) def test_list_sinks_w_paging(self): - from google.cloud.logging.sink import Sink + from google.cloud.logging_v2.sink import Sink TOKEN = "TOKEN" PAGE_SIZE = 42 @@ -619,7 +619,7 @@ class Test_MetricsAPI(unittest.TestCase): @staticmethod def _get_target_class(): - from google.cloud.logging._http import _MetricsAPI + from google.cloud.logging_v2._http import _MetricsAPI return _MetricsAPI @@ -628,7 +628,7 @@ def _make_one(self, *args, **kw): def test_list_metrics_no_paging(self): import six - from google.cloud.logging.metric import Metric + from google.cloud.logging_v2.metric import Metric TOKEN = "TOKEN" RETURNED = { @@ -662,7 +662,7 @@ def test_list_metrics_no_paging(self): ) def test_list_metrics_w_paging(self): - from google.cloud.logging.metric import Metric + from google.cloud.logging_v2.metric import Metric TOKEN = "TOKEN" PAGE_SIZE = 42 diff --git a/tests/unit/test_client.py b/tests/unit/test_client.py index 9e2a15bb4..cfa1ca5e0 100644 --- a/tests/unit/test_client.py +++ b/tests/unit/test_client.py @@ -42,7 +42,7 @@ class TestClient(unittest.TestCase): @staticmethod def _get_target_class(): - from google.cloud.logging.client import Client + from google.cloud.logging_v2.client import Client return Client @@ -51,7 +51,7 @@ def _make_one(self, *args, **kw): def test_ctor_defaults(self): from google.cloud._http import ClientInfo - from google.cloud.logging._http import Connection + from google.cloud.logging_v2._http import Connection creds = _make_credentials() client = self._make_one(project=self.PROJECT, credentials=creds) @@ -61,7 +61,7 @@ def test_ctor_defaults(self): def test_ctor_explicit(self): from google.cloud._http import ClientInfo - from google.cloud.logging._http import Connection + from google.cloud.logging_v2._http import Connection creds = _make_credentials() client_info = ClientInfo() @@ -110,7 +110,7 @@ def test_ctor_w_client_options_dict(self): ) def test_logging_api_wo_gapic(self): - from google.cloud.logging._http import _LoggingAPI + from google.cloud.logging_v2._http import _LoggingAPI client = self._make_one( self.PROJECT, credentials=_make_credentials(), _use_grpc=False @@ -136,7 +136,7 @@ def make_api(client_obj): creds = _make_credentials() client = self._make_one(project=self.PROJECT, credentials=creds, _use_grpc=True) - patch = mock.patch("google.cloud.logging.client._gapic") + patch = mock.patch("google.cloud.logging_v2.client._gapic") with patch as gapic_module: gapic_module.make_logging_api.side_effect = make_api api = client.logging_api @@ -148,10 +148,10 @@ def make_api(client_obj): self.assertIs(again, api) def test_no_gapic_ctor(self): - from google.cloud.logging._http import _LoggingAPI + from google.cloud.logging_v2._http import _LoggingAPI creds = _make_credentials() - patch = mock.patch("google.cloud.logging.client._USE_GRPC", new=True) + patch = mock.patch("google.cloud.logging_v2.client._USE_GRPC", new=True) with patch: client = self._make_one( project=self.PROJECT, credentials=creds, _use_grpc=False @@ -161,7 +161,7 @@ def test_no_gapic_ctor(self): self.assertIsInstance(api, _LoggingAPI) def test_sinks_api_wo_gapic(self): - from google.cloud.logging._http import _SinksAPI + from google.cloud.logging_v2._http import _SinksAPI client = self._make_one( self.PROJECT, credentials=_make_credentials(), _use_grpc=False @@ -187,7 +187,7 @@ def make_api(client_obj): creds = _make_credentials() client = self._make_one(project=self.PROJECT, credentials=creds, _use_grpc=True) - patch = mock.patch("google.cloud.logging.client._gapic") + patch = mock.patch("google.cloud.logging_v2.client._gapic") with patch as gapic_module: gapic_module.make_sinks_api.side_effect = make_api api = client.sinks_api @@ -199,7 +199,7 @@ def make_api(client_obj): self.assertIs(again, api) def test_metrics_api_wo_gapic(self): - from google.cloud.logging._http import _MetricsAPI + from google.cloud.logging_v2._http import _MetricsAPI client = self._make_one( self.PROJECT, credentials=_make_credentials(), _use_grpc=False @@ -225,7 +225,7 @@ def make_api(client_obj): creds = _make_credentials() client = self._make_one(project=self.PROJECT, credentials=creds, _use_grpc=True) - patch = mock.patch("google.cloud.logging.client._gapic") + patch = mock.patch("google.cloud.logging_v2.client._gapic") with patch as gapic_module: gapic_module.make_metrics_api.side_effect = make_api api = client.metrics_api @@ -237,7 +237,7 @@ def make_api(client_obj): self.assertIs(again, api) def test_logger(self): - from google.cloud.logging.logger import Logger + from google.cloud.logging_v2.logger import Logger creds = _make_credentials() client = self._make_one(project=self.PROJECT, credentials=creds) @@ -249,7 +249,7 @@ def test_logger(self): def test_list_entries_defaults(self): import six - from google.cloud.logging.entries import TextEntry + from google.cloud.logging_v2.entries import TextEntry IID = "IID" TEXT = "TEXT" @@ -305,10 +305,10 @@ def test_list_entries_defaults(self): self.assertLess(yesterday - timestamp, timedelta(minutes=1)) def test_list_entries_explicit(self): - from google.cloud.logging import DESCENDING - from google.cloud.logging.entries import ProtobufEntry - from google.cloud.logging.entries import StructEntry - from google.cloud.logging.logger import Logger + from google.cloud.logging_v2 import DESCENDING + from google.cloud.logging_v2.entries import ProtobufEntry + from google.cloud.logging_v2.entries import StructEntry + from google.cloud.logging_v2.logger import Logger PROJECT1 = "PROJECT1" PROJECT2 = "PROJECT2" @@ -401,10 +401,10 @@ def test_list_entries_explicit(self): self.assertLess(yesterday - timestamp, timedelta(minutes=1)) def test_list_entries_explicit_timestamp(self): - from google.cloud.logging import DESCENDING - from google.cloud.logging.entries import ProtobufEntry - from google.cloud.logging.entries import StructEntry - from google.cloud.logging.logger import Logger + from google.cloud.logging_v2 import DESCENDING + from google.cloud.logging_v2.entries import ProtobufEntry + from google.cloud.logging_v2.entries import StructEntry + from google.cloud.logging_v2.logger import Logger PROJECT1 = "PROJECT1" PROJECT2 = "PROJECT2" @@ -489,7 +489,7 @@ def test_list_entries_explicit_timestamp(self): ) def test_sink_defaults(self): - from google.cloud.logging.sink import Sink + from google.cloud.logging_v2.sink import Sink creds = _make_credentials() client = self._make_one(project=self.PROJECT, credentials=creds) @@ -502,7 +502,7 @@ def test_sink_defaults(self): self.assertEqual(sink.project, self.PROJECT) def test_sink_explicit(self): - from google.cloud.logging.sink import Sink + from google.cloud.logging_v2.sink import Sink creds = _make_credentials() client = self._make_one(project=self.PROJECT, credentials=creds) @@ -516,7 +516,7 @@ def test_sink_explicit(self): def test_list_sinks_no_paging(self): import six - from google.cloud.logging.sink import Sink + from google.cloud.logging_v2.sink import Sink PROJECT = "PROJECT" TOKEN = "TOKEN" @@ -555,7 +555,7 @@ def test_list_sinks_no_paging(self): ) def test_list_sinks_with_paging(self): - from google.cloud.logging.sink import Sink + from google.cloud.logging_v2.sink import Sink PROJECT = "PROJECT" SINK_NAME = "sink_name" @@ -599,7 +599,7 @@ def test_list_sinks_with_paging(self): ) def test_metric_defaults(self): - from google.cloud.logging.metric import Metric + from google.cloud.logging_v2.metric import Metric creds = _make_credentials() @@ -613,7 +613,7 @@ def test_metric_defaults(self): self.assertEqual(metric.project, self.PROJECT) def test_metric_explicit(self): - from google.cloud.logging.metric import Metric + from google.cloud.logging_v2.metric import Metric creds = _make_credentials() @@ -629,7 +629,7 @@ def test_metric_explicit(self): self.assertEqual(metric.project, self.PROJECT) def test_list_metrics_no_paging(self): - from google.cloud.logging.metric import Metric + from google.cloud.logging_v2.metric import Metric metrics = [ { @@ -666,7 +666,7 @@ def test_list_metrics_no_paging(self): def test_list_metrics_with_paging(self): import six - from google.cloud.logging.metric import Metric + from google.cloud.logging_v2.metric import Metric token = "TOKEN" next_token = "T00KEN" @@ -715,8 +715,8 @@ def test_list_metrics_with_paging(self): def test_get_default_handler_app_engine(self): import os from google.cloud._testing import _Monkey - from google.cloud.logging.client import _APPENGINE_FLEXIBLE_ENV_VM - from google.cloud.logging.handlers import AppEngineHandler + from google.cloud.logging_v2.client import _APPENGINE_FLEXIBLE_ENV_VM + from google.cloud.logging_v2.handlers import AppEngineHandler credentials = _make_credentials() client = self._make_one( @@ -731,7 +731,7 @@ def test_get_default_handler_app_engine(self): self.assertIsInstance(handler, AppEngineHandler) def test_get_default_handler_container_engine(self): - from google.cloud.logging.handlers import ContainerEngineHandler + from google.cloud.logging_v2.handlers import ContainerEngineHandler credentials = _make_credentials() client = self._make_one( @@ -739,7 +739,7 @@ def test_get_default_handler_container_engine(self): ) patch = mock.patch( - "google.cloud.logging.client.retrieve_metadata_server", + "google.cloud.logging_v2.client.retrieve_metadata_server", return_value="test-gke-cluster", ) @@ -750,8 +750,8 @@ def test_get_default_handler_container_engine(self): def test_get_default_handler_general(self): import io - from google.cloud.logging.handlers import CloudLoggingHandler - from google.cloud.logging.resource import Resource + from google.cloud.logging_v2.handlers import CloudLoggingHandler + from google.cloud.logging_v2.resource import Resource name = "test-logger" resource = Resource("resource_type", {"resource_label": "value"}) @@ -775,14 +775,14 @@ def test_get_default_handler_general(self): self.assertEqual(handler.labels, labels) def test_setup_logging(self): - from google.cloud.logging.handlers import CloudLoggingHandler + from google.cloud.logging_v2.handlers import CloudLoggingHandler credentials = _make_credentials() client = self._make_one( project=self.PROJECT, credentials=credentials, _use_grpc=False ) - with mock.patch("google.cloud.logging.client.setup_logging") as mocked: + with mock.patch("google.cloud.logging_v2.client.setup_logging") as mocked: client.setup_logging() self.assertEqual(len(mocked.mock_calls), 1) @@ -801,8 +801,8 @@ def test_setup_logging(self): def test_setup_logging_w_extra_kwargs(self): import io - from google.cloud.logging.handlers import CloudLoggingHandler - from google.cloud.logging.resource import Resource + from google.cloud.logging_v2.handlers import CloudLoggingHandler + from google.cloud.logging_v2.resource import Resource name = "test-logger" resource = Resource("resource_type", {"resource_label": "value"}) @@ -814,7 +814,7 @@ def test_setup_logging_w_extra_kwargs(self): project=self.PROJECT, credentials=credentials, _use_grpc=False ) - with mock.patch("google.cloud.logging.client.setup_logging") as mocked: + with mock.patch("google.cloud.logging_v2.client.setup_logging") as mocked: client.setup_logging( name=name, resource=resource, labels=labels, stream=stream ) diff --git a/tests/unit/test_entries.py b/tests/unit/test_entries.py index 3aad7fbb1..5b7763f45 100644 --- a/tests/unit/test_entries.py +++ b/tests/unit/test_entries.py @@ -19,7 +19,7 @@ class Test_logger_name_from_path(unittest.TestCase): def _call_fut(self, path): - from google.cloud.logging.entries import logger_name_from_path + from google.cloud.logging_v2.entries import logger_name_from_path return logger_name_from_path(path) @@ -40,7 +40,7 @@ def test_w_name_w_all_extras(self): class Test__int_or_none(unittest.TestCase): def _call_fut(self, value): - from google.cloud.logging.entries import _int_or_none + from google.cloud.logging_v2.entries import _int_or_none return _int_or_none(value) @@ -61,7 +61,7 @@ class TestLogEntry(unittest.TestCase): @staticmethod def _get_target_class(): - from google.cloud.logging.entries import LogEntry + from google.cloud.logging_v2.entries import LogEntry return LogEntry @@ -69,7 +69,7 @@ def _make_one(self, *args, **kw): return self._get_target_class()(*args, **kw) def test_ctor_defaults(self): - from google.cloud.logging.entries import _GLOBAL_RESOURCE + from google.cloud.logging_v2.entries import _GLOBAL_RESOURCE entry = self._make_one() @@ -90,7 +90,7 @@ def test_ctor_defaults(self): def test_ctor_explicit(self): import datetime - from google.cloud.logging.resource import Resource + from google.cloud.logging_v2.resource import Resource LOG_NAME = "projects/%s/logs/%s" % (self.PROJECT, self.LOGGER_NAME) IID = "IID" @@ -178,7 +178,7 @@ def test_from_api_repr_missing_data_no_loggers(self): def test_from_api_repr_w_loggers_no_logger_match(self): from datetime import datetime from google.cloud._helpers import UTC - from google.cloud.logging.resource import Resource + from google.cloud.logging_v2.resource import Resource klass = self._get_target_class() client = _Client(self.PROJECT) @@ -316,7 +316,7 @@ def test_from_api_repr_w_loggers_w_logger_match(self): self.assertIsNone(entry.payload) def test_to_api_repr_w_source_location_no_line(self): - from google.cloud.logging.logger import _GLOBAL_RESOURCE + from google.cloud.logging_v2.logger import _GLOBAL_RESOURCE LOG_NAME = "test.log" FILE = "my_file.py" @@ -332,7 +332,7 @@ def test_to_api_repr_w_source_location_no_line(self): def test_to_api_repr_explicit(self): import datetime - from google.cloud.logging.resource import Resource + from google.cloud.logging_v2.resource import Resource from google.cloud._helpers import _datetime_to_rfc3339 LOG_NAME = "test.log" @@ -395,7 +395,7 @@ class TestTextEntry(unittest.TestCase): @staticmethod def _get_target_class(): - from google.cloud.logging.entries import TextEntry + from google.cloud.logging_v2.entries import TextEntry return TextEntry @@ -403,7 +403,7 @@ def _make_one(self, *args, **kw): return self._get_target_class()(*args, **kw) def test_to_api_repr_defaults(self): - from google.cloud.logging.logger import _GLOBAL_RESOURCE + from google.cloud.logging_v2.logger import _GLOBAL_RESOURCE LOG_NAME = "test.log" TEXT = "TESTING" @@ -417,7 +417,7 @@ def test_to_api_repr_defaults(self): def test_to_api_repr_explicit(self): import datetime - from google.cloud.logging.resource import Resource + from google.cloud.logging_v2.resource import Resource from google.cloud._helpers import _datetime_to_rfc3339 LOG_NAME = "test.log" @@ -483,7 +483,7 @@ class TestStructEntry(unittest.TestCase): @staticmethod def _get_target_class(): - from google.cloud.logging.entries import StructEntry + from google.cloud.logging_v2.entries import StructEntry return StructEntry @@ -491,7 +491,7 @@ def _make_one(self, *args, **kw): return self._get_target_class()(*args, **kw) def test_to_api_repr_defaults(self): - from google.cloud.logging.logger import _GLOBAL_RESOURCE + from google.cloud.logging_v2.logger import _GLOBAL_RESOURCE LOG_NAME = "test.log" JSON_PAYLOAD = {"key": "value"} @@ -505,7 +505,7 @@ def test_to_api_repr_defaults(self): def test_to_api_repr_explicit(self): import datetime - from google.cloud.logging.resource import Resource + from google.cloud.logging_v2.resource import Resource from google.cloud._helpers import _datetime_to_rfc3339 LOG_NAME = "test.log" @@ -571,7 +571,7 @@ class TestProtobufEntry(unittest.TestCase): @staticmethod def _get_target_class(): - from google.cloud.logging.entries import ProtobufEntry + from google.cloud.logging_v2.entries import ProtobufEntry return ProtobufEntry @@ -634,7 +634,7 @@ def test_parse_message(self): def test_to_api_repr_proto_defaults(self): from google.protobuf.json_format import MessageToDict - from google.cloud.logging.logger import _GLOBAL_RESOURCE + from google.cloud.logging_v2.logger import _GLOBAL_RESOURCE from google.protobuf.struct_pb2 import Struct from google.protobuf.struct_pb2 import Value @@ -652,7 +652,7 @@ def test_to_api_repr_proto_defaults(self): def test_to_api_repr_proto_explicit(self): import datetime from google.protobuf.json_format import MessageToDict - from google.cloud.logging.resource import Resource + from google.cloud.logging_v2.resource import Resource from google.cloud._helpers import _datetime_to_rfc3339 from google.protobuf.struct_pb2 import Struct from google.protobuf.struct_pb2 import Value diff --git a/tests/unit/test_logger.py b/tests/unit/test_logger.py index 966a515e0..74f7c4da3 100644 --- a/tests/unit/test_logger.py +++ b/tests/unit/test_logger.py @@ -36,7 +36,7 @@ class TestLogger(unittest.TestCase): @staticmethod def _get_target_class(): - from google.cloud.logging.logger import Logger + from google.cloud.logging_v2.logger import Logger return Logger @@ -75,7 +75,7 @@ def test_ctor_explicit(self): self.assertEqual(logger.labels, LABELS) def test_batch_w_bound_client(self): - from google.cloud.logging.logger import Batch + from google.cloud.logging_v2.logger import Batch conn = object() client = _Client(self.PROJECT, conn) @@ -86,7 +86,7 @@ def test_batch_w_bound_client(self): self.assertIs(batch.client, client) def test_batch_w_alternate_client(self): - from google.cloud.logging.logger import Batch + from google.cloud.logging_v2.logger import Batch conn1 = object() conn2 = object() @@ -117,7 +117,7 @@ def test_log_empty_defaults_w_default_labels(self): def test_log_empty_w_explicit(self): import datetime - from google.cloud.logging.resource import Resource + from google.cloud.logging_v2.resource import Resource ALT_LOG_NAME = "projects/foo/logs/alt.log.name" DEFAULT_LABELS = {"foo": "spam"} @@ -207,7 +207,7 @@ def test_log_text_w_unicode_and_default_labels(self): def test_log_text_explicit(self): import datetime - from google.cloud.logging.resource import Resource + from google.cloud.logging_v2.resource import Resource ALT_LOG_NAME = "projects/foo/logs/alt.log.name" TEXT = "TEXT" @@ -300,7 +300,7 @@ def test_log_struct_w_default_labels(self): def test_log_struct_w_explicit(self): import datetime - from google.cloud.logging.resource import Resource + from google.cloud.logging_v2.resource import Resource ALT_LOG_NAME = "projects/foo/logs/alt.log.name" STRUCT = {"message": "MESSAGE", "weather": "cloudy"} @@ -405,7 +405,7 @@ def test_log_proto_w_explicit(self): from google.protobuf.json_format import MessageToJson from google.protobuf.struct_pb2 import Struct from google.protobuf.struct_pb2 import Value - from google.cloud.logging.resource import Resource + from google.cloud.logging_v2.resource import Resource message = Struct(fields={"foo": Value(bool_value=True)}) ALT_LOG_NAME = "projects/foo/logs/alt.log.name" @@ -485,7 +485,7 @@ def test_delete_w_alternate_client(self): def test_list_entries_defaults(self): import six - from google.cloud.logging.client import Client + from google.cloud.logging_v2.client import Client TOKEN = "TOKEN" @@ -526,8 +526,8 @@ def test_list_entries_defaults(self): self.assertLess(yesterday - timestamp, timedelta(minutes=1)) def test_list_entries_explicit(self): - from google.cloud.logging import DESCENDING - from google.cloud.logging.client import Client + from google.cloud.logging_v2 import DESCENDING + from google.cloud.logging_v2.client import Client PROJECT1 = "PROJECT1" PROJECT2 = "PROJECT2" @@ -586,8 +586,8 @@ def test_list_entries_explicit(self): self.assertLess(yesterday - timestamp, timedelta(minutes=1)) def test_list_entries_explicit_timestamp(self): - from google.cloud.logging import DESCENDING - from google.cloud.logging.client import Client + from google.cloud.logging_v2 import DESCENDING + from google.cloud.logging_v2.client import Client PROJECT1 = "PROJECT1" PROJECT2 = "PROJECT2" @@ -637,7 +637,7 @@ class TestBatch(unittest.TestCase): @staticmethod def _get_target_class(): - from google.cloud.logging.logger import Batch + from google.cloud.logging_v2.logger import Batch return Batch @@ -653,7 +653,7 @@ def test_ctor_defaults(self): self.assertEqual(len(batch.entries), 0) def test_log_empty_defaults(self): - from google.cloud.logging.entries import LogEntry + from google.cloud.logging_v2.entries import LogEntry ENTRY = LogEntry() client = _Client(project=self.PROJECT, connection=_make_credentials()) @@ -664,8 +664,8 @@ def test_log_empty_defaults(self): def test_log_empty_explicit(self): import datetime - from google.cloud.logging.resource import Resource - from google.cloud.logging.entries import LogEntry + from google.cloud.logging_v2.resource import Resource + from google.cloud.logging_v2.entries import LogEntry LABELS = {"foo": "bar", "baz": "qux"} IID = "IID" @@ -709,8 +709,8 @@ def test_log_empty_explicit(self): self.assertEqual(batch.entries, [ENTRY]) def test_log_text_defaults(self): - from google.cloud.logging.entries import _GLOBAL_RESOURCE - from google.cloud.logging.entries import TextEntry + from google.cloud.logging_v2.entries import _GLOBAL_RESOURCE + from google.cloud.logging_v2.entries import TextEntry TEXT = "This is the entry text" ENTRY = TextEntry(payload=TEXT, resource=_GLOBAL_RESOURCE) @@ -722,8 +722,8 @@ def test_log_text_defaults(self): def test_log_text_explicit(self): import datetime - from google.cloud.logging.resource import Resource - from google.cloud.logging.entries import TextEntry + from google.cloud.logging_v2.resource import Resource + from google.cloud.logging_v2.entries import TextEntry TEXT = "This is the entry text" LABELS = {"foo": "bar", "baz": "qux"} @@ -770,8 +770,8 @@ def test_log_text_explicit(self): self.assertEqual(batch.entries, [ENTRY]) def test_log_struct_defaults(self): - from google.cloud.logging.entries import _GLOBAL_RESOURCE - from google.cloud.logging.entries import StructEntry + from google.cloud.logging_v2.entries import _GLOBAL_RESOURCE + from google.cloud.logging_v2.entries import StructEntry STRUCT = {"message": "Message text", "weather": "partly cloudy"} ENTRY = StructEntry(payload=STRUCT, resource=_GLOBAL_RESOURCE) @@ -783,8 +783,8 @@ def test_log_struct_defaults(self): def test_log_struct_explicit(self): import datetime - from google.cloud.logging.resource import Resource - from google.cloud.logging.entries import StructEntry + from google.cloud.logging_v2.resource import Resource + from google.cloud.logging_v2.entries import StructEntry STRUCT = {"message": "Message text", "weather": "partly cloudy"} LABELS = {"foo": "bar", "baz": "qux"} @@ -831,8 +831,8 @@ def test_log_struct_explicit(self): self.assertEqual(batch.entries, [ENTRY]) def test_log_proto_defaults(self): - from google.cloud.logging.entries import _GLOBAL_RESOURCE - from google.cloud.logging.entries import ProtobufEntry + from google.cloud.logging_v2.entries import _GLOBAL_RESOURCE + from google.cloud.logging_v2.entries import ProtobufEntry from google.protobuf.struct_pb2 import Struct from google.protobuf.struct_pb2 import Value @@ -846,8 +846,8 @@ def test_log_proto_defaults(self): def test_log_proto_explicit(self): import datetime - from google.cloud.logging.resource import Resource - from google.cloud.logging.entries import ProtobufEntry + from google.cloud.logging_v2.resource import Resource + from google.cloud.logging_v2.entries import ProtobufEntry from google.protobuf.struct_pb2 import Struct from google.protobuf.struct_pb2 import Value @@ -895,8 +895,8 @@ def test_log_proto_explicit(self): self.assertEqual(batch.entries, [ENTRY]) def test_commit_w_unknown_entry_type(self): - from google.cloud.logging.entries import _GLOBAL_RESOURCE - from google.cloud.logging.entries import LogEntry + from google.cloud.logging_v2.entries import _GLOBAL_RESOURCE + from google.cloud.logging_v2.entries import LogEntry logger = _Logger() client = _Client(project=self.PROJECT, connection=_make_credentials()) @@ -913,8 +913,8 @@ def test_commit_w_unknown_entry_type(self): ) def test_commit_w_resource_specified(self): - from google.cloud.logging.entries import _GLOBAL_RESOURCE - from google.cloud.logging.resource import Resource + from google.cloud.logging_v2.entries import _GLOBAL_RESOURCE + from google.cloud.logging_v2.resource import Resource logger = _Logger() client = _Client(project=self.PROJECT, connection=_make_credentials()) @@ -944,7 +944,7 @@ def test_commit_w_bound_client(self): from google.protobuf.struct_pb2 import Struct from google.protobuf.struct_pb2 import Value from google.cloud._helpers import _datetime_to_rfc3339 - from google.cloud.logging.entries import _GLOBAL_RESOURCE + from google.cloud.logging_v2.entries import _GLOBAL_RESOURCE TEXT = "This is the entry text" STRUCT = {"message": TEXT, "weather": "partly cloudy"} @@ -1031,8 +1031,8 @@ def test_commit_w_alternate_client(self): from google.protobuf.json_format import MessageToJson from google.protobuf.struct_pb2 import Struct from google.protobuf.struct_pb2 import Value - from google.cloud.logging.logger import Logger - from google.cloud.logging.entries import _GLOBAL_RESOURCE + from google.cloud.logging_v2.logger import Logger + from google.cloud.logging_v2.entries import _GLOBAL_RESOURCE TEXT = "This is the entry text" STRUCT = {"message": TEXT, "weather": "partly cloudy"} @@ -1083,8 +1083,8 @@ def test_context_mgr_success(self): from google.protobuf.json_format import MessageToJson from google.protobuf.struct_pb2 import Struct from google.protobuf.struct_pb2 import Value - from google.cloud.logging.logger import Logger - from google.cloud.logging.entries import _GLOBAL_RESOURCE + from google.cloud.logging_v2.logger import Logger + from google.cloud.logging_v2.entries import _GLOBAL_RESOURCE TEXT = "This is the entry text" STRUCT = {"message": TEXT, "weather": "partly cloudy"} @@ -1133,9 +1133,9 @@ def test_context_mgr_failure(self): import datetime from google.protobuf.struct_pb2 import Struct from google.protobuf.struct_pb2 import Value - from google.cloud.logging.entries import TextEntry - from google.cloud.logging.entries import StructEntry - from google.cloud.logging.entries import ProtobufEntry + from google.cloud.logging_v2.entries import TextEntry + from google.cloud.logging_v2.entries import StructEntry + from google.cloud.logging_v2.entries import ProtobufEntry TEXT = "This is the entry text" STRUCT = {"message": TEXT, "weather": "partly cloudy"} diff --git a/tests/unit/test_metric.py b/tests/unit/test_metric.py index 93ee90b87..416a20044 100644 --- a/tests/unit/test_metric.py +++ b/tests/unit/test_metric.py @@ -24,7 +24,7 @@ class TestMetric(unittest.TestCase): @staticmethod def _get_target_class(): - from google.cloud.logging.metric import Metric + from google.cloud.logging_v2.metric import Metric return Metric diff --git a/tests/unit/test_sink.py b/tests/unit/test_sink.py index dc1ff9563..b51d0da44 100644 --- a/tests/unit/test_sink.py +++ b/tests/unit/test_sink.py @@ -25,7 +25,7 @@ class TestSink(unittest.TestCase): @staticmethod def _get_target_class(): - from google.cloud.logging.sink import Sink + from google.cloud.logging_v2.sink import Sink return Sink From 5cdf501b4e3495be2c71d482819e8a1c1a3e11e3 Mon Sep 17 00:00:00 2001 From: Bu Sun Kim Date: Thu, 29 Oct 2020 23:16:22 +0000 Subject: [PATCH 2/8] test: fix import --- tests/system/test_system.py | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/system/test_system.py b/tests/system/test_system.py index af057f960..0dbf5edce 100644 --- a/tests/system/test_system.py +++ b/tests/system/test_system.py @@ -25,7 +25,6 @@ from google.api_core.exceptions import ServiceUnavailable from google.cloud._helpers import UTC import google.cloud.logging -import google.cloud.logging.handlers.handlers from google.cloud.logging_v2.handlers.handlers import CloudLoggingHandler from google.cloud.logging_v2.handlers.transports import SyncTransport from google.cloud.logging_v2 import client From 0c2e15416cdbc5b3c17cec05a20e396b7a3248de Mon Sep 17 00:00:00 2001 From: Bu Sun Kim Date: Thu, 29 Oct 2020 23:28:06 +0000 Subject: [PATCH 3/8] fix: fix docs and lint --- docs/client.rst | 2 +- docs/entries.rst | 2 +- docs/handlers-app-engine.rst | 2 +- docs/handlers-container-engine.rst | 2 +- docs/handlers.rst | 2 +- docs/logger.rst | 2 +- docs/metric.rst | 2 +- docs/sink.rst | 2 +- docs/transports-base.rst | 2 +- docs/transports-sync.rst | 2 +- docs/transports-thread.rst | 2 +- google/cloud/logging/__init__.py | 4 ++-- google/cloud/logging_v2/__init__.py | 2 +- tests/unit/handlers/transports/test_background_thread.py | 4 +++- 14 files changed, 17 insertions(+), 15 deletions(-) diff --git a/docs/client.rst b/docs/client.rst index c9e78db27..4fe7c39e1 100644 --- a/docs/client.rst +++ b/docs/client.rst @@ -1,6 +1,6 @@ Cloud Logging Client ========================== -.. automodule:: google.cloud.logging.client +.. automodule:: google.cloud.logging_v2.client :members: :show-inheritance: diff --git a/docs/entries.rst b/docs/entries.rst index 223eadc07..9d473f3c1 100644 --- a/docs/entries.rst +++ b/docs/entries.rst @@ -1,7 +1,7 @@ Entries ======= -.. automodule:: google.cloud.logging.entries +.. automodule:: google.cloud.logging_v2.entries :members: :show-inheritance: :member-order: groupwise diff --git a/docs/handlers-app-engine.rst b/docs/handlers-app-engine.rst index 71c45e369..f25223a20 100644 --- a/docs/handlers-app-engine.rst +++ b/docs/handlers-app-engine.rst @@ -1,6 +1,6 @@ Google App Engine flexible Log Handler ====================================== -.. automodule:: google.cloud.logging.handlers.app_engine +.. automodule:: google.cloud.logging_v2.handlers.app_engine :members: :show-inheritance: diff --git a/docs/handlers-container-engine.rst b/docs/handlers-container-engine.rst index 5286ec58b..981b41dcb 100644 --- a/docs/handlers-container-engine.rst +++ b/docs/handlers-container-engine.rst @@ -1,6 +1,6 @@ Google Kubernetes Engine Log Handler ==================================== -.. automodule:: google.cloud.logging.handlers.container_engine +.. automodule:: google.cloud.logging_v2.handlers.container_engine :members: :show-inheritance: diff --git a/docs/handlers.rst b/docs/handlers.rst index 1a258a88a..9089170fb 100644 --- a/docs/handlers.rst +++ b/docs/handlers.rst @@ -1,6 +1,6 @@ Python Logging Module Handler ============================== -.. automodule:: google.cloud.logging.handlers.handlers +.. automodule:: google.cloud.logging_v2.handlers.handlers :members: :show-inheritance: diff --git a/docs/logger.rst b/docs/logger.rst index 72533ba33..8aca18199 100644 --- a/docs/logger.rst +++ b/docs/logger.rst @@ -1,6 +1,6 @@ Logger ====== -.. automodule:: google.cloud.logging.logger +.. automodule:: google.cloud.logging_v2.logger :members: :show-inheritance: diff --git a/docs/metric.rst b/docs/metric.rst index ca30e3c89..8ef5c3f08 100644 --- a/docs/metric.rst +++ b/docs/metric.rst @@ -1,6 +1,6 @@ Metrics ======= -.. automodule:: google.cloud.logging.metric +.. automodule:: google.cloud.logging_v2.metric :members: :show-inheritance: diff --git a/docs/sink.rst b/docs/sink.rst index 35e88562b..eb4027765 100644 --- a/docs/sink.rst +++ b/docs/sink.rst @@ -1,6 +1,6 @@ Sinks ===== -.. automodule:: google.cloud.logging.sink +.. automodule:: google.cloud.logging_v2.sink :members: :show-inheritance: diff --git a/docs/transports-base.rst b/docs/transports-base.rst index 5b52c46ca..b28fb5ba6 100644 --- a/docs/transports-base.rst +++ b/docs/transports-base.rst @@ -1,6 +1,6 @@ Python Logging Handler Sync Transport ====================================== -.. automodule:: google.cloud.logging.handlers.transports.base +.. automodule:: google.cloud.logging_v2.handlers.transports.base :members: :show-inheritance: diff --git a/docs/transports-sync.rst b/docs/transports-sync.rst index edb2b72f5..32e6401cb 100644 --- a/docs/transports-sync.rst +++ b/docs/transports-sync.rst @@ -1,6 +1,6 @@ Python Logging Handler Sync Transport ====================================== -.. automodule:: google.cloud.logging.handlers.transports.sync +.. automodule:: google.cloud.logging_v2.handlers.transports.sync :members: :show-inheritance: diff --git a/docs/transports-thread.rst b/docs/transports-thread.rst index 45780b27f..2899e6c48 100644 --- a/docs/transports-thread.rst +++ b/docs/transports-thread.rst @@ -2,6 +2,6 @@ Python Logging Handler Threaded Transport ========================================= -.. automodule:: google.cloud.logging.handlers.transports.background_thread +.. automodule:: google.cloud.logging_v2.handlers.transports.background_thread :members: :show-inheritance: diff --git a/google/cloud/logging/__init__.py b/google/cloud/logging/__init__.py index 20eab49d7..e47c1fd30 100644 --- a/google/cloud/logging/__init__.py +++ b/google/cloud/logging/__init__.py @@ -37,5 +37,5 @@ "Batch", "Metric", "Sink", - "handlers" -) \ No newline at end of file + "handlers", +) diff --git a/google/cloud/logging_v2/__init__.py b/google/cloud/logging_v2/__init__.py index a0495877d..896b7c1a1 100644 --- a/google/cloud/logging_v2/__init__.py +++ b/google/cloud/logging_v2/__init__.py @@ -58,5 +58,5 @@ class MetricsServiceV2Client(metrics_service_v2_client.MetricsServiceV2Client): "__version__", "ASCENDING", "Client", - "DESCENDING" + "DESCENDING", ) diff --git a/tests/unit/handlers/transports/test_background_thread.py b/tests/unit/handlers/transports/test_background_thread.py index 6fd878cba..db431637c 100644 --- a/tests/unit/handlers/transports/test_background_thread.py +++ b/tests/unit/handlers/transports/test_background_thread.py @@ -25,7 +25,9 @@ class TestBackgroundThreadHandler(unittest.TestCase): @staticmethod def _get_target_class(): - from google.cloud.logging_v2.handlers.transports import BackgroundThreadTransport + from google.cloud.logging_v2.handlers.transports import ( + BackgroundThreadTransport, + ) return BackgroundThreadTransport From b1e7cce3752a1c40a09cc0868456899c79320fdc Mon Sep 17 00:00:00 2001 From: Bu Sun Kim Date: Thu, 29 Oct 2020 23:44:17 +0000 Subject: [PATCH 4/8] fix: fix availability of __version__, Client --- google/cloud/logging/__init__.py | 7 ++++--- google/cloud/logging_v2/__init__.py | 10 +++------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/google/cloud/logging/__init__.py b/google/cloud/logging/__init__.py index e47c1fd30..264351ef8 100644 --- a/google/cloud/logging/__init__.py +++ b/google/cloud/logging/__init__.py @@ -1,6 +1,4 @@ -# -*- coding: utf-8 -*- - -# Copyright 2020 Google LLC +# Copyright 2016 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -25,6 +23,7 @@ from google.cloud.logging_v2.metric import Metric from google.cloud.logging_v2.sink import Sink from google.cloud.logging_v2 import handlers +from google.cloud.logging_v2 import __version__ as version __all__ = ( @@ -39,3 +38,5 @@ "Sink", "handlers", ) + +__version__ = version diff --git a/google/cloud/logging_v2/__init__.py b/google/cloud/logging_v2/__init__.py index 896b7c1a1..dba6f99f7 100644 --- a/google/cloud/logging_v2/__init__.py +++ b/google/cloud/logging_v2/__init__.py @@ -14,6 +14,9 @@ from __future__ import absolute_import +from pkg_resources import get_distribution + + from google.cloud.logging_v2 import types from google.cloud.logging_v2.gapic import config_service_v2_client from google.cloud.logging_v2.gapic import enums @@ -21,13 +24,8 @@ from google.cloud.logging_v2.gapic import metrics_service_v2_client -from pkg_resources import get_distribution - __version__ = get_distribution("google-cloud-logging").version -from google.cloud.logging_v2.client import Client - - ASCENDING = "timestamp asc" """Query string to order by ascending timestamps.""" DESCENDING = "timestamp desc" @@ -55,8 +53,6 @@ class MetricsServiceV2Client(metrics_service_v2_client.MetricsServiceV2Client): "LoggingServiceV2Client", "ConfigServiceV2Client", "MetricsServiceV2Client", - "__version__", "ASCENDING", - "Client", "DESCENDING", ) From 5231d95a1d5d2ae3211bbec1a5dbdf54ff91b36f Mon Sep 17 00:00:00 2001 From: Bu Sun Kim Date: Fri, 30 Oct 2020 02:08:53 +0000 Subject: [PATCH 5/8] fix: synchronize logging and logging_v2 --- google/cloud/logging/__init__.py | 47 +++++++++++++++-------------- google/cloud/logging_v2/__init__.py | 30 +++++++++++++----- tests/unit/test_logging_shim.py | 29 ++++++++++++++++++ 3 files changed, 77 insertions(+), 29 deletions(-) create mode 100644 tests/unit/test_logging_shim.py diff --git a/google/cloud/logging/__init__.py b/google/cloud/logging/__init__.py index 264351ef8..73a3a9777 100644 --- a/google/cloud/logging/__init__.py +++ b/google/cloud/logging/__init__.py @@ -13,30 +13,33 @@ # limitations under the License. # -from google.cloud.logging_v2.client import Client -from google.cloud.logging_v2.entries import LogEntry -from google.cloud.logging_v2.entries import TextEntry -from google.cloud.logging_v2.entries import ProtobufEntry -from google.cloud.logging_v2.entries import StructEntry -from google.cloud.logging_v2.logger import Logger -from google.cloud.logging_v2.logger import Batch -from google.cloud.logging_v2.metric import Metric -from google.cloud.logging_v2.sink import Sink +from google.cloud.logging_v2 import __version__ +from google.cloud.logging_v2 import ASCENDING +from google.cloud.logging_v2 import DESCENDING +from google.cloud.logging_v2 import client +from google.cloud.logging_v2 import entries from google.cloud.logging_v2 import handlers -from google.cloud.logging_v2 import __version__ as version - +from google.cloud.logging_v2 import logger +from google.cloud.logging_v2 import metric +from google.cloud.logging_v2 import sink +from google.cloud.logging_v2 import types +from google.cloud.logging_v2.gapic import enums +from google.cloud.logging_v2 import ConfigServiceV2Client +from google.cloud.logging_v2 import LoggingServiceV2Client +from google.cloud.logging_v2 import MetricsServiceV2Client __all__ = ( - "Client", - "LogEntry", - "TextEntry", - "ProtobufEntry", - "StructEntry", - "Logger", - "Batch", - "Metric", - "Sink", + "__version__", + "ASCENDING", + "client", + "ConfigServiceV2Client", + "DESCENDING", + "enums", "handlers", + "logger", + "LoggingServiceV2Client", + "metric", + "MetricsServiceV2Client", + "sink", + "types", ) - -__version__ = version diff --git a/google/cloud/logging_v2/__init__.py b/google/cloud/logging_v2/__init__.py index dba6f99f7..d8054949d 100644 --- a/google/cloud/logging_v2/__init__.py +++ b/google/cloud/logging_v2/__init__.py @@ -14,17 +14,27 @@ from __future__ import absolute_import -from pkg_resources import get_distribution +import pkg_resources +try: + __version__ = pkg_resources.get_distribution("google-cloud-logging").version +except pkg_resources.DistributionNotFound: + __version__ = None + +from google.cloud.logging_v2 import client +from google.cloud.logging_v2 import entries +from google.cloud.logging_v2 import handlers +from google.cloud.logging_v2 import logger +from google.cloud.logging_v2 import metric +from google.cloud.logging_v2 import sink from google.cloud.logging_v2 import types -from google.cloud.logging_v2.gapic import config_service_v2_client from google.cloud.logging_v2.gapic import enums +from google.cloud.logging_v2.gapic import config_service_v2_client from google.cloud.logging_v2.gapic import logging_service_v2_client from google.cloud.logging_v2.gapic import metrics_service_v2_client -__version__ = get_distribution("google-cloud-logging").version ASCENDING = "timestamp asc" """Query string to order by ascending timestamps.""" @@ -48,11 +58,17 @@ class MetricsServiceV2Client(metrics_service_v2_client.MetricsServiceV2Client): __all__ = ( + "__version__", + "ASCENDING", + "client", + "ConfigServiceV2Client", + "DESCENDING", "enums", - "types", + "handlers", + "logger", "LoggingServiceV2Client", - "ConfigServiceV2Client", + "metric", "MetricsServiceV2Client", - "ASCENDING", - "DESCENDING", + "sink", + "types", ) diff --git a/tests/unit/test_logging_shim.py b/tests/unit/test_logging_shim.py new file mode 100644 index 000000000..90af7feab --- /dev/null +++ b/tests/unit/test_logging_shim.py @@ -0,0 +1,29 @@ +# -*- coding: utf-8 -*- +# Copyright 2020 Google LLC All rights reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import unittest + + +class TestLoggingShim(unittest.TestCase): + def test_shim_matches_logging_v2(self): + from google.cloud import logging + from google.cloud import logging_v2 + + self.assertEqual(logging.__all__, logging_v2.__all__) + + for name in logging.__all__: + found = getattr(logging, name) + expected = getattr(logging_v2, name) + self.assertIs(found, expected) \ No newline at end of file From 1aa0294a4f85841191cfbe6649110f91b48f4457 Mon Sep 17 00:00:00 2001 From: Bu Sun Kim Date: Fri, 30 Oct 2020 18:52:04 +0000 Subject: [PATCH 6/8] fix: remove generated clients from __all__ --- google/cloud/logging/__init__.py | 39 ++++++++------ google/cloud/logging_v2/__init__.py | 54 ++++++++----------- .../v2/test_config_service_v2_client_v2.py | 48 ++++++++--------- .../v2/test_logging_service_v2_client_v2.py | 20 +++---- .../v2/test_metrics_service_v2_client_v2.py | 20 +++---- 5 files changed, 88 insertions(+), 93 deletions(-) diff --git a/google/cloud/logging/__init__.py b/google/cloud/logging/__init__.py index 73a3a9777..932b8f739 100644 --- a/google/cloud/logging/__init__.py +++ b/google/cloud/logging/__init__.py @@ -16,30 +16,35 @@ from google.cloud.logging_v2 import __version__ from google.cloud.logging_v2 import ASCENDING from google.cloud.logging_v2 import DESCENDING -from google.cloud.logging_v2 import client -from google.cloud.logging_v2 import entries +from google.cloud.logging_v2.client import Client +from google.cloud.logging_v2.entries import logger_name_from_path +from google.cloud.logging_v2.entries import LogEntry +from google.cloud.logging_v2.entries import TextEntry +from google.cloud.logging_v2.entries import StructEntry +from google.cloud.logging_v2.entries import ProtobufEntry from google.cloud.logging_v2 import handlers -from google.cloud.logging_v2 import logger -from google.cloud.logging_v2 import metric -from google.cloud.logging_v2 import sink +from google.cloud.logging_v2.logger import Logger +from google.cloud.logging_v2.logger import Batch +from google.cloud.logging_v2.metric import Metric +from google.cloud.logging_v2.resource import Resource +from google.cloud.logging_v2.sink import Sink from google.cloud.logging_v2 import types -from google.cloud.logging_v2.gapic import enums -from google.cloud.logging_v2 import ConfigServiceV2Client -from google.cloud.logging_v2 import LoggingServiceV2Client -from google.cloud.logging_v2 import MetricsServiceV2Client __all__ = ( "__version__", "ASCENDING", - "client", - "ConfigServiceV2Client", + "Batch", + "Client", "DESCENDING", - "enums", "handlers", - "logger", - "LoggingServiceV2Client", - "metric", - "MetricsServiceV2Client", - "sink", + "logger_name_from_path", + "Logger", + "LogEntry", + "Metric", + "ProtobufEntry", + "Resource", + "Sink", + "StructEntry", + "TextEntry", "types", ) diff --git a/google/cloud/logging_v2/__init__.py b/google/cloud/logging_v2/__init__.py index d8054949d..563accddd 100644 --- a/google/cloud/logging_v2/__init__.py +++ b/google/cloud/logging_v2/__init__.py @@ -22,17 +22,19 @@ __version__ = None -from google.cloud.logging_v2 import client -from google.cloud.logging_v2 import entries +from google.cloud.logging_v2.client import Client +from google.cloud.logging_v2.entries import logger_name_from_path +from google.cloud.logging_v2.entries import LogEntry +from google.cloud.logging_v2.entries import TextEntry +from google.cloud.logging_v2.entries import StructEntry +from google.cloud.logging_v2.entries import ProtobufEntry from google.cloud.logging_v2 import handlers -from google.cloud.logging_v2 import logger -from google.cloud.logging_v2 import metric -from google.cloud.logging_v2 import sink +from google.cloud.logging_v2.logger import Logger +from google.cloud.logging_v2.logger import Batch +from google.cloud.logging_v2.metric import Metric +from google.cloud.logging_v2.resource import Resource +from google.cloud.logging_v2.sink import Sink from google.cloud.logging_v2 import types -from google.cloud.logging_v2.gapic import enums -from google.cloud.logging_v2.gapic import config_service_v2_client -from google.cloud.logging_v2.gapic import logging_service_v2_client -from google.cloud.logging_v2.gapic import metrics_service_v2_client @@ -42,33 +44,21 @@ """Query string to order by decending timestamps.""" -class LoggingServiceV2Client(logging_service_v2_client.LoggingServiceV2Client): - __doc__ = logging_service_v2_client.LoggingServiceV2Client.__doc__ - enums = enums - - -class ConfigServiceV2Client(config_service_v2_client.ConfigServiceV2Client): - __doc__ = config_service_v2_client.ConfigServiceV2Client.__doc__ - enums = enums - - -class MetricsServiceV2Client(metrics_service_v2_client.MetricsServiceV2Client): - __doc__ = metrics_service_v2_client.MetricsServiceV2Client.__doc__ - enums = enums - - __all__ = ( "__version__", "ASCENDING", - "client", - "ConfigServiceV2Client", + "Batch", + "Client", "DESCENDING", - "enums", "handlers", - "logger", - "LoggingServiceV2Client", - "metric", - "MetricsServiceV2Client", - "sink", + "logger_name_from_path", + "Logger", + "LogEntry", + "Metric", + "ProtobufEntry", + "Resource", + "Sink", + "StructEntry", + "TextEntry", "types", ) diff --git a/tests/unit/gapic/v2/test_config_service_v2_client_v2.py b/tests/unit/gapic/v2/test_config_service_v2_client_v2.py index 0483a4582..838436ec8 100644 --- a/tests/unit/gapic/v2/test_config_service_v2_client_v2.py +++ b/tests/unit/gapic/v2/test_config_service_v2_client_v2.py @@ -75,7 +75,7 @@ def test_list_sinks(self): patch = mock.patch("google.api_core.grpc_helpers.create_channel") with patch as create_channel: create_channel.return_value = channel - client = logging_v2.ConfigServiceV2Client() + client = logging_v2.gapic.config_service_v2_client.ConfigServiceV2Client() # Setup Request parent = client.project_path("[PROJECT]") @@ -96,7 +96,7 @@ def test_list_sinks_exception(self): patch = mock.patch("google.api_core.grpc_helpers.create_channel") with patch as create_channel: create_channel.return_value = channel - client = logging_v2.ConfigServiceV2Client() + client = logging_v2.gapic.config_service_v2_client.ConfigServiceV2Client() # Setup request parent = client.project_path("[PROJECT]") @@ -130,7 +130,7 @@ def test_get_sink(self): patch = mock.patch("google.api_core.grpc_helpers.create_channel") with patch as create_channel: create_channel.return_value = channel - client = logging_v2.ConfigServiceV2Client() + client = logging_v2.gapic.config_service_v2_client.ConfigServiceV2Client() # Setup Request sink_name = client.sink_path("[PROJECT]", "[SINK]") @@ -149,7 +149,7 @@ def test_get_sink_exception(self): patch = mock.patch("google.api_core.grpc_helpers.create_channel") with patch as create_channel: create_channel.return_value = channel - client = logging_v2.ConfigServiceV2Client() + client = logging_v2.gapic.config_service_v2_client.ConfigServiceV2Client() # Setup request sink_name = client.sink_path("[PROJECT]", "[SINK]") @@ -182,7 +182,7 @@ def test_create_sink(self): patch = mock.patch("google.api_core.grpc_helpers.create_channel") with patch as create_channel: create_channel.return_value = channel - client = logging_v2.ConfigServiceV2Client() + client = logging_v2.gapic.config_service_v2_client.ConfigServiceV2Client() # Setup Request parent = client.project_path("[PROJECT]") @@ -204,7 +204,7 @@ def test_create_sink_exception(self): patch = mock.patch("google.api_core.grpc_helpers.create_channel") with patch as create_channel: create_channel.return_value = channel - client = logging_v2.ConfigServiceV2Client() + client = logging_v2.gapic.config_service_v2_client.ConfigServiceV2Client() # Setup request parent = client.project_path("[PROJECT]") @@ -238,7 +238,7 @@ def test_update_sink(self): patch = mock.patch("google.api_core.grpc_helpers.create_channel") with patch as create_channel: create_channel.return_value = channel - client = logging_v2.ConfigServiceV2Client() + client = logging_v2.gapic.config_service_v2_client.ConfigServiceV2Client() # Setup Request sink_name = client.sink_path("[PROJECT]", "[SINK]") @@ -260,7 +260,7 @@ def test_update_sink_exception(self): patch = mock.patch("google.api_core.grpc_helpers.create_channel") with patch as create_channel: create_channel.return_value = channel - client = logging_v2.ConfigServiceV2Client() + client = logging_v2.gapic.config_service_v2_client.ConfigServiceV2Client() # Setup request sink_name = client.sink_path("[PROJECT]", "[SINK]") @@ -274,7 +274,7 @@ def test_delete_sink(self): patch = mock.patch("google.api_core.grpc_helpers.create_channel") with patch as create_channel: create_channel.return_value = channel - client = logging_v2.ConfigServiceV2Client() + client = logging_v2.gapic.config_service_v2_client.ConfigServiceV2Client() # Setup Request sink_name = client.sink_path("[PROJECT]", "[SINK]") @@ -292,7 +292,7 @@ def test_delete_sink_exception(self): patch = mock.patch("google.api_core.grpc_helpers.create_channel") with patch as create_channel: create_channel.return_value = channel - client = logging_v2.ConfigServiceV2Client() + client = logging_v2.gapic.config_service_v2_client.ConfigServiceV2Client() # Setup request sink_name = client.sink_path("[PROJECT]", "[SINK]") @@ -318,7 +318,7 @@ def test_list_exclusions(self): patch = mock.patch("google.api_core.grpc_helpers.create_channel") with patch as create_channel: create_channel.return_value = channel - client = logging_v2.ConfigServiceV2Client() + client = logging_v2.gapic.config_service_v2_client.ConfigServiceV2Client() # Setup Request parent = client.project_path("[PROJECT]") @@ -339,7 +339,7 @@ def test_list_exclusions_exception(self): patch = mock.patch("google.api_core.grpc_helpers.create_channel") with patch as create_channel: create_channel.return_value = channel - client = logging_v2.ConfigServiceV2Client() + client = logging_v2.gapic.config_service_v2_client.ConfigServiceV2Client() # Setup request parent = client.project_path("[PROJECT]") @@ -367,7 +367,7 @@ def test_get_exclusion(self): patch = mock.patch("google.api_core.grpc_helpers.create_channel") with patch as create_channel: create_channel.return_value = channel - client = logging_v2.ConfigServiceV2Client() + client = logging_v2.gapic.config_service_v2_client.ConfigServiceV2Client() # Setup Request name = client.exclusion_path("[PROJECT]", "[EXCLUSION]") @@ -386,7 +386,7 @@ def test_get_exclusion_exception(self): patch = mock.patch("google.api_core.grpc_helpers.create_channel") with patch as create_channel: create_channel.return_value = channel - client = logging_v2.ConfigServiceV2Client() + client = logging_v2.gapic.config_service_v2_client.ConfigServiceV2Client() # Setup request name = client.exclusion_path("[PROJECT]", "[EXCLUSION]") @@ -413,7 +413,7 @@ def test_create_exclusion(self): patch = mock.patch("google.api_core.grpc_helpers.create_channel") with patch as create_channel: create_channel.return_value = channel - client = logging_v2.ConfigServiceV2Client() + client = logging_v2.gapic.config_service_v2_client.ConfigServiceV2Client() # Setup Request parent = client.project_path("[PROJECT]") @@ -435,7 +435,7 @@ def test_create_exclusion_exception(self): patch = mock.patch("google.api_core.grpc_helpers.create_channel") with patch as create_channel: create_channel.return_value = channel - client = logging_v2.ConfigServiceV2Client() + client = logging_v2.gapic.config_service_v2_client.ConfigServiceV2Client() # Setup request parent = client.project_path("[PROJECT]") @@ -463,7 +463,7 @@ def test_update_exclusion(self): patch = mock.patch("google.api_core.grpc_helpers.create_channel") with patch as create_channel: create_channel.return_value = channel - client = logging_v2.ConfigServiceV2Client() + client = logging_v2.gapic.config_service_v2_client.ConfigServiceV2Client() # Setup Request name = client.exclusion_path("[PROJECT]", "[EXCLUSION]") @@ -486,7 +486,7 @@ def test_update_exclusion_exception(self): patch = mock.patch("google.api_core.grpc_helpers.create_channel") with patch as create_channel: create_channel.return_value = channel - client = logging_v2.ConfigServiceV2Client() + client = logging_v2.gapic.config_service_v2_client.ConfigServiceV2Client() # Setup request name = client.exclusion_path("[PROJECT]", "[EXCLUSION]") @@ -501,7 +501,7 @@ def test_delete_exclusion(self): patch = mock.patch("google.api_core.grpc_helpers.create_channel") with patch as create_channel: create_channel.return_value = channel - client = logging_v2.ConfigServiceV2Client() + client = logging_v2.gapic.config_service_v2_client.ConfigServiceV2Client() # Setup Request name = client.exclusion_path("[PROJECT]", "[EXCLUSION]") @@ -519,7 +519,7 @@ def test_delete_exclusion_exception(self): patch = mock.patch("google.api_core.grpc_helpers.create_channel") with patch as create_channel: create_channel.return_value = channel - client = logging_v2.ConfigServiceV2Client() + client = logging_v2.gapic.config_service_v2_client.ConfigServiceV2Client() # Setup request name = client.exclusion_path("[PROJECT]", "[EXCLUSION]") @@ -544,7 +544,7 @@ def test_get_cmek_settings(self): patch = mock.patch("google.api_core.grpc_helpers.create_channel") with patch as create_channel: create_channel.return_value = channel - client = logging_v2.ConfigServiceV2Client() + client = logging_v2.gapic.config_service_v2_client.ConfigServiceV2Client() response = client.get_cmek_settings() assert expected_response == response @@ -560,7 +560,7 @@ def test_get_cmek_settings_exception(self): patch = mock.patch("google.api_core.grpc_helpers.create_channel") with patch as create_channel: create_channel.return_value = channel - client = logging_v2.ConfigServiceV2Client() + client = logging_v2.gapic.config_service_v2_client.ConfigServiceV2Client() with pytest.raises(CustomException): client.get_cmek_settings() @@ -582,7 +582,7 @@ def test_update_cmek_settings(self): patch = mock.patch("google.api_core.grpc_helpers.create_channel") with patch as create_channel: create_channel.return_value = channel - client = logging_v2.ConfigServiceV2Client() + client = logging_v2.gapic.config_service_v2_client.ConfigServiceV2Client() response = client.update_cmek_settings() assert expected_response == response @@ -598,7 +598,7 @@ def test_update_cmek_settings_exception(self): patch = mock.patch("google.api_core.grpc_helpers.create_channel") with patch as create_channel: create_channel.return_value = channel - client = logging_v2.ConfigServiceV2Client() + client = logging_v2.gapic.config_service_v2_client.ConfigServiceV2Client() with pytest.raises(CustomException): client.update_cmek_settings() diff --git a/tests/unit/gapic/v2/test_logging_service_v2_client_v2.py b/tests/unit/gapic/v2/test_logging_service_v2_client_v2.py index ef2abc733..edc512a79 100644 --- a/tests/unit/gapic/v2/test_logging_service_v2_client_v2.py +++ b/tests/unit/gapic/v2/test_logging_service_v2_client_v2.py @@ -68,7 +68,7 @@ def test_delete_log(self): patch = mock.patch("google.api_core.grpc_helpers.create_channel") with patch as create_channel: create_channel.return_value = channel - client = logging_v2.LoggingServiceV2Client() + client = logging_v2.gapic.logging_service_v2_client.LoggingServiceV2Client() # Setup Request log_name = client.log_path("[PROJECT]", "[LOG]") @@ -86,7 +86,7 @@ def test_delete_log_exception(self): patch = mock.patch("google.api_core.grpc_helpers.create_channel") with patch as create_channel: create_channel.return_value = channel - client = logging_v2.LoggingServiceV2Client() + client = logging_v2.gapic.logging_service_v2_client.LoggingServiceV2Client() # Setup request log_name = client.log_path("[PROJECT]", "[LOG]") @@ -104,7 +104,7 @@ def test_write_log_entries(self): patch = mock.patch("google.api_core.grpc_helpers.create_channel") with patch as create_channel: create_channel.return_value = channel - client = logging_v2.LoggingServiceV2Client() + client = logging_v2.gapic.logging_service_v2_client.LoggingServiceV2Client() # Setup Request entries = [] @@ -123,7 +123,7 @@ def test_write_log_entries_exception(self): patch = mock.patch("google.api_core.grpc_helpers.create_channel") with patch as create_channel: create_channel.return_value = channel - client = logging_v2.LoggingServiceV2Client() + client = logging_v2.gapic.logging_service_v2_client.LoggingServiceV2Client() # Setup request entries = [] @@ -144,7 +144,7 @@ def test_list_log_entries(self): patch = mock.patch("google.api_core.grpc_helpers.create_channel") with patch as create_channel: create_channel.return_value = channel - client = logging_v2.LoggingServiceV2Client() + client = logging_v2.gapic.logging_service_v2_client.LoggingServiceV2Client() # Setup Request resource_names = [] @@ -167,7 +167,7 @@ def test_list_log_entries_exception(self): patch = mock.patch("google.api_core.grpc_helpers.create_channel") with patch as create_channel: create_channel.return_value = channel - client = logging_v2.LoggingServiceV2Client() + client = logging_v2.gapic.logging_service_v2_client.LoggingServiceV2Client() # Setup request resource_names = [] @@ -194,7 +194,7 @@ def test_list_monitored_resource_descriptors(self): patch = mock.patch("google.api_core.grpc_helpers.create_channel") with patch as create_channel: create_channel.return_value = channel - client = logging_v2.LoggingServiceV2Client() + client = logging_v2.gapic.logging_service_v2_client.LoggingServiceV2Client() paged_list_response = client.list_monitored_resource_descriptors() resources = list(paged_list_response) @@ -212,7 +212,7 @@ def test_list_monitored_resource_descriptors_exception(self): patch = mock.patch("google.api_core.grpc_helpers.create_channel") with patch as create_channel: create_channel.return_value = channel - client = logging_v2.LoggingServiceV2Client() + client = logging_v2.gapic.logging_service_v2_client.LoggingServiceV2Client() paged_list_response = client.list_monitored_resource_descriptors() with pytest.raises(CustomException): @@ -231,7 +231,7 @@ def test_list_logs(self): patch = mock.patch("google.api_core.grpc_helpers.create_channel") with patch as create_channel: create_channel.return_value = channel - client = logging_v2.LoggingServiceV2Client() + client = logging_v2.gapic.logging_service_v2_client.LoggingServiceV2Client() # Setup Request parent = client.project_path("[PROJECT]") @@ -252,7 +252,7 @@ def test_list_logs_exception(self): patch = mock.patch("google.api_core.grpc_helpers.create_channel") with patch as create_channel: create_channel.return_value = channel - client = logging_v2.LoggingServiceV2Client() + client = logging_v2.gapic.logging_service_v2_client.LoggingServiceV2Client() # Setup request parent = client.project_path("[PROJECT]") diff --git a/tests/unit/gapic/v2/test_metrics_service_v2_client_v2.py b/tests/unit/gapic/v2/test_metrics_service_v2_client_v2.py index 35201f790..c02099761 100644 --- a/tests/unit/gapic/v2/test_metrics_service_v2_client_v2.py +++ b/tests/unit/gapic/v2/test_metrics_service_v2_client_v2.py @@ -76,7 +76,7 @@ def test_list_log_metrics(self): patch = mock.patch("google.api_core.grpc_helpers.create_channel") with patch as create_channel: create_channel.return_value = channel - client = logging_v2.MetricsServiceV2Client() + client = logging_v2.gapic.metrics_service_v2_client.MetricsServiceV2Client() # Setup Request parent = client.project_path("[PROJECT]") @@ -97,7 +97,7 @@ def test_list_log_metrics_exception(self): patch = mock.patch("google.api_core.grpc_helpers.create_channel") with patch as create_channel: create_channel.return_value = channel - client = logging_v2.MetricsServiceV2Client() + client = logging_v2.gapic.metrics_service_v2_client.MetricsServiceV2Client() # Setup request parent = client.project_path("[PROJECT]") @@ -125,7 +125,7 @@ def test_get_log_metric(self): patch = mock.patch("google.api_core.grpc_helpers.create_channel") with patch as create_channel: create_channel.return_value = channel - client = logging_v2.MetricsServiceV2Client() + client = logging_v2.gapic.metrics_service_v2_client.MetricsServiceV2Client() # Setup Request metric_name = client.metric_path("[PROJECT]", "[METRIC]") @@ -146,7 +146,7 @@ def test_get_log_metric_exception(self): patch = mock.patch("google.api_core.grpc_helpers.create_channel") with patch as create_channel: create_channel.return_value = channel - client = logging_v2.MetricsServiceV2Client() + client = logging_v2.gapic.metrics_service_v2_client.MetricsServiceV2Client() # Setup request metric_name = client.metric_path("[PROJECT]", "[METRIC]") @@ -173,7 +173,7 @@ def test_create_log_metric(self): patch = mock.patch("google.api_core.grpc_helpers.create_channel") with patch as create_channel: create_channel.return_value = channel - client = logging_v2.MetricsServiceV2Client() + client = logging_v2.gapic.metrics_service_v2_client.MetricsServiceV2Client() # Setup Request parent = client.project_path("[PROJECT]") @@ -195,7 +195,7 @@ def test_create_log_metric_exception(self): patch = mock.patch("google.api_core.grpc_helpers.create_channel") with patch as create_channel: create_channel.return_value = channel - client = logging_v2.MetricsServiceV2Client() + client = logging_v2.gapic.metrics_service_v2_client.MetricsServiceV2Client() # Setup request parent = client.project_path("[PROJECT]") @@ -223,7 +223,7 @@ def test_update_log_metric(self): patch = mock.patch("google.api_core.grpc_helpers.create_channel") with patch as create_channel: create_channel.return_value = channel - client = logging_v2.MetricsServiceV2Client() + client = logging_v2.gapic.metrics_service_v2_client.MetricsServiceV2Client() # Setup Request metric_name = client.metric_path("[PROJECT]", "[METRIC]") @@ -245,7 +245,7 @@ def test_update_log_metric_exception(self): patch = mock.patch("google.api_core.grpc_helpers.create_channel") with patch as create_channel: create_channel.return_value = channel - client = logging_v2.MetricsServiceV2Client() + client = logging_v2.gapic.metrics_service_v2_client.MetricsServiceV2Client() # Setup request metric_name = client.metric_path("[PROJECT]", "[METRIC]") @@ -259,7 +259,7 @@ def test_delete_log_metric(self): patch = mock.patch("google.api_core.grpc_helpers.create_channel") with patch as create_channel: create_channel.return_value = channel - client = logging_v2.MetricsServiceV2Client() + client = logging_v2.gapic.metrics_service_v2_client.MetricsServiceV2Client() # Setup Request metric_name = client.metric_path("[PROJECT]", "[METRIC]") @@ -279,7 +279,7 @@ def test_delete_log_metric_exception(self): patch = mock.patch("google.api_core.grpc_helpers.create_channel") with patch as create_channel: create_channel.return_value = channel - client = logging_v2.MetricsServiceV2Client() + client = logging_v2.gapic.metrics_service_v2_client.MetricsServiceV2Client() # Setup request metric_name = client.metric_path("[PROJECT]", "[METRIC]") From fc7c2314535766e6e1e650d67d70ceca1ad93e54 Mon Sep 17 00:00:00 2001 From: Bu Sun Kim Date: Fri, 30 Oct 2020 20:12:02 +0000 Subject: [PATCH 7/8] test: fix system test --- tests/system/gapic/v2/test_system_logging_service_v2_v2.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/system/gapic/v2/test_system_logging_service_v2_v2.py b/tests/system/gapic/v2/test_system_logging_service_v2_v2.py index d574de778..6373f70b0 100644 --- a/tests/system/gapic/v2/test_system_logging_service_v2_v2.py +++ b/tests/system/gapic/v2/test_system_logging_service_v2_v2.py @@ -26,7 +26,7 @@ class TestSystemLoggingServiceV2(object): def test_write_log_entries(self): _, project_id = google.auth.default() - client = logging_v2.LoggingServiceV2Client() + client = logging_v2.gapic.logging_service_v2_client.LoggingServiceV2Client() log_name = client.log_path(project_id, "test-{0}".format(time.time())) resource = {} labels = {} From 046d78784afb4b83fae705d13d07adf13f744c57 Mon Sep 17 00:00:00 2001 From: Bu Sun Kim Date: Fri, 30 Oct 2020 20:35:28 +0000 Subject: [PATCH 8/8] chore: blacken --- google/cloud/logging_v2/__init__.py | 1 - tests/unit/test_logging_shim.py | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/google/cloud/logging_v2/__init__.py b/google/cloud/logging_v2/__init__.py index 563accddd..98954d550 100644 --- a/google/cloud/logging_v2/__init__.py +++ b/google/cloud/logging_v2/__init__.py @@ -37,7 +37,6 @@ from google.cloud.logging_v2 import types - ASCENDING = "timestamp asc" """Query string to order by ascending timestamps.""" DESCENDING = "timestamp desc" diff --git a/tests/unit/test_logging_shim.py b/tests/unit/test_logging_shim.py index 90af7feab..507b7c635 100644 --- a/tests/unit/test_logging_shim.py +++ b/tests/unit/test_logging_shim.py @@ -26,4 +26,4 @@ def test_shim_matches_logging_v2(self): for name in logging.__all__: found = getattr(logging, name) expected = getattr(logging_v2, name) - self.assertIs(found, expected) \ No newline at end of file + self.assertIs(found, expected)