Skip to content

Commit cb41e3a

Browse files
arithmetic1728arithmetic1728
authored
feat!: migrate to use microgen (#23)
* feat!: migrate to use microgen * add comments * remove google/cloud/errorreporting folder
1 parent d876d94 commit cb41e3a

File tree

77 files changed

+9656
-5961
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+9656
-5961
lines changed

‎.coveragerc

+6-7
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,14 @@ branch = True
2121
[report]
2222
fail_under = 100
2323
show_missing = True
24+
omit = google/cloud/errorreporting/__init__.py, .nox/*
2425
exclude_lines =
2526
# Re-enable the standard pragma
2627
pragma: NO COVER
2728
# Ignore debug-only repr
2829
def __repr__
29-
# Ignore abstract methods
30-
raise NotImplementedError
31-
omit =
32-
*/gapic/*.py
33-
*/proto/*.py
34-
*/core/*.py
35-
*/site-packages/*.py
30+
# Ignore pkg_resources exceptions.
31+
# This is added at the module level as a safeguard for if someone
32+
# generates the code and tries to run it without pip installing. This
33+
# makes it virtually impossible to test properly.
34+
except pkg_resources.DistributionNotFound

‎README.rst

+4-2
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,13 @@ dependencies.
5454

5555
Supported Python Versions
5656
^^^^^^^^^^^^^^^^^^^^^^^^^
57-
Python >= 3.5
57+
Python >= 3.6
5858

5959
Deprecated Python Versions
6060
^^^^^^^^^^^^^^^^^^^^^^^^^^
61-
Python == 2.7. Python 2.7 support will be removed on January 1, 2020.
61+
Python == 2.7.
62+
63+
The last version of this library compatible with Python 2.7 is google-cloud-error-reporting==0.34.0.
6264

6365

6466
Mac/Linux

‎docs/errorreporting_v1beta1/services.rst

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
Services for Google Cloud Errorreporting v1beta1 API
2+
====================================================
3+
4+
.. automodule:: google.cloud.errorreporting_v1beta1.services.error_group_service
5+
:members:
6+
:inherited-members:
7+
.. automodule:: google.cloud.errorreporting_v1beta1.services.error_stats_service
8+
:members:
9+
:inherited-members:
10+
.. automodule:: google.cloud.errorreporting_v1beta1.services.report_errors_service
11+
:members:
12+
:inherited-members:

‎docs/errorreporting_v1beta1/types.rst

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
Types for Google Cloud Errorreporting v1beta1 API
2+
=================================================
3+
4+
.. automodule:: google.cloud.errorreporting_v1beta1.types
5+
:members:

‎docs/gapic/v1beta1/api.rst

-6
This file was deleted.

‎docs/gapic/v1beta1/types.rst

-5
This file was deleted.

‎docs/index.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ API Reference
1919

2020
client
2121
util
22-
gapic/v1beta1/api
23-
gapic/v1beta1/types
22+
errorreporting_v1beta1/services
23+
errorreporting_v1beta1/types
2424

2525

2626
Changelog

‎google/cloud/error_reporting/_gapic.py

+16-9
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,9 @@
1313
# limitations under the License.
1414

1515
"""GAX wrapper for Error Reporting API requests."""
16+
import json
1617

17-
from google.cloud.errorreporting_v1beta1.gapic import report_errors_service_client
18-
from google.cloud.errorreporting_v1beta1.proto import report_errors_service_pb2
19-
from google.protobuf.json_format import ParseDict
18+
import google.cloud.errorreporting_v1beta1
2019

2120

2221
def make_report_error_api(client):
@@ -28,7 +27,7 @@ def make_report_error_api(client):
2827
:rtype: :class:_ErrorReportingGapicApi
2928
:returns: An Error Reporting API instance.
3029
"""
31-
gapic_api = report_errors_service_client.ReportErrorsServiceClient(
30+
gapic_api = google.cloud.errorreporting_v1beta1.ReportErrorsServiceClient(
3231
credentials=client._credentials,
3332
client_info=client._client_info,
3433
client_options=client._client_options,
@@ -40,7 +39,7 @@ class _ErrorReportingGapicApi(object):
4039
"""Helper mapping Error Reporting-related APIs
4140
4241
:type gapic:
43-
:class:`report_errors_service_client.ReportErrorsServiceClient`
42+
:class:`google.cloud.errorreporting_v1beta1.ReportErrorsServiceClient`
4443
:param gapic: API object used to make RPCs.
4544
4645
:type project: str
@@ -62,7 +61,15 @@ def report_error_event(self, error_report):
6261
Use
6362
:meth:~`google.cloud.error_reporting.client._build_error_report`
6463
"""
65-
project_name = self._gapic_api.project_path(self._project)
66-
error_report_payload = report_errors_service_pb2.ReportedErrorEvent()
67-
ParseDict(error_report, error_report_payload)
68-
self._gapic_api.report_error_event(project_name, error_report_payload)
64+
project_name = f"projects/{self._project}"
65+
66+
# Since error_report uses camel case for key names (like serviceContext),
67+
# but ReportedErrorEvent uses snake case for key names (like service_context),
68+
# we need to route throught json.
69+
error_report_payload = google.cloud.errorreporting_v1beta1.ReportedErrorEvent.from_json(
70+
json.dumps(error_report)
71+
)
72+
73+
self._gapic_api.report_error_event(
74+
project_name=project_name, event=error_report_payload
75+
)

‎google/cloud/errorreporting_v1beta1/__init__.py

+56-26
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,75 @@
1-
# Copyright 2018 Google LLC
1+
# -*- coding: utf-8 -*-
2+
3+
# Copyright 2020 Google LLC
24
#
35
# Licensed under the Apache License, Version 2.0 (the "License");
46
# you may not use this file except in compliance with the License.
57
# You may obtain a copy of the License at
68
#
7-
# https://www.apache.org/licenses/LICENSE-2.0
9+
# http://www.apache.org/licenses/LICENSE-2.0
810
#
911
# Unless required by applicable law or agreed to in writing, software
1012
# distributed under the License is distributed on an "AS IS" BASIS,
1113
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1214
# See the License for the specific language governing permissions and
1315
# limitations under the License.
16+
#
1417

15-
from __future__ import absolute_import
16-
17-
from google.cloud.errorreporting_v1beta1 import types
18-
from google.cloud.errorreporting_v1beta1.gapic import enums
19-
from google.cloud.errorreporting_v1beta1.gapic import error_group_service_client
20-
from google.cloud.errorreporting_v1beta1.gapic import error_stats_service_client
21-
from google.cloud.errorreporting_v1beta1.gapic import report_errors_service_client
22-
23-
24-
class ErrorGroupServiceClient(error_group_service_client.ErrorGroupServiceClient):
25-
__doc__ = error_group_service_client.ErrorGroupServiceClient.__doc__
26-
enums = enums
27-
28-
29-
class ErrorStatsServiceClient(error_stats_service_client.ErrorStatsServiceClient):
30-
__doc__ = error_stats_service_client.ErrorStatsServiceClient.__doc__
31-
enums = enums
32-
33-
34-
class ReportErrorsServiceClient(report_errors_service_client.ReportErrorsServiceClient):
35-
__doc__ = report_errors_service_client.ReportErrorsServiceClient.__doc__
36-
enums = enums
18+
from .services.error_group_service import ErrorGroupServiceClient
19+
from .services.error_stats_service import ErrorStatsServiceClient
20+
from .services.report_errors_service import ReportErrorsServiceClient
21+
from .types.common import ErrorContext
22+
from .types.common import ErrorEvent
23+
from .types.common import ErrorGroup
24+
from .types.common import HttpRequestContext
25+
from .types.common import ServiceContext
26+
from .types.common import SourceLocation
27+
from .types.common import TrackingIssue
28+
from .types.error_group_service import GetGroupRequest
29+
from .types.error_group_service import UpdateGroupRequest
30+
from .types.error_stats_service import DeleteEventsRequest
31+
from .types.error_stats_service import DeleteEventsResponse
32+
from .types.error_stats_service import ErrorGroupOrder
33+
from .types.error_stats_service import ErrorGroupStats
34+
from .types.error_stats_service import ListEventsRequest
35+
from .types.error_stats_service import ListEventsResponse
36+
from .types.error_stats_service import ListGroupStatsRequest
37+
from .types.error_stats_service import ListGroupStatsResponse
38+
from .types.error_stats_service import QueryTimeRange
39+
from .types.error_stats_service import ServiceContextFilter
40+
from .types.error_stats_service import TimedCount
41+
from .types.error_stats_service import TimedCountAlignment
42+
from .types.report_errors_service import ReportErrorEventRequest
43+
from .types.report_errors_service import ReportErrorEventResponse
44+
from .types.report_errors_service import ReportedErrorEvent
3745

3846

3947
__all__ = (
40-
"enums",
41-
"types",
48+
"DeleteEventsRequest",
49+
"DeleteEventsResponse",
50+
"ErrorContext",
51+
"ErrorEvent",
52+
"ErrorGroup",
53+
"ErrorGroupOrder",
4254
"ErrorGroupServiceClient",
55+
"ErrorGroupStats",
4356
"ErrorStatsServiceClient",
57+
"GetGroupRequest",
58+
"HttpRequestContext",
59+
"ListEventsRequest",
60+
"ListEventsResponse",
61+
"ListGroupStatsRequest",
62+
"ListGroupStatsResponse",
63+
"QueryTimeRange",
64+
"ReportErrorEventRequest",
65+
"ReportErrorEventResponse",
66+
"ReportedErrorEvent",
67+
"ServiceContext",
68+
"ServiceContextFilter",
69+
"SourceLocation",
70+
"TimedCount",
71+
"TimedCountAlignment",
72+
"TrackingIssue",
73+
"UpdateGroupRequest",
4474
"ReportErrorsServiceClient",
4575
)

‎google/cloud/errorreporting_v1beta1/gapic/__init__.py

Whitespace-only changes.

‎google/cloud/errorreporting_v1beta1/gapic/enums.py

-89
This file was deleted.

0 commit comments

Comments
 (0)